From 4f199c724578591d3799b4218f2537495f99f375 Mon Sep 17 00:00:00 2001
From: Tero Saarni <tero.saarni@est.tech>
Date: Fri, 15 Jul 2022 16:43:56 +0300
Subject: [PATCH] Fix compilation errors with Eclipse Java compiler

---
 .../events/AuthenticationSessionAuthNoteUpdateEvent.java    | 2 +-
 .../sessions/infinispan/changes/SessionEntityWrapper.java   | 2 +-
 .../protocol/oidc/OIDCClientSecretConfigWrapper.java        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/AuthenticationSessionAuthNoteUpdateEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/AuthenticationSessionAuthNoteUpdateEvent.java
index 623a623791..8135efee38 100644
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/AuthenticationSessionAuthNoteUpdateEvent.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/AuthenticationSessionAuthNoteUpdateEvent.java
@@ -122,7 +122,7 @@ public class AuthenticationSessionAuthNoteUpdateEvent implements ClusterEvent {
               MarshallUtil.unmarshallString(input),
               MarshallUtil.unmarshallString(input),
               MarshallUtil.unmarshallString(input),
-              MarshallUtil.unmarshallMap(input, HashMap::new)
+              MarshallUtil.<String, String, Map<String, String>>unmarshallMap(input, HashMap::new)
             );
         }
 
diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java
index 040933be62..9552f6be7a 100644
--- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java
@@ -191,7 +191,7 @@ public class SessionEntityWrapper<S extends SessionEntity> {
                 return res;
             } else {
                 UUID sessionVersion = new UUID(input.readLong(), input.readLong());
-                HashMap<String, String> map = MarshallUtil.unmarshallMap(input, HashMap::new);
+                HashMap<String, String> map = MarshallUtil.<String, String, HashMap<String, String>>unmarshallMap(input, HashMap::new);
                 final SessionEntity entity = (SessionEntity) input.readObject();
                 if (log.isTraceEnabled()) {
                     log.tracef("Found entity locally: entity=%s, version=%s, metadata=%s", entity, sessionVersion, map);
diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientSecretConfigWrapper.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientSecretConfigWrapper.java
index e42a601a9a..577d927982 100644
--- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientSecretConfigWrapper.java
+++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientSecretConfigWrapper.java
@@ -211,7 +211,7 @@ public class OIDCClientSecretConfigWrapper extends AbstractClientConfigWrapper {
     public ReadOnlyRotatedSecretClientModel toRotatedClientModel() throws InvalidObjectException {
         if (Objects.isNull(this.clientModel))
             throw new InvalidObjectException(getClass().getCanonicalName() + " does not have an attribute of type " + ClientModel.class.getCanonicalName());
-        return new ReadOnlyRotatedSecretClientModel();
+        return new ReadOnlyRotatedSecretClientModel(clientModel);
     }
 
     /**
@@ -219,8 +219,8 @@ public class OIDCClientSecretConfigWrapper extends AbstractClientConfigWrapper {
      */
     public class ReadOnlyRotatedSecretClientModel extends ClientModelLazyDelegate {
 
-        private ReadOnlyRotatedSecretClientModel() {
-            super(() -> OIDCClientSecretConfigWrapper.this.clientModel);
+        private ReadOnlyRotatedSecretClientModel(ClientModel clientModel) {
+            super(() -> clientModel);
         }
 
         @Override