keycloak-uncached
Merge pull request #3277 from ahus1/KEYCLOAK-2977-spring-cloud-rebinder-fix KEYCLOAK-2977: …
10/19/2016 1:32:40 PM
Changes
Details
diff --git a/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakSpringBootProperties.java b/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakSpringBootProperties.java
index 95bdf46..f196cf6 100644
--- a/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakSpringBootProperties.java
+++ b/adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakSpringBootProperties.java
@@ -17,15 +17,27 @@
package org.keycloak.adapters.springboot;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.keycloak.representations.adapters.config.AdapterConfig;
import org.springframework.boot.context.properties.ConfigurationProperties;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@ConfigurationProperties(prefix = "keycloak", ignoreUnknownFields = false)
public class KeycloakSpringBootProperties extends AdapterConfig {
+ /* this is a dummy property to avoid re-rebinding problem with property keycloak.config.resolver
+ when using spring cloud - see KEYCLOAK-2977 */
+ @JsonIgnore
+ private Map config = new HashMap();
+
+ public Map getConfig() {
+ return config;
+ }
+
private List<SecurityConstraint> securityConstraints = new ArrayList<SecurityConstraint>();
public static class SecurityConstraint {