remove jackson 2, unify dependency approach

nkonev · nkonev · commit 2932040075b1 · 2025-10-10T00:15:01.000+03:00
diff --git a/multipart-spring-graphql/pom.xml b/multipart-spring-graphql/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>multipart-spring-graphql-parent</artifactId>
         <groupId>name.nkonev.multipart-spring-graphql</groupId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -26,6 +26,17 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-restclient</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-webclient</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -41,18 +52,6 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-restclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-webclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/multipart-spring-graphql/src/main/java/name/nkonev/multipart/spring/graphql/server/webmvc/MultipartGraphQlHttpHandler.java b/multipart-spring-graphql/src/main/java/name/nkonev/multipart/spring/graphql/server/webmvc/MultipartGraphQlHttpHandler.java
@@ -2,26 +2,25 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.HashMap;
 import java.util.concurrent.ExecutionException;
 
-
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.Part;
 import name.nkonev.multipart.spring.graphql.server.support.MultipartVariableMapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.core.ResolvableType;
 import org.springframework.http.HttpCookie;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
-import org.springframework.http.converter.GenericHttpMessageConverter;
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 import org.springframework.util.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -56,13 +55,13 @@ public class MultipartGraphQlHttpHandler {
 
     private final WebGraphQlHandler graphQlHandler;
 
-    private final GenericHttpMessageConverter genericHttpMessageConverter;
+    private final JacksonJsonHttpMessageConverter httpMessageConverter;
 
-    public MultipartGraphQlHttpHandler(WebGraphQlHandler graphQlHandler, GenericHttpMessageConverter genericHttpMessageConverter) {
+    public MultipartGraphQlHttpHandler(WebGraphQlHandler graphQlHandler, JacksonJsonHttpMessageConverter httpMessageConverter) {
         Assert.notNull(graphQlHandler, "WebGraphQlHandler is required");
-        Assert.notNull(genericHttpMessageConverter, "GenericHttpMessageConverter is required");
+        Assert.notNull(httpMessageConverter, "GenericHttpMessageConverter is required");
         this.graphQlHandler = graphQlHandler;
-        this.genericHttpMessageConverter = genericHttpMessageConverter;
+        this.httpMessageConverter = httpMessageConverter;
     }
 
     public ServerResponse handleMultipartRequest(ServerRequest serverRequest) throws Exception {
@@ -71,7 +70,7 @@ public ServerResponse handleMultipartRequest(ServerRequest serverRequest) throws
         Map<String, Object> inputQuery = Optional.ofNullable(this.<Map<String, Object>>deserializePart(
             httpServletRequest,
             "operations",
-            MAP_PARAMETERIZED_TYPE_REF.getType()
+            ResolvableType.forType(MAP_PARAMETERIZED_TYPE_REF.getType())
         )).orElse(new HashMap<>());
 
         final Map<String, Object> queryVariables = getFromMapOrEmpty(inputQuery, "variables");
@@ -82,7 +81,7 @@ public ServerResponse handleMultipartRequest(ServerRequest serverRequest) throws
         Map<String, List<String>> fileMappings = Optional.ofNullable(this.<Map<String, List<String>>>deserializePart(
             httpServletRequest,
             "map",
-            LIST_PARAMETERIZED_TYPE_REF.getType()
+            ResolvableType.forType(LIST_PARAMETERIZED_TYPE_REF.getType())
         )).orElse(new HashMap<>());
 
         fileMappings.forEach((String fileKey, List<String> objectPaths) -> {
@@ -171,13 +170,13 @@ public HttpHeaders getHeaders() {
         }
     }
 
-    private <T> T deserializePart(HttpServletRequest httpServletRequest, String name, Type type) {
+    private <T> T deserializePart(HttpServletRequest httpServletRequest, String name, ResolvableType type) {
         try {
             Part part = httpServletRequest.getPart(name);
             if (part == null) {
                 return null;
             }
-            return (T) this.genericHttpMessageConverter.read(type, null, new JsonMultipartInputMessage(part));
+            return (T) this.httpMessageConverter.read(type, new JsonMultipartInputMessage(part), null);
         } catch (IOException | ServletException e) {
             throw new RuntimeException(e);
         }
diff --git a/multipart-spring-graphql/src/main/java/name/nkonev/multipart/springboot/graphql/server/MultipartGraphQlWebFluxAutoconfiguration.java b/multipart-spring-graphql/src/main/java/name/nkonev/multipart/springboot/graphql/server/MultipartGraphQlWebFluxAutoconfiguration.java
@@ -1,6 +1,5 @@
 package name.nkonev.multipart.springboot.graphql.server;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.schema.GraphQLScalarType;
 import name.nkonev.multipart.spring.graphql.coercing.webflux.UploadCoercing;
 import name.nkonev.multipart.spring.graphql.server.webflux.MultipartGraphQlHttpHandler;
@@ -13,11 +12,12 @@
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
 import org.springframework.graphql.server.WebGraphQlHandler;
 import org.springframework.http.MediaType;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
+import org.springframework.http.codec.json.JacksonJsonDecoder;
 import org.springframework.web.reactive.function.server.RequestPredicates;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
+import tools.jackson.databind.json.JsonMapper;
 
 import static name.nkonev.multipart.spring.graphql.server.webflux.MultipartGraphQlHttpHandler.SUPPORTED_MEDIA_TYPES;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
@@ -42,11 +42,11 @@ public RuntimeWiringConfigurer runtimeWiringConfigurerUpload() {
     public RouterFunction<ServerResponse> graphQlMultipartRouterFunction(
         GraphQlProperties properties,
         WebGraphQlHandler webGraphQlHandler,
-        ObjectMapper objectMapper
+        JsonMapper jsonMapper
     ) {
         String path = properties.getHttp().getPath();
         RouterFunctions.Builder builder = RouterFunctions.route();
-        MultipartGraphQlHttpHandler graphqlMultipartHandler = new MultipartGraphQlHttpHandler(webGraphQlHandler, new Jackson2JsonDecoder(objectMapper));
+        MultipartGraphQlHttpHandler graphqlMultipartHandler = new MultipartGraphQlHttpHandler(webGraphQlHandler, new JacksonJsonDecoder(jsonMapper));
         builder = builder.POST(path, RequestPredicates.contentType(MULTIPART_FORM_DATA)
             .and(RequestPredicates.accept(SUPPORTED_MEDIA_TYPES.toArray(new MediaType[]{}))), graphqlMultipartHandler::handleMultipartRequest);
         return builder.build();
diff --git a/multipart-spring-graphql/src/main/java/name/nkonev/multipart/springboot/graphql/server/MultipartGraphQlWebMvcAutoconfiguration.java b/multipart-spring-graphql/src/main/java/name/nkonev/multipart/springboot/graphql/server/MultipartGraphQlWebMvcAutoconfiguration.java
@@ -1,11 +1,9 @@
 package name.nkonev.multipart.springboot.graphql.server;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.schema.GraphQLScalarType;
 import name.nkonev.multipart.spring.graphql.coercing.webmvc.UploadCoercing;
 import name.nkonev.multipart.spring.graphql.server.webmvc.MultipartGraphQlHttpHandler;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.graphql.autoconfigure.GraphQlProperties;
@@ -14,11 +12,12 @@
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
 import org.springframework.graphql.server.WebGraphQlHandler;
 import org.springframework.http.MediaType;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 import org.springframework.web.servlet.function.RequestPredicates;
 import org.springframework.web.servlet.function.RouterFunction;
 import org.springframework.web.servlet.function.RouterFunctions;
 import org.springframework.web.servlet.function.ServerResponse;
+import tools.jackson.databind.json.JsonMapper;
 
 import static name.nkonev.multipart.spring.graphql.server.webmvc.MultipartGraphQlHttpHandler.SUPPORTED_MEDIA_TYPES;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
@@ -43,19 +42,13 @@ public RuntimeWiringConfigurer runtimeWiringConfigurerUpload() {
     public RouterFunction<ServerResponse> graphQlMultipartRouterFunction(
         GraphQlProperties properties,
         WebGraphQlHandler webGraphQlHandler,
-        ObjectMapper objectMapper
+        JsonMapper jsonMapper
     ) {
         String path = properties.getHttp().getPath();
         RouterFunctions.Builder builder = RouterFunctions.route();
-        MultipartGraphQlHttpHandler graphqlMultipartHandler = new MultipartGraphQlHttpHandler(webGraphQlHandler, new MappingJackson2HttpMessageConverter(objectMapper));
+        MultipartGraphQlHttpHandler graphqlMultipartHandler = new MultipartGraphQlHttpHandler(webGraphQlHandler, new JacksonJsonHttpMessageConverter(jsonMapper));
         builder = builder.POST(path, RequestPredicates.contentType(MULTIPART_FORM_DATA)
             .and(RequestPredicates.accept(SUPPORTED_MEDIA_TYPES.toArray(new MediaType[]{}))), graphqlMultipartHandler::handleMultipartRequest);
         return builder.build();
     }
-
-    @Bean
-    @ConditionalOnMissingBean
-    ObjectMapper jackson2ObjectMapper() {
-        return new ObjectMapper();
-    }
 }
diff --git a/multipart-spring-graphql/src/main/java/name/nkonev/multipart/springboot/graphql/server/SchemaAutoconfiguration.java b/multipart-spring-graphql/src/main/java/name/nkonev/multipart/springboot/graphql/server/SchemaAutoconfiguration.java
@@ -10,7 +10,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.graphql.execution.GraphQlSource;
 
 @ConditionalOnWebApplication
diff --git a/multipart-spring-graphql/src/test/java/name/nkonev/multipart/spring/graphql/client/HttpGraphQlWebClientTests.java b/multipart-spring-graphql/src/test/java/name/nkonev/multipart/spring/graphql/client/HttpGraphQlWebClientTests.java
@@ -6,7 +6,7 @@
 import name.nkonev.multipart.spring.graphql.server.webflux.MultipartGraphQlHttpHandler;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
+import org.springframework.http.codec.json.JacksonJsonDecoder;
 import org.springframework.http.codec.multipart.FilePart;
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.test.web.reactive.server.HttpHandlerConnector;
@@ -86,7 +86,7 @@ void shouldSendOneCollectionOfFiles() {
     private static class MultipartHttpBuilderSetup extends AbstractBuilderSetup {
 
         public WebClient.Builder initBuilder() {
-            MultipartGraphQlHttpHandler handler = new MultipartGraphQlHttpHandler(webGraphQlHandler(), new Jackson2JsonDecoder());
+            MultipartGraphQlHttpHandler handler = new MultipartGraphQlHttpHandler(webGraphQlHandler(), new JacksonJsonDecoder());
             RouterFunction<ServerResponse> routerFunction = route().POST("/**", handler::handleMultipartRequest).build();
             HttpHandler httpHandler = RouterFunctions.toHttpHandler(routerFunction, HandlerStrategies.withDefaults());
             HttpHandlerConnector connector = new HttpHandlerConnector(httpHandler);
diff --git a/multipart-spring-graphql/src/test/java/name/nkonev/multipart/spring/graphql/client/utils/MockExecutionGraphQlService.java b/multipart-spring-graphql/src/test/java/name/nkonev/multipart/spring/graphql/client/utils/MockExecutionGraphQlService.java
@@ -16,8 +16,6 @@
 
 package name.nkonev.multipart.spring.graphql.client.utils;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.*;
 import org.springframework.graphql.ExecutionGraphQlRequest;
 import org.springframework.graphql.ExecutionGraphQlResponse;
@@ -27,6 +25,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import reactor.core.publisher.Mono;
+import tools.jackson.databind.json.JsonMapper;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -40,7 +39,7 @@
  */
 public class MockExecutionGraphQlService implements ExecutionGraphQlService {
 
-	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+	private static final JsonMapper OBJECT_MAPPER = new JsonMapper();
 
 
 	@Nullable
@@ -125,12 +124,7 @@ public void setResponse(String document, ExecutionResult result) {
 
 	@SuppressWarnings("unchecked")
 	private Map<String, Object> decode(String json) {
-		try {
-			return OBJECT_MAPPER.readValue(json, Map.class);
-		}
-		catch (JsonProcessingException ex) {
-			throw new IllegalStateException(ex);
-		}
+		return OBJECT_MAPPER.readValue(json, Map.class);
 	}
 
 	@Override
diff --git a/multipart-spring-graphql/src/test/java/name/nkonev/multipart/spring/graphql/server/utils/GraphQlSetup.java b/multipart-spring-graphql/src/test/java/name/nkonev/multipart/spring/graphql/server/utils/GraphQlSetup.java
@@ -30,9 +30,8 @@
 import org.springframework.graphql.server.WebGraphQlHandler;
 import org.springframework.graphql.server.WebGraphQlInterceptor;
 import org.springframework.graphql.server.webflux.GraphQlHttpHandler;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.converter.GenericHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.http.codec.json.JacksonJsonDecoder;
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -55,9 +54,9 @@ public class GraphQlSetup {
 
 	private final List<WebGraphQlInterceptor> interceptors = new ArrayList<>();
 
-    private Decoder<?> jsonDecoder = new Jackson2JsonDecoder();
+    private Decoder<?> jsonDecoder = new JacksonJsonDecoder();
 
-    private GenericHttpMessageConverter genericHttpMessageConverter = new MappingJackson2HttpMessageConverter();
+    private JacksonJsonHttpMessageConverter httpMessageConverter = new JacksonJsonHttpMessageConverter();
 
 	private GraphQlSetup(Resource... schemaResources) {
 		this.graphQlSourceBuilder = GraphQlSource.schemaResourceBuilder().schemaResources(schemaResources);
@@ -121,8 +120,8 @@ public GraphQlSetup jsonDecoder(Decoder<?> jsonDecoder) {
         return this;
     }
 
-    public GraphQlSetup genericHttpMessageConverter(GenericHttpMessageConverter genericHttpMessageConverter) {
-        this.genericHttpMessageConverter = genericHttpMessageConverter;
+    public GraphQlSetup genericHttpMessageConverter(JacksonJsonHttpMessageConverter httpMessageConverter) {
+        this.httpMessageConverter = httpMessageConverter;
         return this;
     }
 
@@ -161,7 +160,7 @@ public org.springframework.graphql.server.webmvc.GraphQlHttpHandler toHttpHandle
 	}
 
     public name.nkonev.multipart.spring.graphql.server.webmvc.MultipartGraphQlHttpHandler toHttpHandlerMultipart() {
-        return new name.nkonev.multipart.spring.graphql.server.webmvc.MultipartGraphQlHttpHandler(toWebGraphQlHandler(), genericHttpMessageConverter);
+        return new name.nkonev.multipart.spring.graphql.server.webmvc.MultipartGraphQlHttpHandler(toWebGraphQlHandler(), httpMessageConverter);
     }
 
     public GraphQlHttpHandler toHttpHandlerWebFlux() {
diff --git a/multipart-spring-graphql/src/test/java/name/nkonev/multipart/spring/graphql/server/webflux/GraphQlHttpHandlerTests.java b/multipart-spring-graphql/src/test/java/name/nkonev/multipart/spring/graphql/server/webflux/GraphQlHttpHandlerTests.java
@@ -14,7 +14,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.EncoderHttpMessageWriter;
 import org.springframework.http.codec.HttpMessageWriter;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
+import org.springframework.http.codec.json.JacksonJsonEncoder;
 import org.springframework.http.codec.multipart.FilePart;
 import org.springframework.http.codec.multipart.Part;
 import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
@@ -37,7 +37,7 @@
 
 public class GraphQlHttpHandlerTests {
 
-    private final Jackson2JsonEncoder jackson2JsonEncoder = new Jackson2JsonEncoder();
+    private final JacksonJsonEncoder jackson2JsonEncoder = new JacksonJsonEncoder();
 
     @Test
     void shouldPassFile() {
@@ -167,7 +167,7 @@ private static class DefaultContext implements ServerResponse.Context {
 
         @Override
         public List<HttpMessageWriter<?>> messageWriters() {
-            return Collections.singletonList(new EncoderHttpMessageWriter<>(new Jackson2JsonEncoder()));
+            return Collections.singletonList(new EncoderHttpMessageWriter<>(new JacksonJsonEncoder()));
         }
 
         @Override
diff --git a/multipart-spring-graphql/src/test/java/name/nkonev/multipart/spring/graphql/server/webmvc/GraphQlHttpHandlerTests.java b/multipart-spring-graphql/src/test/java/name/nkonev/multipart/spring/graphql/server/webmvc/GraphQlHttpHandlerTests.java
@@ -1,23 +1,20 @@
 package name.nkonev.multipart.spring.graphql.server.webmvc;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.schema.GraphQLScalarType;
-import jakarta.servlet.ServletException;
 import name.nkonev.multipart.spring.graphql.coercing.webmvc.UploadCoercing;
 import name.nkonev.multipart.spring.graphql.server.utils.GraphQlSetup;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 import org.springframework.mock.web.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.function.AsyncServerResponse;
-import org.springframework.web.servlet.function.EntityResponse;
 import org.springframework.web.servlet.function.ServerRequest;
 import org.springframework.web.servlet.function.ServerResponse;
+import tools.jackson.databind.json.JsonMapper;
 
 import java.io.IOException;
 import java.util.*;
@@ -29,9 +26,9 @@
 public class GraphQlHttpHandlerTests {
 
     private static final List<HttpMessageConverter<?>> MESSAGE_READERS =
-            Collections.singletonList(new MappingJackson2HttpMessageConverter());
+            Collections.singletonList(new JacksonJsonHttpMessageConverter());
 
-    private final ObjectMapper objectMapper = new ObjectMapper();
+    private final JsonMapper jsonMapper = new JsonMapper();
 
     @Test
     void shouldPassFile() throws Exception {
@@ -132,11 +129,7 @@ private MockMultipartFile getMultipartFile(String partName, Object objectResourc
     }
 
     private byte[] getJsonArray(Object o) {
-        try {
-            return objectMapper.writeValueAsBytes(o);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+        return jsonMapper.writeValueAsBytes(o);
     }
 
     private MockHttpServletResponse handleMultipartRequest(
diff --git a/pom.xml b/pom.xml
diff --git a/readme.md b/readme.md
