Change name of ObjectMapperConfigurer to prevent conflict with graphql-java-tools fix #234

Author: oliemansm

gradle.properties

@@ -1,4 +1,4 @@
-version = 9.0.1
+version = 9.1.0
 group = com.graphql-java-kickstart
 
 PROJECT_NAME = graphql-java-servlet

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLObjectMapper.java

@@ -14,7 +14,7 @@
 import graphql.GraphQLError;
 import graphql.execution.ExecutionPath;
 import graphql.kickstart.execution.config.ConfiguringObjectMapperProvider;
-import graphql.kickstart.execution.config.ObjectMapperConfigurer;
+import graphql.kickstart.execution.config.GraphQLServletObjectMapperConfigurer;
 import graphql.kickstart.execution.config.ObjectMapperProvider;
 import graphql.kickstart.execution.error.DefaultGraphQLErrorHandler;
 import graphql.kickstart.execution.error.GraphQLErrorHandler;
@@ -192,11 +192,11 @@ public static class Builder {
     private ObjectMapperProvider objectMapperProvider = new ConfiguringObjectMapperProvider();
     private Supplier<GraphQLErrorHandler> graphQLErrorHandler = DefaultGraphQLErrorHandler::new;
 
-    public Builder withObjectMapperConfigurer(ObjectMapperConfigurer objectMapperConfigurer) {
+    public Builder withObjectMapperConfigurer(GraphQLServletObjectMapperConfigurer objectMapperConfigurer) {
       return withObjectMapperConfigurer(() -> objectMapperConfigurer);
     }
 
-    public Builder withObjectMapperConfigurer(Supplier<ObjectMapperConfigurer> objectMapperConfigurer) {
+    public Builder withObjectMapperConfigurer(Supplier<GraphQLServletObjectMapperConfigurer> objectMapperConfigurer) {
       this.objectMapperProvider = new ConfiguringObjectMapperProvider(objectMapperConfigurer.get());
       return this;
     }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/ConfiguringObjectMapperProvider.java

@@ -1,24 +1,24 @@
 package graphql.kickstart.execution.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import graphql.kickstart.execution.error.DefaultObjectMapperConfigurer;
+import graphql.kickstart.execution.error.DefaultGraphQLServletObjectMapperConfigurer;
 
 public class ConfiguringObjectMapperProvider implements ObjectMapperProvider {
 
   private final ObjectMapper objectMapperTemplate;
 
-  private final ObjectMapperConfigurer objectMapperConfigurer;
+  private final GraphQLServletObjectMapperConfigurer objectMapperConfigurer;
 
-  public ConfiguringObjectMapperProvider(ObjectMapper objectMapperTemplate, ObjectMapperConfigurer objectMapperConfigurer) {
+  public ConfiguringObjectMapperProvider(ObjectMapper objectMapperTemplate, GraphQLServletObjectMapperConfigurer objectMapperConfigurer) {
     this.objectMapperTemplate = objectMapperTemplate == null ? new ObjectMapper() : objectMapperTemplate;
-    this.objectMapperConfigurer = objectMapperConfigurer == null ? new DefaultObjectMapperConfigurer() : objectMapperConfigurer;
+    this.objectMapperConfigurer = objectMapperConfigurer == null ? new DefaultGraphQLServletObjectMapperConfigurer() : objectMapperConfigurer;
   }
 
   public ConfiguringObjectMapperProvider(ObjectMapper objectMapperTemplate) {
       this(objectMapperTemplate, null);
   }
 
-  public ConfiguringObjectMapperProvider(ObjectMapperConfigurer objectMapperConfigurer) {
+  public ConfiguringObjectMapperProvider(GraphQLServletObjectMapperConfigurer objectMapperConfigurer) {
     this(null, objectMapperConfigurer);
   }
 

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/ObjectMapperConfigurer.java renamed to graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/GraphQLServletObjectMapperConfigurer.java

@@ -5,6 +5,6 @@
 /**
  * @author Andrew Potter
  */
-public interface ObjectMapperConfigurer {
+public interface GraphQLServletObjectMapperConfigurer {
     void configure(ObjectMapper mapper);
 }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/DefaultObjectMapperConfigurer.java renamed to graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/DefaultGraphQLServletObjectMapperConfigurer.java

@@ -4,12 +4,12 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-import graphql.kickstart.execution.config.ObjectMapperConfigurer;
+import graphql.kickstart.execution.config.GraphQLServletObjectMapperConfigurer;
 
 /**
  * @author Andrew Potter
  */
-public class DefaultObjectMapperConfigurer implements ObjectMapperConfigurer {
+public class DefaultGraphQLServletObjectMapperConfigurer implements GraphQLServletObjectMapperConfigurer {
 
     @Override
     public void configure(ObjectMapper mapper) {

travis-build.sh

@@ -14,7 +14,7 @@ EOL
     chmod 600 $HOME/.netrc
 }
 
-if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then
+if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && [ "${RELEASE}" = "true" ]; then
     saveGitCredentials
     git checkout -f ${TRAVIS_BRANCH}
     if [ "${RELEASE}" = "true" ]; then