cache refactor

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

@@ -15,6 +15,9 @@ 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);
     List<RealmModel> getRealms();
     boolean removeRealm(String id);
 

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

@@ -110,12 +110,6 @@ public interface RealmModel extends RoleContainerModel, RoleMapperModel, ScopeMa
 
     boolean validateTOTP(UserModel user, String password, String token);
 
-    void updateCredential(UserModel user, UserCredentialModel cred);
-
-    List<UserCredentialValueModel> getCredentialsDirectly(UserModel user);
-
-    void updateCredentialDirectly(UserModel user, UserCredentialValueModel cred);
-
     UserModel getUser(String name);
 
     UserModel getUserByEmail(String email);

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

@@ -1,5 +1,6 @@
 package org.keycloak.models;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -60,6 +61,14 @@ public interface UserModel {
     int getNotBefore();
     void setNotBefore(int notBefore);
 
+    void updateCredential(UserCredentialModel cred);
+
+    List<UserCredentialValueModel> getCredentialsDirectly();
+
+    void updateCredentialDirectly(UserCredentialValueModel cred);
+
+
+
 
     public static enum RequiredAction {
         VERIFY_EMAIL, UPDATE_PROFILE, CONFIGURE_TOTP, UPDATE_PASSWORD