model refactor for caching

model/api/src/main/java/org/keycloak/models/ApplicationModel.java

@@ -32,8 +32,6 @@ public interface ApplicationModel extends RoleContainerModel, ClientModel {
 
     void updateDefaultRoles(String[] defaultRoles);
 
-    Set<RoleModel> getApplicationRoleMappings(UserModel user);
-
     Set<RoleModel> getApplicationScopeMappings(ClientModel client);
 
     boolean isBearerOnly();

model/api/src/main/java/org/keycloak/models/ClientModel.java

@@ -57,6 +57,13 @@ public interface ClientModel {
     boolean isDirectGrantsOnly();
     void setDirectGrantsOnly(boolean flag);
 
+    Set<RoleModel> getScopeMappings();
+    void addScopeMapping(RoleModel role);
+    void deleteScopeMapping(RoleModel role);
+    Set<RoleModel> getRealmScopeMappings();
+    boolean hasScope(RoleModel role);
+
+
     RealmModel getRealm();
 
     /**

model/api/src/main/java/org/keycloak/models/KeycloakSession.java

@@ -3,6 +3,8 @@ package org.keycloak.models;
 import org.keycloak.provider.Provider;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -15,9 +17,24 @@ public interface KeycloakSession extends Provider {
     RealmModel createRealm(String id, String name);
     RealmModel getRealm(String id);
     RealmModel getRealmByName(String name);
-    UserModel getUserById(String id, String realmId);
-    UserModel getUserByUsername(String username, String realmId);
-    UserModel getUserByEmail(String email, String realmId);
+
+    UserModel getUserById(String id, RealmModel realm);
+    UserModel getUserByUsername(String username, RealmModel realm);
+    UserModel getUserByEmail(String email, RealmModel realm);
+    UserModel getUserBySocialLink(SocialLinkModel socialLink, RealmModel realm);
+    List<UserModel> getUsers(RealmModel realm);
+    List<UserModel> searchForUser(String search, RealmModel realm);
+    List<UserModel> searchForUserByAttributes(Map<String, String> attributes, RealmModel realm);
+    Set<RoleModel> getRealmRoleMappings(UserModel user, RealmModel realm);
+
+    Set<SocialLinkModel> getSocialLinks(UserModel user, RealmModel realm);
+    SocialLinkModel getSocialLink(UserModel user, String socialProvider, RealmModel realm);
+    AuthenticationLinkModel getAuthenticationLink(UserModel user, RealmModel realm);
+
+
+    RoleModel getRoleById(String id, RealmModel realm);
+    ApplicationModel getApplicationById(String id, RealmModel realm);
+    OAuthClientModel getOAuthClientById(String id, RealmModel realm);
     List<RealmModel> getRealms();
     boolean removeRealm(String id);
 

model/api/src/main/java/org/keycloak/models/RealmModel.java

@@ -10,7 +10,7 @@ import java.util.Set;
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
-public interface RealmModel extends RoleContainerModel, RoleMapperModel, ScopeMapperModel {
+public interface RealmModel extends RoleContainerModel {
 
     String getId();
 
@@ -205,10 +205,6 @@ public interface RealmModel extends RoleContainerModel, RoleMapperModel, ScopeMa
 
     void setAuthenticationProviders(List<AuthenticationProviderModel> authenticationProviders);
 
-    Set<RoleModel> getRealmRoleMappings(UserModel user);
-
-    Set<RoleModel> getRealmScopeMappings(ClientModel client);
-
     String getLoginTheme();
 
     void setLoginTheme(String name);
@@ -225,7 +221,6 @@ public interface RealmModel extends RoleContainerModel, RoleMapperModel, ScopeMa
 
     void setEmailTheme(String name);
 
-    boolean hasScope(ClientModel client, RoleModel role);
 
     /**
      * Time in seconds since epoc

model/api/src/main/java/org/keycloak/models/RoleMapperModel.java

@@ -1,15 +0,0 @@
-package org.keycloak.models;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public interface RoleMapperModel {
-    boolean hasRole(UserModel user, RoleModel role);
-    void grantRole(UserModel user, RoleModel role);
-    Set<RoleModel> getRoleMappings(UserModel user);
-    void deleteRoleMapping(UserModel user, RoleModel role);
-}

model/api/src/main/java/org/keycloak/models/ScopeMapperModel.java

@@ -8,7 +8,5 @@ import java.util.Set;
  * @version $Revision: 1 $
  */
 public interface ScopeMapperModel {
-    Set<RoleModel> getScopeMappings(ClientModel client);
-    void addScopeMapping(ClientModel client, RoleModel role);
-    void deleteScopeMapping(ClientModel client, RoleModel role);
+
 }

model/api/src/main/java/org/keycloak/models/UserModel.java

@@ -67,6 +67,14 @@ public interface UserModel {
 
     void updateCredentialDirectly(UserCredentialValueModel cred);
 
+    Set<RoleModel> getRealmRoleMappings();
+    Set<RoleModel> getApplicationRoleMappings(ApplicationModel app);
+    boolean hasRole(RoleModel role);
+    void grantRole(RoleModel role);
+    Set<RoleModel> getRoleMappings();
+    void deleteRoleMapping(RoleModel role);
+
+