mariusz.pacek/keycloak
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2028 from stianst/JACKSON2

Browse Source 
KEYCLOAK-1809
This commit is contained in:
Stian Thorgersen committed 2016-01-15 16:29:01 +01:00
2 parents e77f940c9f 33565ff8d9
commit b21bf21043
168 files changed
+814 -661
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

services/pom.xml
+8 -8
View File
@@ -114,24 +114,24 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java
+1 -1
View File
@@ -7,7 +7,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.keycloak.authentication.authenticators.broker.AbstractIdpAuthenticator;
import org.keycloak.authentication.requiredactions.util.UpdateProfileContext;
import org.keycloak.broker.provider.BrokeredIdentityContext;
services/src/main/java/org/keycloak/partialimport/PartialImportResult.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.keycloak.partialimport;
import org.codehaus.jackson.annotate.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* This class represents a single result for a resource imported.
services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.keycloak.protocol;
import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.jboss.logging.Logger;
import org.keycloak.common.ClientConnection;
import org.keycloak.jose.jws.JWSBuilder;
services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java
+1 -1
View File
@@ -17,7 +17,7 @@
*/
package org.keycloak.protocol.oidc.endpoints;
import org.codehaus.jackson.node.ObjectNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.spi.HttpRequest;
import org.keycloak.OAuthErrorException;
services/src/main/java/org/keycloak/protocol/oidc/representations/JSONWebKeySet.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.keycloak.protocol.oidc.representations;
import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.keycloak.jose.jwk.JWK;
/**
services/src/main/java/org/keycloak/protocol/oidc/representations/OIDCConfigurationRepresentation.java
+3 -3
View File
@@ -1,8 +1,8 @@
package org.keycloak.protocol.oidc.representations;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.HashMap;
import java.util.List;
services/src/main/java/org/keycloak/services/filters/KeycloakTransactionCommitter.java
+28
View File
@@ -0,0 +1,28 @@
/*
*/
package org.keycloak.services.filters;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.keycloak.models.KeycloakTransaction;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;
import javax.ws.rs.container.ContainerResponseFilter;
import java.io.IOException;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
public class KeycloakTransactionCommitter implements ContainerResponseFilter {
@Override
public void filter(ContainerRequestContext containerRequestContext, ContainerResponseContext containerResponseContext) throws IOException {
KeycloakTransaction tx = ResteasyProviderFactory.getContextData(KeycloakTransaction.class);
if (tx != null && tx.isActive()) {
if (tx.getRollbackOnly()) tx.rollback();
else tx.commit();
}
}
}
services/src/main/java/org/keycloak/services/managers/ClientManager.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.keycloak.services.managers;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.annotate.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.jboss.logging.Logger;
import org.keycloak.authentication.ClientAuthenticator;
import org.keycloak.authentication.ClientAuthenticatorFactory;
services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
+6 -3
View File
@@ -1,8 +1,8 @@
package org.keycloak.services.resources;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.jboss.logging.Logger;
import org.jboss.resteasy.core.Dispatcher;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
@@ -15,6 +15,7 @@ import org.keycloak.models.utils.RepresentationToModel;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.services.DefaultKeycloakSessionFactory;
import org.keycloak.services.filters.KeycloakTransactionCommitter;
import org.keycloak.services.managers.ApplianceBootstrap;
import org.keycloak.services.managers.BruteForceProtector;
import org.keycloak.services.managers.RealmManager;
@@ -75,6 +76,8 @@ public class KeycloakApplication extends Application {
classes.add(ThemeResource.class);
classes.add(JsResource.class);
classes.add(KeycloakTransactionCommitter.class);
singletons.add(new ObjectMapperResolver(Boolean.parseBoolean(System.getProperty("keycloak.jsonPrettyPrint", "false"))));
migrateModel();
services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.keycloak.services.resources.admin;
import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.jboss.logging.Logger;
import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.spi.HttpRequest;
services/src/main/java/org/keycloak/services/util/JsonConfigProvider.java
+11 -11
View File
@@ -1,6 +1,6 @@
package org.keycloak.services.util;
import org.codehaus.jackson.JsonNode;
import com.fasterxml.jackson.databind.JsonNode;
import org.keycloak.Config;
import org.keycloak.common.util.StringPropertyReplacer;
@@ -23,7 +23,7 @@ public class JsonConfigProvider implements Config.ConfigProvider {
@Override
public String getProvider(String spi) {
JsonNode n = getNode(config, spi, "provider");
return n != null ? replaceProperties(n.getTextValue()) : null;
return n != null ? replaceProperties(n.textValue()) : null;
}
@Override
@@ -71,7 +71,7 @@ public class JsonConfigProvider implements Config.ConfigProvider {
if (n == null) {
return defaultValue;
}
return replaceProperties(n.getTextValue());
return replaceProperties(n.textValue());
}
@Override
@@ -86,11 +86,11 @@ public class JsonConfigProvider implements Config.ConfigProvider {
} else if (n.isArray()) {
String[] a = new String[n.size()];
for (int i = 0; i < a.length; i++) {
a[i] = replaceProperties(n.get(i).getTextValue());
a[i] = replaceProperties(n.get(i).textValue());
}
return a;
} else {
return new String[] { replaceProperties(n.getTextValue()) };
return new String[] { replaceProperties(n.textValue()) };
}
}
@@ -109,9 +109,9 @@ public class JsonConfigProvider implements Config.ConfigProvider {
return defaultValue;
}
if (n.isTextual()) {
return Integer.parseInt(replaceProperties(n.getTextValue()));
return Integer.parseInt(replaceProperties(n.textValue()));
} else {
return n.getIntValue();
return n.intValue();
}
}
@@ -130,9 +130,9 @@ public class JsonConfigProvider implements Config.ConfigProvider {
return defaultValue;
}
if (n.isTextual()) {
return Long.parseLong(replaceProperties(n.getTextValue()));
return Long.parseLong(replaceProperties(n.textValue()));
} else {
return n.getLongValue();
return n.longValue();
}
}
@@ -151,9 +151,9 @@ public class JsonConfigProvider implements Config.ConfigProvider {
return defaultValue;
}
if (n.isTextual()) {
return Boolean.parseBoolean(replaceProperties(n.getTextValue()));
return Boolean.parseBoolean(replaceProperties(n.textValue()));
} else {
return n.getBooleanValue();
return n.booleanValue();
}
}
services/src/main/java/org/keycloak/services/util/ObjectMapperResolver.java
+5 -5
View File
@@ -1,8 +1,8 @@
package org.keycloak.services.util;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Provider;
@@ -18,9 +18,9 @@ public class ObjectMapperResolver implements ContextResolver<ObjectMapper> {
protected ObjectMapper mapper = new ObjectMapper();
public ObjectMapperResolver(boolean indent) {
mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
if (indent) {
mapper.enable(SerializationConfig.Feature.INDENT_OUTPUT);
mapper.enable(SerializationFeature.INDENT_OUTPUT);
}
}