merge

model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java

@@ -16,16 +16,15 @@ public class MigrationModelManager {
         String storedVersion = model.getStoredVersion();
         if (MigrationModel.LATEST_VERSION.equals(storedVersion)) return;
         ModelVersion stored = null;
-        if (storedVersion == null) stored = new ModelVersion(0, 0, 0);
-        else stored = new ModelVersion(storedVersion);
+        if (storedVersion != null) new ModelVersion(storedVersion);
 
-        if (stored.lessThan(MigrationTo1_2_0_CR1.VERSION)) {
-            logger.info("Migrating older model to 1.2.0.RC1 updates");
+        if (stored == null || stored.lessThan(MigrationTo1_2_0_CR1.VERSION)) {
+            if (stored != null) {
+                logger.debug("Migrating older model to 1.2.0.RC1 updates");
+            }
             new MigrationTo1_2_0_CR1().migrate(session);
         }
 
         model.setStoredVersion(MigrationModel.LATEST_VERSION);
-
-
     }
 }

model/api/src/main/java/org/keycloak/migration/MigrationSpi.java

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class MigrationSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "migration";

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

@@ -232,7 +232,15 @@ public interface RealmModel extends RoleContainerModel {
     Set<String> getEnabledEventTypes();
 
     void setEnabledEventTypes(Set<String> enabledEventTypes);
+    
+    boolean isAdminEventsEnabled();
 
+    void setAdminEventsEnabled(boolean enabled);
+    
+    boolean isAdminEventsDetailsEnabled();
+
+    void setAdminEventsDetailsEnabled(boolean enabled);
+    
     ClientModel getMasterAdminClient();
 
     void setMasterAdminClient(ClientModel client);

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

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class RealmSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "realm";

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

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class UserFederationSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return false;
+    }
+
     @Override
     public String getName() {
         return "userFederation";

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

@@ -11,6 +11,11 @@ public class UserSessionSpi implements Spi {
 
     public static final String NAME = "userSessions";
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return NAME;

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

@@ -9,6 +9,11 @@ import org.keycloak.provider.Spi;
  */
 public class UserSpi implements Spi {
 
+    @Override
+    public boolean isPrivate() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "user";

model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java

@@ -63,7 +63,10 @@ public class RealmEntity extends AbstractIdentifiableEntity {
     private long eventsExpiration;
     private List<String> eventsListeners = new ArrayList<String>();
     private List<String> enabledEventTypes = new ArrayList<String>();
-
+    
+    protected boolean adminEventsEnabled;
+    protected boolean adminEventsDetailsEnabled;
+    
     private String masterAdminClient;
 
     private boolean internationalizationEnabled;
@@ -391,6 +394,22 @@ public class RealmEntity extends AbstractIdentifiableEntity {
         this.enabledEventTypes = enabledEventTypes;
     }
     
+    public boolean isAdminEventsEnabled() {
+        return adminEventsEnabled;
+    }
+
+    public void setAdminEventsEnabled(boolean adminEventsEnabled) {
+        this.adminEventsEnabled = adminEventsEnabled;
+    }
+
+    public boolean isAdminEventsDetailsEnabled() {
+        return adminEventsDetailsEnabled;
+    }
+
+    public void setAdminEventsDetailsEnabled(boolean adminEventsDetailsEnabled) {
+        this.adminEventsDetailsEnabled = adminEventsDetailsEnabled;
+    }
+
     public String getMasterAdminClient() {
         return masterAdminClient;
     }

model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java

@@ -14,6 +14,7 @@ import org.keycloak.models.UserCredentialModel;
 import org.keycloak.models.UserFederationProviderModel;
 import org.keycloak.models.UserModel;
 import org.keycloak.models.UserSessionModel;
+
 import org.keycloak.representations.idm.ClientRepresentation;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.FederatedIdentityRepresentation;
@@ -192,6 +193,10 @@ public class ModelToRepresentation {
             rep.setEnabledEventTypes(new LinkedList<String>(realm.getEnabledEventTypes()));
         }
         
+        rep.setAdminEventsEnabled(realm.isAdminEventsEnabled());
+        
+        rep.setAdminEventsDetailsEnabled(realm.isAdminEventsDetailsEnabled());
+        
         return rep;
     }
 

model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java

@@ -410,10 +410,15 @@ public class RepresentationToModel {
         if (rep.getAccountTheme() != null) realm.setAccountTheme(rep.getAccountTheme());
         if (rep.getAdminTheme() != null) realm.setAdminTheme(rep.getAdminTheme());
         if (rep.getEmailTheme() != null) realm.setEmailTheme(rep.getEmailTheme());
+        
         if (rep.isEventsEnabled() != null) realm.setEventsEnabled(rep.isEventsEnabled());
         if (rep.getEventsExpiration() != null) realm.setEventsExpiration(rep.getEventsExpiration());
         if (rep.getEventsListeners() != null) realm.setEventsListeners(new HashSet<>(rep.getEventsListeners()));
         if (rep.getEnabledEventTypes() != null) realm.setEnabledEventTypes(new HashSet<>(rep.getEnabledEventTypes()));
+        
+        if (rep.isAdminEventsEnabled() != null) realm.setAdminEventsEnabled(rep.isAdminEventsEnabled());
+        if (rep.isAdminEventsDetailsEnabled() != null) realm.setAdminEventsDetailsEnabled(rep.isAdminEventsDetailsEnabled());
+        
 
         if (rep.getPasswordPolicy() != null) realm.setPasswordPolicy(new PasswordPolicy(rep.getPasswordPolicy()));
 

model/api/src/main/java/org/keycloak/provider/Spi.java

@@ -5,6 +5,7 @@ package org.keycloak.provider;
  */
 public interface Spi {
 
+    public boolean isPrivate();
     public String getName();
     public Class<? extends Provider> getProviderClass();
     public Class<? extends ProviderFactory> getProviderFactoryClass();