keycloak-aplcache

diff --git a/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java
index dbca874..d8434b9 100755
--- a/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java
+++ b/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java
@@ -159,7 +159,7 @@ public class RealmRepresentation {
 
     public ScopeMappingRepresentation scopeMapping(String username) {
         ScopeMappingRepresentation mapping = new ScopeMappingRepresentation();
-        mapping.setUsername(username);
+        mapping.setClient(username);
         if (scopeMappings == null) scopeMappings = new ArrayList<ScopeMappingRepresentation>();
         scopeMappings.add(mapping);
         return mapping;

diff --git a/core/src/main/java/org/keycloak/representations/idm/ScopeMappingRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/ScopeMappingRepresentation.java
index b65196f..7780cd8 100755
--- a/core/src/main/java/org/keycloak/representations/idm/ScopeMappingRepresentation.java
+++ b/core/src/main/java/org/keycloak/representations/idm/ScopeMappingRepresentation.java
@@ -9,7 +9,7 @@ import java.util.Set;
  */
 public class ScopeMappingRepresentation {
     protected String self; // link
-    protected String username;
+    protected String client;
     protected Set<String> roles;
 
     public String getSelf() {
@@ -20,12 +20,12 @@ public class ScopeMappingRepresentation {
         this.self = self;
     }
 
-    public String getUsername() {
-        return username;
+    public String getClient() {
+        return client;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setClient(String client) {
+        this.client = client;
     }
 
     public Set<String> getRoles() {

diff --git a/examples/demo-template/testrealm.json b/examples/demo-template/testrealm.json
index 9f0fb13..5bcd82b 100755
--- a/examples/demo-template/testrealm.json
+++ b/examples/demo-template/testrealm.json
@@ -44,15 +44,15 @@
     ],
     "scopeMappings": [
         {
-            "username": "third-party",
+            "client": "third-party",
             "roles": ["user"]
         },
         {
-            "username": "customer-portal",
+            "client": "customer-portal",
             "roles": ["user"]
         },
         {
-            "username": "product-portal",
+            "client": "product-portal",
             "roles": ["user"]
         }
 

diff --git a/model/tests/src/test/resources/testcomposites.json b/model/tests/src/test/resources/testcomposites.json
index 6c11b4e..c884a0f 100755
--- a/model/tests/src/test/resources/testcomposites.json
+++ b/model/tests/src/test/resources/testcomposites.json
@@ -91,11 +91,11 @@
     ],
     "scopeMappings": [
         {
-            "username": "REALM_COMPOSITE_1_APPLICATION",
+            "client": "REALM_COMPOSITE_1_APPLICATION",
             "roles": ["REALM_COMPOSITE_1"]
         },
         {
-            "username": "REALM_ROLE_1_APPLICATION",
+            "client": "REALM_ROLE_1_APPLICATION",
             "roles": ["REALM_ROLE_1"]
         }
     ],
@@ -221,7 +221,7 @@
     "applicationScopeMappings": {
         "APP_ROLE_APPLICATION": [
             {
-                "username": "APP_COMPOSITE_APPLICATION",
+                "client": "APP_COMPOSITE_APPLICATION",
                 "roles": ["APP_ROLE_2"]
             }
         ]

diff --git a/model/tests/src/test/resources/testrealm.json b/model/tests/src/test/resources/testrealm.json
index e1148da..caeea6c 100755
--- a/model/tests/src/test/resources/testrealm.json
+++ b/model/tests/src/test/resources/testrealm.json
@@ -119,7 +119,7 @@
     ],
     "scopeMappings": [
         {
-            "username": "oauthclient",
+            "client": "oauthclient",
             "roles": ["admin"]
         }
     ],
@@ -148,7 +148,7 @@
     "applicationScopeMappings": {
         "Application": [
             {
-                "username": "oauthclient",
+                "client": "oauthclient",
                 "roles": ["app-user"]
             }
         ]

diff --git a/model/tests/src/test/resources/testrealm-demo.json b/model/tests/src/test/resources/testrealm-demo.json
index 136a144..b565740 100755
--- a/model/tests/src/test/resources/testrealm-demo.json
+++ b/model/tests/src/test/resources/testrealm-demo.json
@@ -53,7 +53,7 @@
     ],
     "scopeMappings": [
         {
-            "username": "third-party",
+            "client": "third-party",
             "roles": ["user"]
         }
     ],

diff --git a/services/src/main/java/org/keycloak/services/managers/ApplicationManager.java b/services/src/main/java/org/keycloak/services/managers/ApplicationManager.java
index 746b4d5..db10338 100755
--- a/services/src/main/java/org/keycloak/services/managers/ApplicationManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/ApplicationManager.java
@@ -123,7 +123,7 @@ public class ApplicationManager {
                 if (role == null) {
                     role = applicationModel.addRole(roleString.trim());
                 }
-                ClientModel client = realm.findClient(mapping.getUsername());
+                ClientModel client = realm.findClient(mapping.getClient());
                 realm.addScopeMapping(client, role);
             }
         }

diff --git a/services/src/main/java/org/keycloak/services/managers/RealmManager.java b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
index 632504a..1fa6e10 100755
--- a/services/src/main/java/org/keycloak/services/managers/RealmManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
@@ -361,7 +361,7 @@ public class RealmManager {
                     if (role == null) {
                         role = newRealm.addRole(roleString.trim());
                     }
-                    UserModel user = userMap.get(scope.getUsername());
+                    UserModel user = userMap.get(scope.getClient());
                     ClientModel client = newRealm.findClient(user.getLoginName());
                     newRealm.addScopeMapping(client, role);
                 }

diff --git a/testsuite/integration/src/test/resources/testcomposite.json b/testsuite/integration/src/test/resources/testcomposite.json
index cfdd2c7..e6753fb 100755
--- a/testsuite/integration/src/test/resources/testcomposite.json
+++ b/testsuite/integration/src/test/resources/testcomposite.json
@@ -91,11 +91,11 @@
     ],
     "scopeMappings": [
         {
-            "username": "REALM_COMPOSITE_1_APPLICATION",
+            "client": "REALM_COMPOSITE_1_APPLICATION",
             "roles": ["REALM_COMPOSITE_1"]
         },
         {
-            "username": "REALM_ROLE_1_APPLICATION",
+            "client": "REALM_ROLE_1_APPLICATION",
             "roles": ["REALM_ROLE_1"]
         }
     ],
@@ -221,7 +221,7 @@
     "applicationScopeMappings": {
         "APP_ROLE_APPLICATION": [
             {
-                "username": "APP_COMPOSITE_APPLICATION",
+                "client": "APP_COMPOSITE_APPLICATION",
                 "roles": ["APP_ROLE_2"]
             }
         ]

diff --git a/testsuite/integration/src/test/resources/testrealm.json b/testsuite/integration/src/test/resources/testrealm.json
index 72db7ca..59eefc8 100755
--- a/testsuite/integration/src/test/resources/testrealm.json
+++ b/testsuite/integration/src/test/resources/testrealm.json
@@ -46,11 +46,11 @@
     ],
     "scopeMappings": [
         {
-            "username": "third-party",
+            "client": "third-party",
             "roles": ["user"]
         },
         {
-            "username": "test-app",
+            "client": "test-app",
             "roles": ["user"]
         }
     ],
@@ -105,7 +105,7 @@
     "applicationScopeMappings": {
         "test-app": [
             {
-                "username": "third-party",
+                "client": "third-party",
                 "roles": ["customer-user"]
             }
         ]