Merge branch 'master' into pcarrier/simpler_ro

oliemansm · web-flow · commit fd8ca5b8581e · 2019-05-21T22:19:58.000+02:00
diff --git a/examples/osgi/apache-karaf-feature/pom.xml b/examples/osgi/apache-karaf-feature/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.graphql-java-kickstart</groupId>
         <artifactId>graphql-java-servlet-osgi-examples</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>7.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>graphql-java-servlet-osgi-examples-karaf-feature</artifactId>
diff --git a/examples/osgi/apache-karaf-package/pom.xml b/examples/osgi/apache-karaf-package/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.graphql-java-kickstart</groupId>
         <artifactId>graphql-java-servlet-osgi-examples</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>7.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>graphql-java-servlet-osgi-examples-apache-karaf-package</artifactId>
@@ -112,4 +112,4 @@
 			</plugin>
 		</plugins>
     </build>
-</project>
+</project>
diff --git a/examples/osgi/buildAndRun.sh b/examples/osgi/buildAndRun.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 mvn clean install
 pushd apache-karaf-package/target
-tar zxvf graphql-java-servlet-osgi-examples-apache-karaf-package-3.0.1.tar.gz
-cd graphql-java-servlet-osgi-examples-apache-karaf-package-3.0.1/bin
+tar zxvf graphql-java-servlet-osgi-examples-apache-karaf-package-7.3.4-SNAPSHOT.tar.gz
+cd graphql-java-servlet-osgi-examples-apache-karaf-package-7.3.4-SNAPSHOT/bin
 ./karaf debug
-popd
+popd
diff --git a/examples/osgi/pom.xml b/examples/osgi/pom.xml
@@ -6,13 +6,13 @@
 
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-java-servlet-osgi-examples</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>7.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <karaf.version>4.1.6</karaf.version>
-        <graphql.java.servlet.version>6.2.1-SNAPSHOT</graphql.java.servlet.version>
-        <graphql.java.version>10.0</graphql.java.version>
+        <karaf.version>4.2.4</karaf.version>
+        <graphql.java.servlet.version>7.3.4-SNAPSHOT</graphql.java.servlet.version>
+        <graphql.java.version>11.0</graphql.java.version>
     </properties>
 
     <modules>
diff --git a/examples/osgi/providers/pom.xml b/examples/osgi/providers/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.graphql-java-kickstart</groupId>
         <artifactId>graphql-java-servlet-osgi-examples</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>7.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>graphql-java-servlet-osgi-examples-providers</artifactId>
@@ -54,4 +54,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/examples/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java b/examples/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java
@@ -25,6 +25,7 @@ public Collection<GraphQLFieldDefinition> getQueries() {
         fieldDefinitions.add(newFieldDefinition()
                 .type(GraphQLString)
                 .name("hello")
+                .description("Basic example of a GraphQL Java Servlet provider using the Apache Karaf OSGi Runtime")
                 .staticValue("world")
                 .build());
         return fieldDefinitions;
diff --git a/src/main/java/graphql/servlet/AbstractGraphQLHttpServlet.java b/src/main/java/graphql/servlet/AbstractGraphQLHttpServlet.java
@@ -106,7 +106,7 @@ public AbstractGraphQLHttpServlet(List<GraphQLServletListener> listeners) {
     }
 
     @Override
-    public void init(ServletConfig servletConfig) {
+    public void init() {
         this.configuration = getConfiguration();
 
         this.getHandler = (request, response) -> {
diff --git a/src/main/java/graphql/servlet/ConfiguringObjectMapperProvider.java b/src/main/java/graphql/servlet/ConfiguringObjectMapperProvider.java
@@ -1,32 +1,34 @@
 package graphql.servlet;
 
-import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 
 public class ConfiguringObjectMapperProvider implements ObjectMapperProvider {
 
+  private final ObjectMapper objectMapperTemplate;
+
   private final ObjectMapperConfigurer objectMapperConfigurer;
 
+  public ConfiguringObjectMapperProvider(ObjectMapper objectMapperTemplate, ObjectMapperConfigurer objectMapperConfigurer) {
+    this.objectMapperTemplate = objectMapperTemplate == null ? new ObjectMapper() : objectMapperTemplate;
+    this.objectMapperConfigurer = objectMapperConfigurer == null ? new DefaultObjectMapperConfigurer() : objectMapperConfigurer;
+  }
+
+  public ConfiguringObjectMapperProvider(ObjectMapper objectMapperTemplate) {
+      this(objectMapperTemplate, null);
+  }
+
   public ConfiguringObjectMapperProvider(ObjectMapperConfigurer objectMapperConfigurer) {
-    this.objectMapperConfigurer = objectMapperConfigurer;
+    this(null, objectMapperConfigurer);
   }
 
   public ConfiguringObjectMapperProvider() {
-    this.objectMapperConfigurer = new DefaultObjectMapperConfigurer();
+    this(null, null);
   }
 
   @Override
   public ObjectMapper provide() {
-    ObjectMapper mapper = new ObjectMapper().disable(
-      SerializationFeature.FAIL_ON_EMPTY_BEANS).registerModule(new Jdk8Module());
-    objectMapperConfigurer.configure(mapper);
-
-    InjectableValues.Std injectableValues = new InjectableValues.Std();
-    injectableValues.addValue(ObjectMapper.class, mapper);
-    mapper.setInjectableValues(injectableValues);
-
+    ObjectMapper mapper = this.objectMapperTemplate.copy();
+    this.objectMapperConfigurer.configure(mapper);
     return mapper;
   }
 }
diff --git a/src/main/java/graphql/servlet/DefaultGraphQLServlet.java b/src/main/java/graphql/servlet/DefaultGraphQLServlet.java
@@ -1,15 +1,7 @@
 package graphql.servlet;
 
-import javax.servlet.ServletConfig;
-
 public class DefaultGraphQLServlet extends AbstractGraphQLHttpServlet {
 
-    @Override
-    public void init(ServletConfig servletConfig) {
-
-        super.init(servletConfig);
-    }
-
     @Override
     protected GraphQLInvocationInputFactory getInvocationInputFactory() {
         return null;
diff --git a/src/main/java/graphql/servlet/DefaultObjectMapperConfigurer.java b/src/main/java/graphql/servlet/DefaultObjectMapperConfigurer.java
@@ -1,13 +1,20 @@
 package graphql.servlet;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 
 /**
  * @author Andrew Potter
  */
 public class DefaultObjectMapperConfigurer implements ObjectMapperConfigurer {
+
     @Override
     public void configure(ObjectMapper mapper) {
-
+        // default configuration for GraphQL Java Servlet
+        mapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+        mapper.registerModule(new Jdk8Module());
+        mapper.setDefaultPropertyInclusion(JsonInclude.Include.ALWAYS);
     }
 }
diff --git a/src/main/java/graphql/servlet/GraphQLObjectMapper.java b/src/main/java/graphql/servlet/GraphQLObjectMapper.java
@@ -1,6 +1,5 @@
 package graphql.servlet;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.MappingIterator;
@@ -45,8 +44,7 @@ public ObjectMapper getJacksonMapper() {
             synchronized(this) {
                 result = mapper;
                 if (result == null) { // Second check (with locking)
-                    mapper = result = objectMapperProvider.provide().copy();
-                    mapper.setDefaultPropertyInclusion(JsonInclude.Include.ALWAYS);
+                    mapper = result = objectMapperProvider.provide();
                 }
             }
         }
diff --git a/src/main/java/graphql/servlet/internal/VariablesDeserializer.java b/src/main/java/graphql/servlet/internal/VariablesDeserializer.java
@@ -1,10 +1,10 @@
 package graphql.servlet.internal;
 
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.util.Map;
@@ -15,17 +15,17 @@
 public class VariablesDeserializer extends JsonDeserializer<Map<String, Object>> {
     @Override
     public Map<String, Object> deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        return deserializeVariablesObject(p.readValueAs(Object.class), (ObjectMapper) ctxt.findInjectableValue(ObjectMapper.class.getName(), null, null));
+        return deserializeVariablesObject(p.readValueAs(Object.class), p.getCodec());
     }
 
-    public static Map<String, Object> deserializeVariablesObject(Object variables, ObjectMapper mapper) {
+    public static Map<String, Object> deserializeVariablesObject(Object variables, ObjectCodec codec) {
         if (variables instanceof Map) {
             @SuppressWarnings("unchecked")
             Map<String, Object> genericVariables = (Map<String, Object>) variables;
             return genericVariables;
         } else if (variables instanceof String) {
             try {
-                return mapper.readValue((String) variables, new TypeReference<Map<String, Object>>() {});
+                return codec.readValue(codec.getFactory().createParser((String) variables), new TypeReference<Map<String, Object>>() {});
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public AbstractGraphQLHttpServlet(List<GraphQLServletListener> listeners) {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`@Override`
`109`		`- public void init(ServletConfig servletConfig) {`
	`109`	`+ public void init() {`
`110`	`110`	`this.configuration = getConfiguration();`
`111`	`111`
`112`	`112`	`this.getHandler = (request, response) -> {`