keycloak-memoizeit

ascending order fixed

6/19/2020 10:46:22 PM

Details

diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/AuthorizationProvider.java b/server-spi-private/src/main/java/org/keycloak/authorization/AuthorizationProvider.java
index 55a221b..e2e56f7 100644
--- a/server-spi-private/src/main/java/org/keycloak/authorization/AuthorizationProvider.java
+++ b/server-spi-private/src/main/java/org/keycloak/authorization/AuthorizationProvider.java
@@ -439,7 +439,7 @@ public final class AuthorizationProvider implements Provider {
         };
     }
 
-public static SingleCache<Parameters, Resource> findByName = new SingleCache<>("static-single:3#AuthorizationProvider.findByName");
+public static SingleCache<Parameters, Resource> findByName = new SingleCache<>("static-single:8#AuthorizationProvider.findByName");
 
     private ResourceStore createResourceStoreWrapper(StoreFactory storeFactory) {
         return new ResourceStore() {
diff --git a/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProvider.java b/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProvider.java
index d3b9767..474cdf9 100644
--- a/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProvider.java
+++ b/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProvider.java
@@ -83,7 +83,7 @@ public class Pbkdf2PasswordHashProvider implements PasswordHashProvider {
     }
 
 
-public static SingleCache<Parameters, String> encode1 = new SingleCache<>("static-single:9#Pbkdf2PasswordHashProvider.encode1");
+public static SingleCache<Parameters, String> encode1 = new SingleCache<>("static-single:2#Pbkdf2PasswordHashProvider.encode1");
 
     @Override
     public String encode(String rawPassword, int iterations) {
@@ -97,7 +97,7 @@ return encode1.computeIfAbsent(new Parameters(rawPassword, iterations), () -> {
 }, 120000);
     }
 
-public static SingleCache<Parameters, Boolean> verify = new SingleCache<>("static-single:9#Pbkdf2PasswordHashProvider.verify");
+public static SingleCache<Parameters, Boolean> verify = new SingleCache<>("static-single:1#Pbkdf2PasswordHashProvider.verify");
 
     @Override
     public boolean verify(String rawPassword, CredentialModel credential) {
@@ -118,7 +118,7 @@ return verify.computeIfAbsent(new Parameters(rawPassword, credential), () -> {
     public void close() {
     }
 
-public static SingleCache<Parameters, String> encode2 = new SingleCache<>("static-single:9#Pbkdf2PasswordHashProvider.encode2");
+public static SingleCache<Parameters, String> encode2 = new SingleCache<>("static-single:2#Pbkdf2PasswordHashProvider.encode2");
 
     private String encode(String rawPassword, int iterations, byte[] salt, int derivedKeySize) {
 return encode2.computeIfAbsent(new Parameters(rawPassword, iterations, salt, derivedKeySize), () -> {
diff --git a/server-spi-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java b/server-spi-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java
index 60462a4..6cab3d9 100644
--- a/server-spi-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java
+++ b/server-spi-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java
@@ -164,7 +164,7 @@ public class PersistentAuthenticatedClientSessionAdapter implements Authenticate
         // Information not persisted.
     }
 
-public static GetterCache<String> getAction = new GetterCache<>("static-getter:7#PersistentAuthenticatedClientSessionAdapter.getAction");
+public static GetterCache<String> getAction = new GetterCache<>("static-getter:4#PersistentAuthenticatedClientSessionAdapter.getAction");
 
     @Override
     public String getAction() {
diff --git a/server-spi-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java b/server-spi-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java
index f54703d..adc6b4d 100644
--- a/server-spi-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java
+++ b/server-spi-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java
@@ -79,7 +79,7 @@ public class PersistentUserSessionAdapter implements OfflineUserSessionModel {
         this.authenticatedClientSessions = clientSessions;
     }
 
-public static GetterCache<PersistentUserSessionData> getData = new GetterCache<>("static-getter:6#PersistentUserSessionAdapter.getData");
+public static GetterCache<PersistentUserSessionData> getData = new GetterCache<>("static-getter:5#PersistentUserSessionAdapter.getData");
     // Lazily init data
     private PersistentUserSessionData getData() {
 return getData.computeIfAbsent(() -> {
@@ -151,7 +151,7 @@ return getData.computeIfAbsent(() -> {
         return getData().getIpAddress();
     }
 
-public static GetterCache<String> getAuthMethod = new GetterCache<>("static-getter:8#PersistentUserSessionAdapter.getAuthMethod");
+public static GetterCache<String> getAuthMethod = new GetterCache<>("static-getter:3#PersistentUserSessionAdapter.getAuthMethod");
 
     @Override
     public String getAuthMethod() {