From faa6c498b572eba42a3e21ba5690b27369ee53b8 Mon Sep 17 00:00:00 2001 From: Michiel Oliemans Date: Tue, 31 Mar 2020 09:18:59 +0200 Subject: [PATCH] Change name of ObjectMapperConfigurer to prevent conflict with graphql-java-tools fix #234 --- gradle.properties | 2 +- .../kickstart/execution/GraphQLObjectMapper.java | 6 +++--- .../config/ConfiguringObjectMapperProvider.java | 10 +++++----- ....java => GraphQLServletObjectMapperConfigurer.java} | 2 +- ...> DefaultGraphQLServletObjectMapperConfigurer.java} | 4 ++-- travis-build.sh | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/{ObjectMapperConfigurer.java => GraphQLServletObjectMapperConfigurer.java} (75%) rename graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/{DefaultObjectMapperConfigurer.java => DefaultGraphQLServletObjectMapperConfigurer.java} (76%) diff --git a/gradle.properties b/gradle.properties index 7d073a85..4f7fb5d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version = 9.0.1 +version = 9.1.0 group = com.graphql-java-kickstart PROJECT_NAME = graphql-java-servlet diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLObjectMapper.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLObjectMapper.java index a7fc3408..74cf53e2 100644 --- a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLObjectMapper.java +++ b/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 = DefaultGraphQLErrorHandler::new; - public Builder withObjectMapperConfigurer(ObjectMapperConfigurer objectMapperConfigurer) { + public Builder withObjectMapperConfigurer(GraphQLServletObjectMapperConfigurer objectMapperConfigurer) { return withObjectMapperConfigurer(() -> objectMapperConfigurer); } - public Builder withObjectMapperConfigurer(Supplier objectMapperConfigurer) { + public Builder withObjectMapperConfigurer(Supplier objectMapperConfigurer) { this.objectMapperProvider = new ConfiguringObjectMapperProvider(objectMapperConfigurer.get()); return this; } diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/ConfiguringObjectMapperProvider.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/ConfiguringObjectMapperProvider.java index 491bd5f1..bea71556 100644 --- a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/ConfiguringObjectMapperProvider.java +++ b/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); } diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/ObjectMapperConfigurer.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/GraphQLServletObjectMapperConfigurer.java similarity index 75% rename from graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/ObjectMapperConfigurer.java rename to graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/GraphQLServletObjectMapperConfigurer.java index fd514119..fd7e9c4e 100644 --- a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/ObjectMapperConfigurer.java +++ b/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); } diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/DefaultObjectMapperConfigurer.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/DefaultGraphQLServletObjectMapperConfigurer.java similarity index 76% rename from graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/DefaultObjectMapperConfigurer.java rename to graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/DefaultGraphQLServletObjectMapperConfigurer.java index d7c5b029..1fe421bc 100644 --- a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/DefaultObjectMapperConfigurer.java +++ b/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) { diff --git a/travis-build.sh b/travis-build.sh index 40e94155..ab5def76 100644 --- a/travis-build.sh +++ b/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