Merge remote-tracking branch 'upstream/master'

2026-05-03 13:40:46 -05:00 · 2015-06-17 17:15:16 -04:00
parent 70fd7bea99 2c327d9eee
commit 47997e0056
17 changed files with 59 additions and 16 deletions
@@ -14,6 +14,8 @@ public enum SslRequired {
    EXTERNAL,
    NONE;

+    private static final long serialVersionUID = 1L;
+
    public boolean isRequired(ClientConnection connection) {
        return isRequired(connection.getRemoteAddr());
    }
@@ -1,12 +1,15 @@
 package org.keycloak.models;

 import java.util.Comparator;
+import java.io.Serializable;

 /**
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class AuthenticationExecutionModel {
+public class AuthenticationExecutionModel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
    public static class ExecutionComparator implements Comparator<AuthenticationExecutionModel> {
        public static final ExecutionComparator SINGLETON = new ExecutionComparator();

@@ -1,10 +1,14 @@
 package org.keycloak.models;

+import java.io.Serializable;
+
 /**
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class AuthenticationFlowModel {
+public class AuthenticationFlowModel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
    private String id;
    private String alias;
    private String description;
@@ -1,5 +1,6 @@
 package org.keycloak.models;

+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;

@@ -7,7 +8,8 @@ import java.util.Map;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class AuthenticatorModel {
+public class AuthenticatorModel implements Serializable {
+    private static final long serialVersionUID = 1L;

    private String id;
    private String alias;
@@ -1,5 +1,6 @@
 package org.keycloak.models;

+import java.io.Serializable;
 import java.util.Map;

 /**
@@ -8,7 +9,9 @@ import java.util.Map;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class IdentityProviderMapperModel {
+public class IdentityProviderMapperModel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
    protected String id;
    protected String name;
    protected String identityProviderAlias;
@@ -17,6 +17,7 @@
 */
 package org.keycloak.models;

+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;

@@ -28,7 +29,8 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation;
 *
 * @author Pedro Igor
 */
-public class IdentityProviderModel {
+public class IdentityProviderModel implements Serializable {
+    private static final long serialVersionUID = 1L;

    private String internalId;

@@ -2,6 +2,7 @@ package org.keycloak.models;

 import org.keycloak.models.utils.Pbkdf2PasswordEncoder;

+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -13,7 +14,8 @@ import java.util.regex.Pattern;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class PasswordPolicy {
+public class PasswordPolicy implements Serializable {
+    private static final long serialVersionUID = 1L;

    public static final String INVALID_PASSWORD_MIN_LENGTH_MESSAGE = "invalidPasswordMinLengthMessage";
    public static final String INVALID_PASSWORD_MIN_DIGITS_MESSAGE = "invalidPasswordMinDigitsMessage";
@@ -153,7 +155,7 @@ public class PasswordPolicy {
        return null;
    }

-    private static interface Policy {
+    private static interface Policy extends Serializable {
        public Error validate(UserModel user, String password);
        public Error validate(String user, String password);
    }
@@ -1,5 +1,6 @@
 package org.keycloak.models;

+import java.io.Serializable;
 import java.util.Map;

 /**
@@ -8,7 +9,9 @@ import java.util.Map;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class ProtocolMapperModel {
+public class ProtocolMapperModel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
    protected String id;
    protected String name;
    protected String protocol;
@@ -1,5 +1,6 @@
 package org.keycloak.models;

+import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -8,7 +9,9 @@ import java.util.Map;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class RequiredCredentialModel {
+public class RequiredCredentialModel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
    protected String type;
    protected boolean input;
    protected boolean secret;
@@ -1,11 +1,13 @@
 package org.keycloak.models;

+import java.io.Serializable;
+
 /**
 * Used just in cases when we want to "directly" update or retrieve the hash or salt of user credential (For example during export/import)
 *
 * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
 */
-public class UserCredentialValueModel {
+public class UserCredentialValueModel implements Serializable {

    private String type;
    private String value;
@@ -1,11 +1,13 @@
 package org.keycloak.models;

+import java.io.Serializable;
 import java.util.Map;

 /**
 * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
 */
-public class UserFederationMapperModel {
+public class UserFederationMapperModel implements Serializable {
+    private static final long serialVersionUID = 1L;

    protected String id;
    protected String name;
@@ -1,5 +1,6 @@
 package org.keycloak.models;

+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;

@@ -9,7 +10,8 @@ import java.util.Map;
 * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
 * @author <a href="mailto:bburke@redhat.com">Bill Burke</a>
 */
-public class UserFederationProviderModel {
+public class UserFederationProviderModel implements Serializable {
+    private static final long serialVersionUID = 1L;

    private String id;
    private String providerName;
@@ -7,6 +7,7 @@ import org.keycloak.models.RealmProvider;
 import org.keycloak.models.RoleModel;
 import org.keycloak.models.cache.RealmCache;

+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -19,7 +20,9 @@ import java.util.TreeMap;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class CachedClient {
+public class CachedClient implements Serializable {
+    private static final long serialVersionUID = 1L;
+
    private String id;
    private String clientId;
    private String name;
@@ -8,6 +8,9 @@ import org.keycloak.models.RoleModel;
 * @version $Revision: 1 $
 */
 public class CachedClientRole extends CachedRole {
+
+    private static final long serialVersionUID = 1L;
+
    private final String idClient;

    public CachedClientRole(String idClient, RoleModel model, RealmModel realm) {
@@ -18,6 +18,7 @@ import org.keycloak.models.UserFederationProviderModel;
 import org.keycloak.models.cache.RealmCache;
 import org.keycloak.util.MultivaluedHashMap;

+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -30,7 +31,8 @@ import java.util.Set;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class CachedRealm {
+public class CachedRealm implements Serializable {
+    private static final long serialVersionUID = 1L;

    private String id;
    private String name;
@@ -3,6 +3,7 @@ package org.keycloak.models.cache.entities;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.RoleModel;

+import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;

@@ -10,7 +11,10 @@ import java.util.Set;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class CachedRole {
+public class CachedRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
    final protected String id;
    final protected String name;
    final protected String realm;
@@ -5,6 +5,7 @@ import org.keycloak.models.RoleModel;
 import org.keycloak.models.UserCredentialValueModel;
 import org.keycloak.models.UserModel;

+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -16,7 +17,7 @@ import java.util.Set;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class CachedUser {
+public class CachedUser implements Serializable {
    private String id;
    private String realm;
    private String username;