smoyer64 closed pull request #18: Move Jackson configuration into a Factory and
Provider
URL: https://github.com/apache/directory-scimple/pull/18
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperContextResolver.java
b/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperContextResolver.java
index 69235f8..cd2a5b0 100644
---
a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperContextResolver.java
+++
b/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperContextResolver.java
@@ -19,55 +19,27 @@
package org.apache.directory.scim.server.rest;
-import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.Provider;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
-import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
import org.apache.directory.scim.server.schema.Registry;
-import org.apache.directory.scim.spec.resources.ScimResource;
-@Provider
+/**
+ * @deprecated Use {@link ScimJacksonJaxbJsonProvider} instead.
+ */
+@Deprecated
public class ObjectMapperContextResolver extends
edu.psu.swe.commons.jaxrs.server.ObjectMapperContextResolver {
- private final ObjectMapper objectMapper;
+ private ObjectMapper objectMapper;
@Inject
- Registry registry;
-
- //Called through normal injection and calls Post Construct
- public ObjectMapperContextResolver() {
- super();
- objectMapper = super.getContext(null);
- }
-
- //Not call through container context and therefore must manually call
postConstruct method
public ObjectMapperContextResolver(Registry registry) {
- this();
- this.registry = registry;
- postConstruct();
- }
-
- @PostConstruct
- protected void postConstruct() {
- SimpleModule module = new SimpleModule();
- module.addDeserializer(ScimResource.class, new
ScimResourceDeserializer(this.registry, this.objectMapper));
- this.objectMapper.registerModule(module);
+ objectMapper = new ObjectMapperFactory(registry).createObjectMapper();
}
@Override
public ObjectMapper getContext(Class<?> type) {
return objectMapper;
}
-
}
diff --git
a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperFactory.java
b/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperFactory.java
new file mode 100644
index 0000000..8442459
--- /dev/null
+++
b/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperFactory.java
@@ -0,0 +1,72 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+
+* http://www.apache.org/licenses/LICENSE-2.0
+
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+package org.apache.directory.scim.server.rest;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.AnnotationIntrospector;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
+import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+import org.apache.directory.scim.server.schema.Registry;
+import org.apache.directory.scim.spec.resources.ScimResource;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.ws.rs.ext.Provider;
+
+/**
+ * Creates and configures an {@link ObjectMapper} used for {@code
application/scim+json} parsing.
+ */
+@Provider
+public class ObjectMapperFactory {
+
+ private final Registry registry;
+
+ @Inject
+ public ObjectMapperFactory(Registry registry) {
+ this.registry = registry;
+ }
+
+ @Produces
+ public ObjectMapper createObjectMapper() {
+
+ ObjectMapper objectMapper = new ObjectMapper();
+
+ objectMapper.registerModule(new JaxbAnnotationModule());
+ objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
false);
+
+ AnnotationIntrospector jaxbIntrospector = new
JaxbAnnotationIntrospector(objectMapper.getTypeFactory());
+ AnnotationIntrospector jacksonIntrospector = new
JacksonAnnotationIntrospector();
+ AnnotationIntrospector pair = new
AnnotationIntrospectorPair(jacksonIntrospector, jaxbIntrospector);
+ objectMapper.setAnnotationIntrospector(pair);
+
+ objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+ SimpleModule module = new SimpleModule();
+ module.addDeserializer(ScimResource.class, new
ScimResourceDeserializer(registry, objectMapper));
+ objectMapper.registerModule(module);
+
+ return objectMapper;
+ }
+}
diff --git
a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimJacksonJaxbJsonProvider.java
b/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimJacksonJaxbJsonProvider.java
new file mode 100644
index 0000000..421191d
--- /dev/null
+++
b/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimJacksonJaxbJsonProvider.java
@@ -0,0 +1,43 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+
+* http://www.apache.org/licenses/LICENSE-2.0
+
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+package org.apache.directory.scim.server.rest;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import org.apache.directory.scim.spec.protocol.Constants;
+
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.ext.Provider;
+
+/**
+ * Adds JacksonJaxbJsonProvider for custom MediaType {@code
application/scim+json}.
+ */
+@Provider
+@Consumes(Constants.SCIM_CONTENT_TYPE)
+@Produces(Constants.SCIM_CONTENT_TYPE)
+public class ScimJacksonJaxbJsonProvider extends JacksonJaxbJsonProvider {
+
+ @Inject
+ public ScimJacksonJaxbJsonProvider(ObjectMapper objectMapper) {
+ super(objectMapper, DEFAULT_ANNOTATIONS);
+ }
+}
diff --git
a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimResourceHelper.java
b/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimResourceHelper.java
index 2dcd036..0e09681 100644
---
a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimResourceHelper.java
+++
b/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimResourceHelper.java
@@ -57,7 +57,8 @@ private ScimResourceHelper() {
clazzez.add(UserResourceImpl.class);
clazzez.add(FilterParseExceptionMapper.class);
- clazzez.add(ObjectMapperContextResolver.class);
+ // handle MediaType of application/scim+json
+ clazzez.add(ScimJacksonJaxbJsonProvider.class);
return clazzez;
}
diff --git
a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/UpdateRequestTest.java
b/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/UpdateRequestTest.java
index 9dd8f82..85bd800 100644
---
a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/UpdateRequestTest.java
+++
b/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/UpdateRequestTest.java
@@ -35,6 +35,7 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.apache.directory.scim.server.rest.ObjectMapperFactory;
import org.assertj.core.api.Assertions;
import org.junit.Assert;
import org.junit.Before;
@@ -49,7 +50,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.directory.scim.server.rest.ObjectMapperContextResolver;
import org.apache.directory.scim.server.schema.Registry;
import org.apache.directory.scim.server.utility.ExampleObjectExtension;
import org.apache.directory.scim.server.utility.Subobject;
@@ -993,8 +993,7 @@ public static ScimUser createUser1() throws
PhoneNumberParseException {
}
private ScimUser copy(ScimUser scimUser) throws IOException {
- ObjectMapperContextResolver omcr = new ObjectMapperContextResolver();
- ObjectMapper objMapper = omcr.getContext(null);
+ ObjectMapper objMapper = new
ObjectMapperFactory(registry).createObjectMapper();
String json = objMapper.writeValueAsString(scimUser);
return objMapper.readValue(json, ScimUser.class);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
