diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientScopesCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientScopesCondition.java index 0f9fd8665f1..ffd79096681 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientScopesCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientScopesCondition.java @@ -59,7 +59,7 @@ public class ClientScopesCondition extends AbstractClientPolicyConditionProvider public static class Configuration extends ClientPolicyConditionConfigurationRepresentation { protected String type; - protected List scope; + protected List scopes; public String getType() { return type; @@ -69,12 +69,12 @@ public class ClientScopesCondition extends AbstractClientPolicyConditionProvider this.type = type; } - public List getScope() { - return scope; + public List getScopes() { + return scopes; } - public void setScope(List scope) { - this.scope = scope; + public void setScopes(List scope) { + this.scopes = scope; } } @@ -155,7 +155,7 @@ public class ClientScopesCondition extends AbstractClientPolicyConditionProvider } private Set getScopesForMatching() { - List scopes = configuration.getScope(); + List scopes = configuration.getScopes(); if (scopes == null) return null; return new HashSet<>(scopes); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientPoliciesTest.java index 68c93299551..d59fabee79d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientPoliciesTest.java @@ -1140,7 +1140,7 @@ public abstract class AbstractClientPoliciesTest extends AbstractKeycloakTest { protected void assertExpectedClientScopesCondition(String type, List scopes, ClientPolicyRepresentation policyRep) { ClientScopesCondition.Configuration cfg = getConfigAsExpectedType(policyRep, ClientScopesConditionFactory.PROVIDER_ID, ClientScopesCondition.Configuration.class); Assert.assertEquals(cfg.getType(), type); - Assert.assertEquals(cfg.getScope(), scopes); + Assert.assertEquals(cfg.getScopes(), scopes); } protected void assertExpectedClientUpdateContextCondition(List updateClientSources, ClientPolicyRepresentation policyRep) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientPoliciesUtil.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientPoliciesUtil.java index c99eedc29e4..b1a10566e3a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientPoliciesUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientPoliciesUtil.java @@ -331,7 +331,7 @@ public final class ClientPoliciesUtil { public static ClientScopesCondition.Configuration createClientScopesConditionConfig(String type, List scopes) { ClientScopesCondition.Configuration config = new ClientScopesCondition.Configuration(); config.setType(type); - config.setScope(scopes); + config.setScopes(scopes); return config; }