keycloak-memoizeit

diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.RC1.xml b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.RC1.xml
index 6fc69db..797678a 100755
--- a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.RC1.xml
+++ b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.RC1.xml
@@ -48,5 +48,6 @@
         </update>
         <dropColumn tableName="CLIENT" columnName="DTYPE"/>
         <renameColumn tableName="CLIENT" newColumnName="CLIENT_ID" oldColumnName="NAME"/>
+        <renameColumn tableName="REALM" newColumnName="MASTER_ADMIN_CLIENT" oldColumnName="MASTER_ADMIN_APP"/>
     </changeSet>
 </databaseChangeLog>

diff --git a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_RC1.java b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_RC1.java
index 5954199..227a151 100644
--- a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_RC1.java
+++ b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_RC1.java
@@ -19,6 +19,9 @@ public class Update1_2_0_RC1 extends Update {
     public void update(KeycloakSession session) {
         convertApplicationsToClients();
         convertOAuthClientsToClients();
+
+        db.getCollection("realms").update(new BasicDBObject(), new BasicDBObject("$rename", new BasicDBObject("adminAppId", "clientId")), false, true);
+
     }
 
     private void convertApplicationsToClients() {

diff --git a/model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java b/model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java
index bba27c8..3c978f9 100755
--- a/model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java
+++ b/model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java
@@ -64,7 +64,7 @@ public class RealmEntity extends AbstractIdentifiableEntity {
     private List<String> eventsListeners = new ArrayList<String>();
     private List<String> enabledEventTypes = new ArrayList<String>();
 
-    private String adminAppId;
+    private String masterAdminClient;
 
     private boolean internationalizationEnabled;
     private List<String> supportedLocales = new ArrayList<String>();
@@ -391,12 +391,12 @@ public class RealmEntity extends AbstractIdentifiableEntity {
         this.enabledEventTypes = enabledEventTypes;
     }
     
-    public String getAdminAppId() {
-        return adminAppId;
+    public String getMasterAdminClient() {
+        return masterAdminClient;
     }
 
-    public void setAdminAppId(String adminAppId) {
-        this.adminAppId = adminAppId;
+    public void setMasterAdminClient(String masterAdminClient) {
+        this.masterAdminClient = masterAdminClient;
     }
 
     public List<UserFederationProviderEntity> getUserFederationProviders() {

diff --git a/model/file/src/main/java/org/keycloak/models/file/adapter/RealmAdapter.java b/model/file/src/main/java/org/keycloak/models/file/adapter/RealmAdapter.java
index 31b4bfc..cdd658a 100755
--- a/model/file/src/main/java/org/keycloak/models/file/adapter/RealmAdapter.java
+++ b/model/file/src/main/java/org/keycloak/models/file/adapter/RealmAdapter.java
@@ -966,14 +966,14 @@ public class RealmAdapter implements RealmModel {
     @Override
     public void setMasterAdminClient(ClientModel client) {
         if (client == null) {
-            realm.setAdminAppId(null);
+            realm.setMasterAdminClient(null);
             this.masterAdminApp = null;
         } else {
             String appId = client.getId();
             if (appId == null) {
                 throw new IllegalStateException("Master Admin app not initialized.");
             }
-            realm.setAdminAppId(appId);
+            realm.setMasterAdminClient(appId);
             this.masterAdminApp = client;
         }
     }

diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java
index d39b62e..91c4e19 100755
--- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java
+++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java
@@ -136,8 +136,8 @@ public class RealmEntity {
     protected Set<String> enabledEventTypes = new HashSet<String>();
 
     @OneToOne
-    @JoinColumn(name="MASTER_ADMIN_APP")
-    protected ClientEntity masterAdminApp;
+    @JoinColumn(name="MASTER_ADMIN_CLIENT")
+    protected ClientEntity masterAdminClient;
 
     @OneToMany(cascade ={CascadeType.REMOVE}, orphanRemoval = true, mappedBy = "realm")
     protected List<IdentityProviderEntity> identityProviders = new ArrayList<IdentityProviderEntity>();
@@ -437,12 +437,12 @@ public class RealmEntity {
         this.enabledEventTypes = enabledEventTypes;
     }
     
-    public ClientEntity getMasterAdminApp() {
-        return masterAdminApp;
+    public ClientEntity getMasterAdminClient() {
+        return masterAdminClient;
     }
 
-    public void setMasterAdminApp(ClientEntity masterAdminApp) {
-        this.masterAdminApp = masterAdminApp;
+    public void setMasterAdminClient(ClientEntity masterAdminClient) {
+        this.masterAdminClient = masterAdminClient;
     }
 
     public List<UserFederationProviderEntity> getUserFederationProviders() {

diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
index 4370165..f28dff2 100755
--- a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
+++ b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
@@ -1066,13 +1066,13 @@ public class RealmAdapter implements RealmModel {
 
     @Override
     public ClientModel getMasterAdminClient() {
-        return new ClientAdapter(this, em, session, realm.getMasterAdminApp());
+        return new ClientAdapter(this, em, session, realm.getMasterAdminClient());
     }
 
     @Override
     public void setMasterAdminClient(ClientModel client) {
         ClientEntity appEntity = client !=null ? em.getReference(ClientEntity.class, client.getId()) : null;
-        realm.setMasterAdminApp(appEntity);
+        realm.setMasterAdminClient(appEntity);
         em.flush();
     }
 

diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java
index d7a534a..bfae796 100755
--- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java
+++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java
@@ -979,14 +979,14 @@ public class RealmAdapter extends AbstractMongoAdapter<MongoRealmEntity> impleme
 
     @Override
     public ClientModel getMasterAdminClient() {
-        MongoClientEntity appData = getMongoStore().loadEntity(MongoClientEntity.class, realm.getAdminAppId(), invocationContext);
+        MongoClientEntity appData = getMongoStore().loadEntity(MongoClientEntity.class, realm.getMasterAdminClient(), invocationContext);
         return appData != null ? new ClientAdapter(session, this, appData, invocationContext) : null;
     }
 
     @Override
     public void setMasterAdminClient(ClientModel client) {
         String adminAppId = client != null ? client.getId() : null;
-        realm.setAdminAppId(adminAppId);
+        realm.setMasterAdminClient(adminAppId);
         updateRealm();
     }