diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index dd575fd81d1..3f0e8d99568 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -26,5 +26,7 @@ c4e2bf407aa0b7a3d34605134791013ba8a2d376 f00f4fe6ed5e22cdd2e3f68370c2da96e6bbc8e7 899ed51a7b6607161fcda5c1000115a076cc4fe7 53b9d9cc4fc4091b89f84effb6e526371d3bae68 +383b1b8dee10fbed5dab6566ea0fe49caf9e15b4 +f6aab9d10212756b1d71a0568c706a9df51c322d 4822581aeff072b7649c7aec56a13a95bd58c249 eb09ce06943ccb460981afaa6b5ecfd54f8f87e2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 152fea55840..47e51691358 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,7 +130,8 @@ jobs: CTP_PROJECT_KEY: ${{ secrets.CTP_PROJECT_KEY }} SOURCE_TAG: ${{ github.ref_name }} CTP_JVM_SDK_LOG_LEVEL: OFF - + - name: Debug Jackson classpath + run: mvn dependency:tree -f examples/maven-okhttp3/pom.xml | grep -i jackson - name: Test examples run: | cd examples/maven-okhttp3 && mvn verify --no-transfer-progress diff --git a/build.gradle b/build.gradle index df68687fad7..b8df395a04b 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,7 @@ subprojects { project -> java { toolchain { - languageVersion = JavaLanguageVersion.of(11) + languageVersion = JavaLanguageVersion.of(17) } } tasks.withType(JavaCompile).configureEach { @@ -136,6 +136,7 @@ subprojects { project -> javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(17) } + jvmArgs '-Djdk.tracePinnedThreads=full' } } @@ -173,7 +174,8 @@ generateLicenseReport { } def excludeProjects = [ - 'internal-docs' + 'internal-docs', + 'commercetools-sdk-compat-v1' ] subprojects { project -> if (project.file("build.gradle").exists() && !excludeProjects.contains(project.name)) { @@ -223,7 +225,7 @@ def documentationProjects= [ ":commercetools:commercetools-okhttp-client3", ":commercetools:commercetools-okhttp-client4", ":commercetools:commercetools-reactornetty-client", - ":commercetools:commercetools-sdk-compat-v1", + //":commercetools:commercetools-sdk-compat-v1", ":commercetools:commercetools-sdk-java-api", ":commercetools:commercetools-sdk-java-history", ":commercetools:commercetools-sdk-java-importapi", diff --git a/commercetools/commercetools-graphql-api/build.gradle b/commercetools/commercetools-graphql-api/build.gradle index 74e8c974b9e..0bafb8585ad 100644 --- a/commercetools/commercetools-graphql-api/build.gradle +++ b/commercetools/commercetools-graphql-api/build.gradle @@ -35,7 +35,7 @@ dependencies { api graphql.java api jackson_core.databind api jackson_core.core - api jackson_core.datatype + //api jackson_core.datatype api 'com.netflix.graphql.dgs.codegen:graphql-dgs-codegen-shared-core:8.5.0' } @@ -55,8 +55,8 @@ generateJava { "Country": "String", "Locale": "String", "Long": "Long", - "Json": "com.fasterxml.jackson.databind.JsonNode", - "JsonPrimitive": "com.fasterxml.jackson.databind.node.ValueNode", + "Json": "tools.jackson.databind.JsonNode", + "JsonPrimitive": "tools.jackson.databind.node.ValueNode", "KeyReferenceInput": "String", "Set": "Object", "Time": "String", diff --git a/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLDataResponse.java b/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLDataResponse.java index 0d1714830e5..5459bc01c5d 100644 --- a/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLDataResponse.java +++ b/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLDataResponse.java @@ -11,9 +11,9 @@ import com.commercetools.api.models.graph_ql.GraphQLError; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import jakarta.validation.Valid; +import tools.jackson.databind.annotation.JsonDeserialize; /** * GraphQLResponse @@ -141,8 +141,8 @@ default T withGraphQLDataResponse(Function helper) { * gives a TypeReference for usage with Jackson DataBind * @return TypeReference */ - public static com.fasterxml.jackson.core.type.TypeReference typeReference() { - return new com.fasterxml.jackson.core.type.TypeReference() { + public static tools.jackson.core.type.TypeReference typeReference() { + return new tools.jackson.core.type.TypeReference() { @Override public String toString() { return "TypeReference"; diff --git a/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLModule.java b/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLModule.java index 1c76a2aa40c..33a54ad6ecf 100644 --- a/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLModule.java +++ b/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLModule.java @@ -2,7 +2,8 @@ package com.commercetools.graphql.api; import com.commercetools.api.models.graph_ql.GraphQLResponse; -import com.fasterxml.jackson.databind.module.SimpleModule; + +import tools.jackson.databind.module.SimpleModule; public class GraphQLModule extends SimpleModule { private static final long serialVersionUID = 0L; diff --git a/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLResponseMixin.java b/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLResponseMixin.java index fecbcf0f661..60708f006f8 100644 --- a/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLResponseMixin.java +++ b/commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLResponseMixin.java @@ -2,7 +2,8 @@ package com.commercetools.graphql.api; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import tools.jackson.databind.annotation.JsonDeserialize; public interface GraphQLResponseMixin { @JsonProperty("data") diff --git a/commercetools/commercetools-graphql-api/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.module.SimpleModule b/commercetools/commercetools-graphql-api/src/main/resources/META-INF/services/tools.jackson.databind.module.SimpleModule similarity index 100% rename from commercetools/commercetools-graphql-api/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.module.SimpleModule rename to commercetools/commercetools-graphql-api/src/main/resources/META-INF/services/tools.jackson.databind.module.SimpleModule diff --git a/commercetools/commercetools-importapi-utils/src/test/java/com/commercetools/sdk/ProductUtilTest.java b/commercetools/commercetools-importapi-utils/src/test/java/com/commercetools/sdk/ProductUtilTest.java index b739f3cd6c3..227c026fd3a 100644 --- a/commercetools/commercetools-importapi-utils/src/test/java/com/commercetools/sdk/ProductUtilTest.java +++ b/commercetools/commercetools-importapi-utils/src/test/java/com/commercetools/sdk/ProductUtilTest.java @@ -7,15 +7,17 @@ import com.commercetools.api.models.product.ProductProjection; import com.commercetools.api.models.product.ProductProjectionImpl; import com.commercetools.importapi.models.productvariants.*; -import com.fasterxml.jackson.databind.ObjectMapper; import io.vrap.rmf.base.client.utils.json.JsonUtils; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.json.JsonMapper; + public class ProductUtilTest { String productProjectionExample = "src/test/resources/product-projection.example.json"; - private final ObjectMapper objectMapper = new ObjectMapper(); + private final ObjectMapper objectMapper = new JsonMapper(); ProductUtil util = new ProductUtil(); @Test diff --git a/commercetools/commercetools-javanet-client/build.gradle b/commercetools/commercetools-javanet-client/build.gradle index 2d9de61fac7..70ebecc2278 100644 --- a/commercetools/commercetools-javanet-client/build.gradle +++ b/commercetools/commercetools-javanet-client/build.gradle @@ -8,6 +8,6 @@ dependencies { java { toolchain { - languageVersion = JavaLanguageVersion.of(11) + languageVersion = JavaLanguageVersion.of(17) } } diff --git a/commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/DatadogResponseSerializer.java b/commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/DatadogResponseSerializer.java index 6aeed0ae207..95954afe05e 100644 --- a/commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/DatadogResponseSerializer.java +++ b/commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/DatadogResponseSerializer.java @@ -14,13 +14,14 @@ import com.datadog.api.client.ApiClient; import com.datadog.api.client.v2.api.MetricsApi; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; import io.vrap.rmf.base.client.ApiHttpResponse; import io.vrap.rmf.base.client.ResponseSerializer; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; + /** * This serializer uses API to submit metrics to datadog. * If you are using dogstatsd, use {@link com.commercetools.monitoring.datadog.statsd.DatadogResponseSerializer} to submit metrics to datadog with statsd. @@ -83,7 +84,7 @@ public ApiHttpResponse convertResponse(ApiHttpResponse response, } @Override - public byte[] toJsonByteArray(Object value) throws JsonProcessingException { + public byte[] toJsonByteArray(Object value) throws JacksonException { Instant start = Instant.now(); byte[] result = serializer.toJsonByteArray(value); double durationInMillis = Duration.between(start, Instant.now()).toNanos() / 1_000_000.0; diff --git a/commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/statsd/DatadogResponseSerializer.java b/commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/statsd/DatadogResponseSerializer.java index fef97c28e2c..95459f6233d 100644 --- a/commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/statsd/DatadogResponseSerializer.java +++ b/commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/statsd/DatadogResponseSerializer.java @@ -9,14 +9,15 @@ import java.util.*; import java.util.stream.Collectors; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; import com.timgroup.statsd.StatsDClient; import io.vrap.rmf.base.client.ApiHttpResponse; import io.vrap.rmf.base.client.ResponseSerializer; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; + /** * This serializer uses dogstatsd library to submit metrics to datadog. * If you are not using statsd, use {@link com.commercetools.monitoring.datadog.DatadogResponseSerializer} to submit metrics to datadog with API. @@ -82,7 +83,7 @@ public ApiHttpResponse convertResponse(ApiHttpResponse response, } @Override - public byte[] toJsonByteArray(Object value) throws JsonProcessingException { + public byte[] toJsonByteArray(Object value) throws JacksonException { Instant start = Instant.now(); byte[] result = serializer.toJsonByteArray(value); double durationInMillis = Duration.between(start, Instant.now()).toNanos() / 1_000_000.0; diff --git a/commercetools/commercetools-monitoring-datadog/src/test/java/example/ResponseSerializerTest.java b/commercetools/commercetools-monitoring-datadog/src/test/java/example/ResponseSerializerTest.java index 114294fed64..2ee1b6cf499 100644 --- a/commercetools/commercetools-monitoring-datadog/src/test/java/example/ResponseSerializerTest.java +++ b/commercetools/commercetools-monitoring-datadog/src/test/java/example/ResponseSerializerTest.java @@ -9,7 +9,6 @@ import com.commercetools.monitoring.datadog.DatadogResponseSerializer; import com.datadog.api.client.ApiException; import com.datadog.api.client.v2.api.MetricsApi; -import com.fasterxml.jackson.core.JsonProcessingException; import io.vrap.rmf.base.client.ApiHttpHeaders; import io.vrap.rmf.base.client.ApiHttpResponse; @@ -19,10 +18,12 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import tools.jackson.core.JacksonException; + public class ResponseSerializerTest { @Test - public void testSerialize() throws ApiException, JsonProcessingException { + public void testSerialize() throws ApiException, JacksonException { MetricsApi metricsApi = Mockito.mock(MetricsApi.class); Mockito.when(metricsApi.submitMetrics(Mockito.any())).thenReturn(null); DatadogResponseSerializer serializer = new DatadogResponseSerializer(ResponseSerializer.of(), metricsApi); @@ -40,7 +41,7 @@ public void testSerialize() throws ApiException, JsonProcessingException { } @Test - public void testSerializeWithAttributes() throws ApiException, JsonProcessingException { + public void testSerializeWithAttributes() throws ApiException, JacksonException { MetricsApi metricsApi = Mockito.mock(MetricsApi.class); Mockito.when(metricsApi.submitMetrics(Mockito.any())).thenReturn(null); Map tags = new HashMap<>(); @@ -66,7 +67,7 @@ public void testSerializeWithAttributes() throws ApiException, JsonProcessingExc } @Test - public void testDeserialize() throws ApiException, JsonProcessingException { + public void testDeserialize() throws ApiException, JacksonException { MetricsApi metricsApi = Mockito.mock(MetricsApi.class); Mockito.when(metricsApi.submitMetrics(Mockito.any())).thenReturn(null); DatadogResponseSerializer serializer = new DatadogResponseSerializer(ResponseSerializer.of(), metricsApi); @@ -86,7 +87,7 @@ public void testDeserialize() throws ApiException, JsonProcessingException { } @Test - public void testDeserializeWithAttributes() throws ApiException, JsonProcessingException { + public void testDeserializeWithAttributes() throws ApiException, JacksonException { MetricsApi metricsApi = Mockito.mock(MetricsApi.class); Mockito.when(metricsApi.submitMetrics(Mockito.any())).thenReturn(null); Map tags = new HashMap<>(); diff --git a/commercetools/commercetools-monitoring-newrelic/src/main/java/com/commercetools/monitoring/newrelic/NewrelicResponseSerializer.java b/commercetools/commercetools-monitoring-newrelic/src/main/java/com/commercetools/monitoring/newrelic/NewrelicResponseSerializer.java index 009645c875b..0d151f6b230 100644 --- a/commercetools/commercetools-monitoring-newrelic/src/main/java/com/commercetools/monitoring/newrelic/NewrelicResponseSerializer.java +++ b/commercetools/commercetools-monitoring-newrelic/src/main/java/com/commercetools/monitoring/newrelic/NewrelicResponseSerializer.java @@ -8,14 +8,15 @@ import java.util.Collections; import java.util.Map; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; import com.newrelic.api.agent.NewRelic; import io.vrap.rmf.base.client.ApiHttpResponse; import io.vrap.rmf.base.client.ResponseSerializer; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; + /** * This serializer uses API to submit metrics to newrelic. */ @@ -64,7 +65,7 @@ public ApiHttpResponse convertResponse(ApiHttpResponse response, } @Override - public byte[] toJsonByteArray(Object value) throws JsonProcessingException { + public byte[] toJsonByteArray(Object value) throws JacksonException { Instant start = Instant.now(); byte[] result = serializer.toJsonByteArray(value); double durationInMillis = Duration.between(start, Instant.now()).toNanos() / 1_000_000.0; diff --git a/commercetools/commercetools-monitoring-opentelemetry/src/main/java/com/commercetools/monitoring/opentelemetry/OpenTelemetryResponseSerializer.java b/commercetools/commercetools-monitoring-opentelemetry/src/main/java/com/commercetools/monitoring/opentelemetry/OpenTelemetryResponseSerializer.java index d131306dfc6..5dc0d327f17 100644 --- a/commercetools/commercetools-monitoring-opentelemetry/src/main/java/com/commercetools/monitoring/opentelemetry/OpenTelemetryResponseSerializer.java +++ b/commercetools/commercetools-monitoring-opentelemetry/src/main/java/com/commercetools/monitoring/opentelemetry/OpenTelemetryResponseSerializer.java @@ -6,10 +6,6 @@ import java.util.Collections; import java.util.Map; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; - import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; @@ -18,6 +14,10 @@ import io.vrap.rmf.base.client.ApiHttpResponse; import io.vrap.rmf.base.client.ResponseSerializer; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; + /** *

The OpenTelemetry ResponseSerializer can be used to report metrics about the De-/Serialization performance. * It can be registered as a {@link ResponseSerializer} to the {@link io.vrap.rmf.base.client.ClientBuilder#withSerializer(ResponseSerializer)} ClientBuilder @@ -99,7 +99,7 @@ public ApiHttpResponse convertResponse(ApiHttpResponse response, } @Override - public byte[] toJsonByteArray(Object value) throws JsonProcessingException { + public byte[] toJsonByteArray(Object value) throws JacksonException { Instant start = Instant.now(); byte[] result = serializer.toJsonByteArray(value); Attributes attributes = this.attributes.toBuilder() diff --git a/commercetools/commercetools-sdk-java-api/build.gradle b/commercetools/commercetools-sdk-java-api/build.gradle index 5e4c0a10ad1..93d799158cf 100644 --- a/commercetools/commercetools-sdk-java-api/build.gradle +++ b/commercetools/commercetools-sdk-java-api/build.gradle @@ -278,10 +278,10 @@ publishing { def jacksonAnno = dependenciesNode.appendNode('dependency') jacksonAnno.appendNode('groupId', 'com.fasterxml.jackson.core') jacksonAnno.appendNode('artifactId', 'jackson-annotations') - jacksonAnno.appendNode('version', jackson_core.version) + jacksonAnno.appendNode('version', 2.21) jacksonAnno.appendNode('scope', 'compile') def jacksonDB = dependenciesNode.appendNode('dependency') - jacksonDB.appendNode('groupId', 'com.fasterxml.jackson.core') + jacksonDB.appendNode('groupId', 'tools.jackson.core') jacksonDB.appendNode('artifactId', 'jackson-databind') jacksonDB.appendNode('version', jackson_core.version) jacksonDB.appendNode('scope', 'compile') diff --git a/commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/custom_object/CustomObjectIntegrationTests.java b/commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/custom_object/CustomObjectIntegrationTests.java index c5168b347bd..6ca307e4102 100644 --- a/commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/custom_object/CustomObjectIntegrationTests.java +++ b/commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/custom_object/CustomObjectIntegrationTests.java @@ -9,9 +9,6 @@ import com.commercetools.api.models.custom_object.*; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.type.TypeFactory; import commercetools.utils.CommercetoolsTestUtils; import commercetools.utils.ValueObject; @@ -20,6 +17,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; +import tools.jackson.databind.type.TypeFactory; + public class CustomObjectIntegrationTests { @Test @@ -117,7 +118,7 @@ public void updateWithClass() { Assertions.assertEquals(typeRefCustomObject.getValue().getBars().get(1).getName(), "Winchester"); Assertions.assertEquals(typeRefCustomObject.getValue().getBars().get(1).getNumber(), 2); - JavaType javaType = TypeFactory.defaultInstance() + JavaType javaType = TypeFactory.createDefaultInstance() .constructParametricType(GenericCustomObject.class, Foo.class); GenericCustomObject javaTypeCustomObject = (GenericCustomObject) CommercetoolsTestUtils .getProjectApiRoot() diff --git a/commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/graphql/GraphQLTest.java b/commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/graphql/GraphQLTest.java index bd906137d0a..6bb2fd46ca0 100644 --- a/commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/graphql/GraphQLTest.java +++ b/commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/graphql/GraphQLTest.java @@ -11,8 +11,6 @@ import com.commercetools.api.client.ProjectApiRoot; import com.commercetools.api.models.graph_ql.GraphQLRequest; import com.commercetools.api.models.graph_ql.GraphQLResponse; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; import commercetools.utils.CommercetoolsTestUtils; import io.vrap.rmf.base.client.ApiHttpResponse; @@ -20,6 +18,9 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.node.ObjectNode; + public class GraphQLTest { @Test diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/SimpleModuleMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/SimpleModuleMixin.java index ee17bb301e6..bd94283d4dc 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/SimpleModuleMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/SimpleModuleMixin.java @@ -1,10 +1,10 @@ package com.commercetools.api; -import com.fasterxml.jackson.databind.module.SimpleModule; - import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; +import tools.jackson.databind.module.SimpleModule; + public interface SimpleModuleMixin { public void mixin(SimpleModule module, ModuleOptions options); } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/client/ConcurrentModificationMiddlewareImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/client/ConcurrentModificationMiddlewareImpl.java index 6373499add2..d1daaf36b2b 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/client/ConcurrentModificationMiddlewareImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/client/ConcurrentModificationMiddlewareImpl.java @@ -1,17 +1,12 @@ package com.commercetools.api.client; -import java.io.IOException; import java.time.temporal.ChronoUnit; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.function.Function; import com.commercetools.api.client.error.ConcurrentModificationException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.LongNode; -import com.fasterxml.jackson.databind.node.ObjectNode; import io.vrap.rmf.base.client.*; import io.vrap.rmf.base.client.http.InternalLogger; @@ -26,6 +21,12 @@ import dev.failsafe.FailsafeExecutor; import dev.failsafe.RetryPolicy; import dev.failsafe.event.ExecutionAttemptedEvent; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.json.JsonMapper; +import tools.jackson.databind.node.LongNode; +import tools.jackson.databind.node.ObjectNode; /** * Implementation of the {@link ConcurrentModificationMiddleware}. Uses {@link RetryPolicy} to retry upon {@link ConcurrentModificationException}. @@ -45,15 +46,15 @@ public class ConcurrentModificationMiddlewareImpl implements ConcurrentModificat private final FailsafeExecutor> executor; public ConcurrentModificationMiddlewareImpl() { - this(1, DEFAULT_INITIAL_DELAY, DEFAULT_MAX_DELAY, new ObjectMapper()); + this(1, DEFAULT_INITIAL_DELAY, DEFAULT_MAX_DELAY, new JsonMapper()); } public ConcurrentModificationMiddlewareImpl(final int maxRetries) { - this(maxRetries, DEFAULT_INITIAL_DELAY, DEFAULT_MAX_DELAY, new ObjectMapper()); + this(maxRetries, DEFAULT_INITIAL_DELAY, DEFAULT_MAX_DELAY, new JsonMapper()); } public ConcurrentModificationMiddlewareImpl(final int maxRetries, final long delay, final long maxDelay) { - this(maxRetries, delay, maxDelay, new ObjectMapper()); + this(maxRetries, delay, maxDelay, new JsonMapper()); } public ConcurrentModificationMiddlewareImpl(final int maxRetries, final long delay, final long maxDelay, @@ -92,7 +93,7 @@ public CompletableFuture> invoke(ApiHttpRequest request, return next.apply(request.withBody(jsonNode.toString())); } } - catch (IOException ignored) { + catch (JacksonException ignored) { } } } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModule.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModule.java index c6c26d3c6c4..3af2a3e2ef0 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModule.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModule.java @@ -6,14 +6,15 @@ import com.commercetools.api.RegisterSimpleModuleMixin; import com.commercetools.api.SimpleModuleMixin; -import com.fasterxml.jackson.databind.module.SimpleModule; import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; import org.reflections.Reflections; +import tools.jackson.databind.module.SimpleModule; + /** - * Module to configure the default jackson {@link com.fasterxml.jackson.databind.ObjectMapper} e.g. to deserialize attributes and custom fields + * Module to configure the default jackson {@link tools.jackson.databind.ObjectMapper} e.g. to deserialize attributes and custom fields */ public class ApiModule extends SimpleModule { private static final long serialVersionUID = 0L; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModuleOptions.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModuleOptions.java index 8f1d337bba2..6f6c3a82e7d 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModuleOptions.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModuleOptions.java @@ -3,10 +3,10 @@ import java.util.Map; -import com.fasterxml.jackson.core.type.TypeReference; - import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; +import tools.jackson.core.type.TypeReference; + public class ApiModuleOptions implements ModuleOptions { public static final String DESERIALIZE_DATE_ATTRIBUTE_AS_STRING = "commercetools.deserializeDateAttributeAsString"; public static final String DESERIALIZE_DATE_FIELD_AS_STRING = "commercetools.deserializeDateFieldAsString"; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModuleSupplier.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModuleSupplier.java index 82b279944b5..8dff6f4d6b9 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModuleSupplier.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModuleSupplier.java @@ -1,11 +1,11 @@ package com.commercetools.api.json; -import com.fasterxml.jackson.databind.module.SimpleModule; - import io.vrap.rmf.base.client.utils.json.ModuleSupplier; import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; +import tools.jackson.databind.module.SimpleModule; + public class ApiModuleSupplier implements ModuleSupplier { @Override public SimpleModule getModule(ModuleOptions options) { diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeDeserializer.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeDeserializer.java index 9073fa0d9a0..cee6a6790c2 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeDeserializer.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeDeserializer.java @@ -1,7 +1,6 @@ package com.commercetools.api.json; -import java.io.IOException; import java.time.LocalDate; import java.time.LocalTime; import java.time.ZonedDateTime; @@ -17,14 +16,15 @@ import com.commercetools.api.models.product.AttributeImpl; import com.commercetools.api.models.product_type.AttributeLocalizedEnumValue; import com.commercetools.api.models.product_type.AttributePlainEnumValue; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.JsonNodeType; -public class AttributeDeserializer extends JsonDeserializer { +import tools.jackson.core.JsonParser; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ValueDeserializer; +import tools.jackson.databind.node.JsonNodeType; + +public class AttributeDeserializer extends ValueDeserializer { private static Pattern p = Pattern.compile("^[0-9]"); private static Pattern dateTime = Pattern.compile( @@ -64,21 +64,22 @@ public AttributeDeserializer() { } @Override - public AttributeImpl deserialize(JsonParser p, DeserializationContext ctx) throws IOException { + public AttributeImpl deserialize(JsonParser p, DeserializationContext ctx) { JsonNode node = p.readValueAsTree(); JsonNode valueNode = node.get("value"); - String name = node.get("name").asText(); + String name = node.get("name").asString(); AttributeBuilder builder = Attribute.builder(); builder.name(name); if (attributeTypes != null && attributeTypes.containsKey(name)) { return (AttributeImpl) builder - .value(p.getCodec().treeAsTokens(valueNode).readValueAs(attributeTypes.get(name))) + .value(p.objectReadContext().treeAsTokens(valueNode).readValueAs(attributeTypes.get(name))) .build(); } - return (AttributeImpl) builder.value(p.getCodec().treeAsTokens(valueNode).readValueAs(typeRef(valueNode))) + return (AttributeImpl) builder + .value(p.objectReadContext().treeAsTokens(valueNode).readValueAs(typeRef(valueNode))) .build(); } @@ -97,7 +98,7 @@ private TypeReference typeRef(JsonNode valueNode) { }; case STRING: if (deserializeAsDate) { - String val = valueNode.asText(); + String val = valueNode.asString(); if (p.matcher(val).find()) { if (dateTime.matcher(val).find()) { return new TypeReference() { @@ -225,7 +226,7 @@ private ElemType elemType(JsonNode valueNode) { return ElemType.NUMBER; case STRING: if (deserializeAsDate) { - String val = valueNode.asText(); + String val = valueNode.asString(); if (p.matcher(val).find()) { if (dateTime.matcher(val).find()) { return ElemType.DATETIME; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeJsonNodeMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeJsonNodeMixin.java index f381d5bd490..b6a36758d46 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeJsonNodeMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeJsonNodeMixin.java @@ -1,8 +1,8 @@ package com.commercetools.api.json; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.annotation.JsonDeserialize; public interface AttributeJsonNodeMixin { @JsonDeserialize(as = JsonNode.class) diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeSerializer.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeSerializer.java index b047a39cb18..bc7b5e0af41 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeSerializer.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeSerializer.java @@ -1,44 +1,41 @@ package com.commercetools.api.json; -import java.io.IOException; import java.util.List; import com.commercetools.api.models.product.Attribute; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -public class AttributeSerializer extends JsonSerializer { +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ValueSerializer; + +public class AttributeSerializer extends ValueSerializer { @Override - public void serialize(Attribute value, JsonGenerator gen, SerializerProvider provider) throws IOException { + public void serialize(Attribute value, JsonGenerator gen, SerializationContext provider) { gen.writeStartObject(); - gen.writeStringField("name", value.getName()); + gen.writeStringProperty("name", value.getName()); Object val = value.getValue(); if (val instanceof Double) { - gen.writeFieldName("value"); + gen.writeName("value"); new DoubleSerializer().serialize((Double) value.getValue(), gen, provider); } else if (val instanceof List) { - gen.writeArrayFieldStart("value"); + gen.writeArrayPropertyStart("value"); ((List) val).forEach(o -> { - try { - if (o instanceof Double) { - new DoubleSerializer().serialize((Double) o, gen, provider); - } - else { - provider.defaultSerializeValue(o, gen); - } + if (o instanceof Double) { + new DoubleSerializer().serialize((Double) o, gen, provider); } - catch (IOException e) { - throw new RuntimeException(e); + else { + Object plainObject = o; + gen.writePOJO(plainObject); } }); gen.writeEndArray(); } else { - provider.defaultSerializeField("value", value.getValue(), gen); + gen.writeName("value"); + gen.writePOJO(value.getValue()); } gen.writeEndObject(); diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/CustomFieldDeserializer.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/CustomFieldDeserializer.java index e134a7adcd6..6e6ab816d45 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/CustomFieldDeserializer.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/CustomFieldDeserializer.java @@ -1,7 +1,6 @@ package com.commercetools.api.json; -import java.io.IOException; import java.time.LocalDate; import java.time.LocalTime; import java.time.ZonedDateTime; @@ -16,14 +15,15 @@ import com.commercetools.api.models.type.CustomFieldLocalizedEnumValue; import com.commercetools.api.models.type.FieldContainerBuilder; import com.commercetools.api.models.type.FieldContainerImpl; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.JsonNodeType; -public class CustomFieldDeserializer extends JsonDeserializer { +import tools.jackson.core.JsonParser; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ValueDeserializer; +import tools.jackson.databind.node.JsonNodeType; + +public class CustomFieldDeserializer extends ValueDeserializer { private static Pattern p = Pattern.compile("^[0-9]"); private static Pattern dateTime = Pattern.compile( @@ -62,13 +62,14 @@ public CustomFieldDeserializer() { } @Override - public FieldContainerImpl deserialize(JsonParser p, DeserializationContext ctx) throws IOException { + public FieldContainerImpl deserialize(JsonParser p, DeserializationContext ctx) { JsonNode node = p.readValueAsTree(); FieldContainerBuilder builder = FieldContainerBuilder.of(); - node.fields() + node.properties() + .iterator() .forEachRemaining(nodeEntry -> builder.addValue(nodeEntry.getKey(), mapValue(p, nodeEntry.getKey(), nodeEntry.getValue()))); @@ -76,15 +77,10 @@ public FieldContainerImpl deserialize(JsonParser p, DeserializationContext ctx) } private Object mapValue(final JsonParser p, final String name, final JsonNode nodeValue) { - try { - if (customFieldTypes != null && customFieldTypes.containsKey(name)) { - return p.getCodec().treeAsTokens(nodeValue).readValueAs(customFieldTypes.get(name)); - } - return p.getCodec().treeAsTokens(nodeValue).readValueAs(typeRef(nodeValue)); - } - catch (IOException e) { - throw new RuntimeException(e); + if (customFieldTypes != null && customFieldTypes.containsKey(name)) { + return p.objectReadContext().treeAsTokens(nodeValue).readValueAs(customFieldTypes.get(name)); } + return p.objectReadContext().treeAsTokens(nodeValue).readValueAs(typeRef(nodeValue)); } private TypeReference typeRef(JsonNode valueNode) { @@ -102,7 +98,7 @@ private TypeReference typeRef(JsonNode valueNode) { }; case STRING: if (deserializeAsDate) { - String val = valueNode.asText(); + String val = valueNode.asString(); if (p.matcher(val).find()) { if (dateTime.matcher(val).find()) { return new TypeReference() { @@ -217,7 +213,7 @@ private ElemType elemType(JsonNode valueNode) { return ElemType.NUMBER; case STRING: if (deserializeAsDate) { - String val = valueNode.asText(); + String val = valueNode.asString(); if (p.matcher(val).find()) { if (dateTime.matcher(val).find()) { return ElemType.DATETIME; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/CustomFieldJsonNodeDeserializer.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/CustomFieldJsonNodeDeserializer.java index 62b23c8e0a9..173d74141ec 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/CustomFieldJsonNodeDeserializer.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/CustomFieldJsonNodeDeserializer.java @@ -1,28 +1,29 @@ package com.commercetools.api.json; -import java.io.IOException; - import com.commercetools.api.models.type.FieldContainerBuilder; import com.commercetools.api.models.type.FieldContainerImpl; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -public class CustomFieldJsonNodeDeserializer extends JsonDeserializer { +import tools.jackson.core.JsonParser; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ValueDeserializer; + +public class CustomFieldJsonNodeDeserializer extends ValueDeserializer { public CustomFieldJsonNodeDeserializer() { } @Override - public FieldContainerImpl deserialize(JsonParser p, DeserializationContext ctx) throws IOException { + public FieldContainerImpl deserialize(JsonParser p, DeserializationContext ctx) { JsonNode node = p.readValueAsTree(); FieldContainerBuilder builder = FieldContainerBuilder.of(); - node.fields().forEachRemaining(nodeEntry -> builder.addValue(nodeEntry.getKey(), nodeEntry.getValue())); + node.properties() + .iterator() + .forEachRemaining(nodeEntry -> builder.addValue(nodeEntry.getKey(), nodeEntry.getValue())); return (FieldContainerImpl) builder.build(); } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/DoubleSerializer.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/DoubleSerializer.java index 43687967d96..dda54a92e82 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/DoubleSerializer.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/DoubleSerializer.java @@ -1,11 +1,9 @@ package com.commercetools.api.json; -import java.io.IOException; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ser.std.StdScalarSerializer; public class DoubleSerializer extends StdScalarSerializer { @@ -15,7 +13,7 @@ public DoubleSerializer() { super(Double.class); } - public void serialize(Double value, JsonGenerator gen, SerializerProvider arg2) throws IOException { + public void serialize(Double value, JsonGenerator gen, SerializationContext arg2) { if (value.intValue() == value) gen.writeNumber(value.intValue()); else diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/FieldContainerImplMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/FieldContainerImplMixin.java index 77df9ac28d8..8b0c830d927 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/FieldContainerImplMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/FieldContainerImplMixin.java @@ -1,8 +1,8 @@ package com.commercetools.api.json; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.annotation.JsonDeserialize; public interface FieldContainerImplMixin { @JsonDeserialize(as = JsonNode.class) diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/FieldContainerSerializer.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/FieldContainerSerializer.java index 260a670223d..b42fb20fa41 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/FieldContainerSerializer.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/FieldContainerSerializer.java @@ -1,49 +1,41 @@ package com.commercetools.api.json; -import java.io.IOException; import java.util.List; import com.commercetools.api.models.type.FieldContainer; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -public class FieldContainerSerializer extends JsonSerializer { +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ValueSerializer; + +public class FieldContainerSerializer extends ValueSerializer { @Override - public void serialize(FieldContainer value, JsonGenerator gen, SerializerProvider provider) throws IOException { + public void serialize(FieldContainer value, JsonGenerator gen, SerializationContext provider) { gen.writeStartObject(); value.values().forEach((key, val) -> { - try { - if (val instanceof Double) { - gen.writeFieldName(key); - new DoubleSerializer().serialize((Double) val, gen, provider); - } - else if (val instanceof List) { - gen.writeArrayFieldStart(key); - ((List) val).forEach(o -> { - try { - if (o instanceof Double) { - new DoubleSerializer().serialize((Double) o, gen, provider); - } - else { - provider.defaultSerializeValue(o, gen); - } - } - catch (IOException e) { - throw new RuntimeException(e); - } - }); + if (val instanceof Double) { + gen.writeName(key); + new DoubleSerializer().serialize((Double) val, gen, provider); + } + else if (val instanceof List) { + gen.writeArrayPropertyStart(key); + ((List) val).forEach(o -> { + if (o instanceof Double) { + new DoubleSerializer().serialize((Double) o, gen, provider); + } + else { + Object plainObject = o; + gen.writePOJO(plainObject); + } + }); - gen.writeEndArray(); - } - else { - provider.defaultSerializeField(key, val, gen); - } + gen.writeEndArray(); } - catch (IOException e) { - throw new RuntimeException(e); + else { + gen.writeName(key); + gen.writePOJO(val); } }); gen.writeEndObject(); diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ProductSearchFacetResultDeserializer.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ProductSearchFacetResultDeserializer.java index f5f05466b47..289b38ef3c1 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ProductSearchFacetResultDeserializer.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ProductSearchFacetResultDeserializer.java @@ -1,41 +1,41 @@ package com.commercetools.api.json; -import java.io.IOException; import java.util.List; import com.commercetools.api.models.product_search.ProductSearchFacetResult; import com.commercetools.api.models.product_search.ProductSearchFacetResultBucket; import com.commercetools.api.models.product_search.ProductSearchFacetResultBucketEntry; import com.commercetools.api.models.product_search.ProductSearchFacetResultCount; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -public class ProductSearchFacetResultDeserializer extends JsonDeserializer { +import tools.jackson.core.JsonParser; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ValueDeserializer; + +public class ProductSearchFacetResultDeserializer extends ValueDeserializer { @Override - public ProductSearchFacetResult deserialize(JsonParser p, DeserializationContext ctx) throws IOException { + public ProductSearchFacetResult deserialize(JsonParser p, DeserializationContext ctx) { JsonNode node = p.readValueAsTree(); if (node.has("buckets")) { return ProductSearchFacetResultBucket.builder() - .name(node.get("name").asText()) - .buckets(p.getCodec() - .readValue(node.get("buckets").traverse(), + .name(node.get("name").asString()) + .buckets(p.objectReadContext() + .readValue(node.get("buckets").traverse(p.objectReadContext()), new TypeReference>() { })) .build(); } else if (node.has("value")) { return ProductSearchFacetResultCount.builder() - .name(node.get("name").asText()) + .name(node.get("name").asString()) .value(node.get("value").asLong()) .build(); } - return ProductSearchFacetResult.builder().name(node.get("name").asText()).build(); + return ProductSearchFacetResult.builder().name(node.get("name").asString()).build(); } } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ProductSearchFacetResultMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ProductSearchFacetResultMixin.java index a3e700a969b..b8555fc0d6c 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ProductSearchFacetResultMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ProductSearchFacetResultMixin.java @@ -1,7 +1,7 @@ package com.commercetools.api.json; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import tools.jackson.databind.annotation.JsonDeserialize; @JsonDeserialize(using = ProductSearchFacetResultDeserializer.class) public interface ProductSearchFacetResultMixin { diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/GenericReference.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/GenericReference.java index d7294bc6ef0..d5426476f7a 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/GenericReference.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/GenericReference.java @@ -5,7 +5,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import tools.jackson.databind.annotation.JsonDeserialize; /** * generic reference interface diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedString.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedString.java index ad3743eba78..b9937690def 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedString.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedString.java @@ -17,10 +17,10 @@ import javax.annotation.Nullable; import com.fasterxml.jackson.annotation.*; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.annotation.*; import jakarta.validation.constraints.NotNull; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.annotation.JsonDeserialize; /** * A localized string is a object where the keys are {@link Locale}s (HTTP API: ISO language tags), diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java index f234ba3b8b2..e0e19f71687 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.*; import io.vrap.rmf.base.client.ModelBase; @@ -16,6 +15,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import tools.jackson.databind.annotation.*; + /** * LocalizedString implementation */ diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/Money.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/Money.java index f8dc075cd13..6e18f6104ef 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/Money.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/Money.java @@ -8,11 +8,11 @@ import javax.money.*; import com.fasterxml.jackson.annotation.*; -import com.fasterxml.jackson.databind.annotation.*; import io.vrap.rmf.base.client.utils.Generated; import jakarta.validation.constraints.NotNull; +import tools.jackson.databind.annotation.JsonDeserialize; /** *

Draft type that stores amounts in cent precision for the specified currency.

@@ -131,8 +131,8 @@ public default TypedMoneyDraft toDraft() { .build(); } - public static com.fasterxml.jackson.core.type.TypeReference typeReference() { - return new com.fasterxml.jackson.core.type.TypeReference() { + public static tools.jackson.core.type.TypeReference typeReference() { + return new tools.jackson.core.type.TypeReference() { @Override public String toString() { return "TypeReference"; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/MoneyImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/MoneyImpl.java index 60ffc09673d..e6f77e16606 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/MoneyImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/MoneyImpl.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.*; import io.vrap.rmf.base.client.ModelBase; import io.vrap.rmf.base.client.utils.Generated; @@ -14,6 +13,8 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import tools.jackson.databind.annotation.*; + /** *

Draft type that stores amounts in cent precision for the specified currency.

*

For storing money values in fractions of the minor unit in a currency, use HighPrecisionMoneyDraft instead.

diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/custom_object/GenericCustomObject.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/custom_object/GenericCustomObject.java index 22422efd143..aa1d5759b1e 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/custom_object/GenericCustomObject.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/custom_object/GenericCustomObject.java @@ -12,10 +12,10 @@ import com.commercetools.api.models.common.LastModifiedBy; import com.commercetools.api.models.common.Reference; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; +import tools.jackson.databind.annotation.JsonDeserialize; /** * entity to implement a type safe generic custom object diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/order/OrderResourceIdentifier.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/order/OrderResourceIdentifier.java index eedc0524e15..b5764503f8b 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/order/OrderResourceIdentifier.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/order/OrderResourceIdentifier.java @@ -6,7 +6,8 @@ import javax.annotation.Nullable; import com.commercetools.api.models.common.ResourceIdentifier; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import tools.jackson.databind.annotation.JsonDeserialize; /** * OrderResourceIdentifier @@ -96,8 +97,8 @@ default T withOrderResourceIdentifier(Function h * gives a TypeReference for usage with Jackson DataBind * @return TypeReference */ - public static com.fasterxml.jackson.core.type.TypeReference typeReference() { - return new com.fasterxml.jackson.core.type.TypeReference() { + public static tools.jackson.core.type.TypeReference typeReference() { + return new tools.jackson.core.type.TypeReference() { @Override public String toString() { return "TypeReference"; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/AttributeAccessor.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/AttributeAccessor.java index b911c53b7cd..6d721bf1976 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/AttributeAccessor.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/AttributeAccessor.java @@ -13,12 +13,13 @@ import com.commercetools.api.models.common.TypedMoney; import com.commercetools.api.models.product_type.AttributeLocalizedEnumValue; import com.commercetools.api.models.product_type.AttributePlainEnumValue; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; import io.vrap.rmf.base.client.utils.json.JsonException; import io.vrap.rmf.base.client.utils.json.JsonUtils; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JsonNode; + /** * Accessor for retrieving type safe attribute values */ diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/ProductModuleMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/ProductModuleMixin.java index 64b91e3ba0f..3ad7c21babe 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/ProductModuleMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/ProductModuleMixin.java @@ -7,11 +7,12 @@ import com.commercetools.api.RegisterSimpleModuleMixin; import com.commercetools.api.SimpleModuleMixin; import com.commercetools.api.json.*; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.module.SimpleModule; import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.module.SimpleModule; + @RegisterSimpleModuleMixin public class ProductModuleMixin implements SimpleModuleMixin { public void mixin(SimpleModule module, ModuleOptions options) { diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/VariantIdentifier.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/VariantIdentifier.java index 921c33efa3f..2c75685bcfc 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/VariantIdentifier.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product/VariantIdentifier.java @@ -1,7 +1,7 @@ package com.commercetools.api.models.product; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import tools.jackson.databind.annotation.JsonDeserialize; @JsonDeserialize(as = VariantIdentifierImpl.class) public interface VariantIdentifier { diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product_search/ProductSearchModuleMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product_search/ProductSearchModuleMixin.java index c7986061650..23151757041 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product_search/ProductSearchModuleMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/product_search/ProductSearchModuleMixin.java @@ -4,10 +4,11 @@ import com.commercetools.api.RegisterSimpleModuleMixin; import com.commercetools.api.SimpleModuleMixin; import com.commercetools.api.json.ProductSearchFacetResultMixin; -import com.fasterxml.jackson.databind.module.SimpleModule; import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; +import tools.jackson.databind.module.SimpleModule; + @RegisterSimpleModuleMixin public class ProductSearchModuleMixin implements SimpleModuleMixin { public void mixin(SimpleModule module, ModuleOptions options) { diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/subscription/DeliveryPayloadMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/subscription/DeliveryPayloadMixin.java index dfc40ea8f8d..1c5ad40614a 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/subscription/DeliveryPayloadMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/subscription/DeliveryPayloadMixin.java @@ -3,7 +3,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import tools.jackson.databind.annotation.JsonDeserialize; @JsonSubTypes({ @JsonSubTypes.Type(value = com.commercetools.api.models.subscription.MessageDeliveryPayloadImpl.class, name = MessageDeliveryPayload.MESSAGE), diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/subscription/SubscriptionModuleMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/subscription/SubscriptionModuleMixin.java index e6de22ac5f4..d39828e60d0 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/subscription/SubscriptionModuleMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/subscription/SubscriptionModuleMixin.java @@ -3,10 +3,11 @@ import com.commercetools.api.RegisterSimpleModuleMixin; import com.commercetools.api.SimpleModuleMixin; -import com.fasterxml.jackson.databind.module.SimpleModule; import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; +import tools.jackson.databind.module.SimpleModule; + @RegisterSimpleModuleMixin public class SubscriptionModuleMixin implements SimpleModuleMixin { public void mixin(SimpleModule module, ModuleOptions options) { diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/type/CustomFieldsAccessor.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/type/CustomFieldsAccessor.java index c7e4591fd06..df8db443060 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/type/CustomFieldsAccessor.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/type/CustomFieldsAccessor.java @@ -18,12 +18,13 @@ import com.commercetools.api.models.common.Money; import com.commercetools.api.models.common.Reference; import com.commercetools.api.models.common.TypedMoney; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; import io.vrap.rmf.base.client.utils.json.JsonException; import io.vrap.rmf.base.client.utils.json.JsonUtils; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JsonNode; + /** * Accessor for retrieving type safe custom field values */ diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/type/TypeModuleMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/type/TypeModuleMixin.java index 2fde0d9c810..f85cd090558 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/type/TypeModuleMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/type/TypeModuleMixin.java @@ -9,11 +9,12 @@ import com.commercetools.api.json.ApiModuleOptions; import com.commercetools.api.json.CustomFieldDeserializer; import com.commercetools.api.json.CustomFieldJsonNodeDeserializer; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.module.SimpleModule; import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.module.SimpleModule; + @RegisterSimpleModuleMixin public class TypeModuleMixin implements SimpleModuleMixin { public void mixin(SimpleModule module, ModuleOptions options) { diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/AttributesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/AttributesTest.java index 87d77531fe8..989e6298ffc 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/AttributesTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/AttributesTest.java @@ -18,10 +18,6 @@ import com.commercetools.api.models.product_type.AttributeLocalizedEnumValue; import com.commercetools.api.models.product_type.AttributePlainEnumValue; import com.commercetools.api.models.product_type.AttributePlainEnumValueBuilder; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import io.vrap.rmf.base.client.utils.json.JsonUtils; @@ -30,6 +26,11 @@ import org.assertj.core.util.Maps; import org.junit.jupiter.api.Test; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; + public class AttributesTest { @Test @@ -128,7 +129,7 @@ public void httpDeSerialize() throws IOException { } @Test - public void serializeAttributes() throws JsonProcessingException { + public void serializeAttributes() throws JacksonException { Attribute intAttribute = AttributeBuilder.of().name("int").value(13).build(); Assertions.assertThat(JsonUtils.toJsonString(intAttribute)).isEqualTo("{\"name\":\"int\",\"value\":13}"); @@ -171,7 +172,7 @@ public void serializeAttributes() throws JsonProcessingException { } @Test - public void attributesAsJsonNode() throws JsonProcessingException { + public void attributesAsJsonNode() throws JacksonException { ApiModuleOptions options = ApiModuleOptions.of().withAttributeAsJsonNode(true); ObjectMapper mapper = JsonUtils.createObjectMapper(options); @@ -182,7 +183,7 @@ public void attributesAsJsonNode() throws JsonProcessingException { } @Test - public void attributesNumberAsDouble() throws JsonProcessingException { + public void attributesNumberAsDouble() throws JacksonException { ApiModuleOptions options = ApiModuleOptions.of().withAttributeNumberAsDouble(true); ObjectMapper mapper = JsonUtils.createObjectMapper(options); @@ -192,7 +193,7 @@ public void attributesNumberAsDouble() throws JsonProcessingException { } @Test - public void attributeTypeByName() throws JsonProcessingException { + public void attributeTypeByName() throws JacksonException { ApiModuleOptions options = ApiModuleOptions.of() .withAttributeTypes(Maps.newHashMap("test", new TypeReference() { })); diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/CustomFieldsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/CustomFieldsTest.java index b04f605fa2a..f6d97226103 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/CustomFieldsTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/CustomFieldsTest.java @@ -17,10 +17,6 @@ import com.commercetools.api.models.order.Order; import com.commercetools.api.models.product.ProductReference; import com.commercetools.api.models.type.*; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import io.vrap.rmf.base.client.utils.json.JsonUtils; @@ -29,6 +25,11 @@ import org.assertj.core.util.Maps; import org.junit.jupiter.api.Test; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; + public class CustomFieldsTest { @Test @@ -332,7 +333,7 @@ public void httpDeSerialize() throws IOException { } @Test - public void customFieldTypeByName() throws JsonProcessingException { + public void customFieldTypeByName() throws JacksonException { ApiModuleOptions options = ApiModuleOptions.of() .withCustomFieldTypes(Maps.newHashMap("test", new TypeReference() { })); @@ -359,7 +360,7 @@ public void customFieldTypeByName() throws JsonProcessingException { } @Test - public void serializeCustomFields() throws JsonProcessingException { + public void serializeCustomFields() throws JacksonException { FieldContainer container = FieldContainerBuilder.of() .addValue("int", 13) .addValue("double", 13.0) diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ExtensionInputTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ExtensionInputTest.java index 19fea9c1f83..9f456c53c8d 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ExtensionInputTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ExtensionInputTest.java @@ -12,16 +12,17 @@ import com.commercetools.api.models.error.ErrorResponse; import com.commercetools.api.models.extension.ExtensionAction; import com.commercetools.api.models.extension.ExtensionInput; -import com.fasterxml.jackson.core.JsonProcessingException; import io.vrap.rmf.base.client.utils.json.JsonUtils; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import tools.jackson.core.JacksonException; + public class ExtensionInputTest { @Test - public void deserialize() throws JsonProcessingException { + public void deserialize() throws JacksonException { ExtensionInput input = JsonUtils.fromJsonString(stringFromResource("extension-input.json"), ExtensionInput.class); diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/MoneyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/MoneyTest.java index b1890fddedc..48f966b5119 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/MoneyTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/MoneyTest.java @@ -13,7 +13,6 @@ import com.commercetools.api.models.common.*; import com.commercetools.api.models.tax_category.TaxRate; import com.commercetools.api.models.tax_category.TaxRateBuilder; -import com.fasterxml.jackson.databind.JsonNode; import io.vrap.rmf.base.client.utils.json.JsonUtils; @@ -22,6 +21,8 @@ import org.javamoney.moneta.FastMoney; import org.junit.jupiter.api.Test; +import tools.jackson.databind.JsonNode; + public class MoneyTest { @Test public void testMonetaConversion() { @@ -244,10 +245,10 @@ public void serialization() { JsonNode cartNode = JsonUtils.toJsonNode(cart); Assertions.assertThat(cartNode.get("totalPrice")).hasSize(4); - Assertions.assertThat(cartNode.get("totalPrice").get("type").asText()).isEqualTo("centPrecision"); + Assertions.assertThat(cartNode.get("totalPrice").get("type").asString()).isEqualTo("centPrecision"); Assertions.assertThat(cartNode.get("totalPrice").get("centAmount").asInt()).isEqualTo(100); Assertions.assertThat(cartNode.get("totalPrice").get("fractionDigits").asInt()).isEqualTo(2); - Assertions.assertThat(cartNode.get("totalPrice").get("currencyCode").asText()).isEqualTo("EUR"); + Assertions.assertThat(cartNode.get("totalPrice").get("currencyCode").asString()).isEqualTo("EUR"); } @Test @@ -261,11 +262,11 @@ public void serializationDraft() { JsonNode cartNode = JsonUtils.toJsonNode(cart); Assertions.assertThat(cartNode.get("customLineItems").get(0).get("money")).hasSize(3); - Assertions.assertThat(cartNode.get("customLineItems").get(0).get("money").get("type").asText()) + Assertions.assertThat(cartNode.get("customLineItems").get(0).get("money").get("type").asString()) .isEqualTo("centPrecision"); Assertions.assertThat(cartNode.get("customLineItems").get(0).get("money").get("centAmount").asInt()) .isEqualTo(100); - Assertions.assertThat(cartNode.get("customLineItems").get(0).get("money").get("currencyCode").asText()) + Assertions.assertThat(cartNode.get("customLineItems").get(0).get("money").get("currencyCode").asString()) .isEqualTo("EUR"); CartDraft highCart = CartDraft.builder() @@ -280,13 +281,13 @@ public void serializationDraft() { JsonNode highCartNode = JsonUtils.toJsonNode(highCart); Assertions.assertThat(highCartNode.get("customLineItems").get(0).get("money")).hasSize(4); - Assertions.assertThat(highCartNode.get("customLineItems").get(0).get("money").get("type").asText()) + Assertions.assertThat(highCartNode.get("customLineItems").get(0).get("money").get("type").asString()) .isEqualTo("highPrecision"); Assertions.assertThat(highCartNode.get("customLineItems").get(0).get("money").get("preciseAmount").asInt()) .isEqualTo(1000); Assertions.assertThat(highCartNode.get("customLineItems").get(0).get("money").get("fractionDigits").asInt()) .isEqualTo(3); - Assertions.assertThat(highCartNode.get("customLineItems").get(0).get("money").get("currencyCode").asText()) + Assertions.assertThat(highCartNode.get("customLineItems").get(0).get("money").get("currencyCode").asString()) .isEqualTo("EUR"); } diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/OrderQueryBuilderTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/OrderQueryBuilderTest.java index 4c53762bbdd..6c5b85a6042 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/OrderQueryBuilderTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/OrderQueryBuilderTest.java @@ -5,7 +5,6 @@ import com.commercetools.api.models.order.OrderSearchRequest; import com.commercetools.api.models.order.OrderSearchRequestBuilder; import com.commercetools.api.models.order.OrderSearchSortOrder; -import com.fasterxml.jackson.core.JsonProcessingException; import io.vrap.rmf.base.client.utils.json.JsonUtils; @@ -15,11 +14,13 @@ import org.junit.jupiter.params.provider.MethodSource; import org.skyscreamer.jsonassert.JSONAssert; +import tools.jackson.core.JacksonException; + public class OrderQueryBuilderTest { @ParameterizedTest @MethodSource("searchBuilder") public void buildUnchecked(OrderSearchRequestBuilder builder, String expectedQuery) - throws JSONException, JsonProcessingException { + throws JSONException, JacksonException { OrderSearchRequest request = builder.buildUnchecked(); Assertions.assertThat(request).isInstanceOf(OrderSearchRequest.class); JSONAssert.assertEquals(expectedQuery, JsonUtils.toJsonString(request), true); diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ProductTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ProductTest.java index 308287448e7..0fa1f462126 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ProductTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ProductTest.java @@ -11,7 +11,6 @@ import com.commercetools.api.models.product.*; import com.commercetools.api.models.product_search.*; import com.commercetools.api.models.product_type.ProductTypeResourceIdentifierBuilder; -import com.fasterxml.jackson.core.JsonProcessingException; import io.vrap.rmf.base.client.utils.json.JsonUtils; @@ -20,6 +19,8 @@ import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; +import tools.jackson.core.JacksonException; + public class ProductTest { private ProductDraftBuilder productDraftOfVariants(List variants) { @@ -44,7 +45,7 @@ public void draft() { } @Test - public void serializeProduct() throws JsonProcessingException { + public void serializeProduct() throws JacksonException { final ProductProjection productProjection = ProductProjection.builder() .masterVariant(b -> b.sku("foo").id(1L)) .plusVariants(b -> b.sku("bar").id(2L)) @@ -75,7 +76,7 @@ public void deepCopy() { copyString = JsonUtils.toJsonString(copy); productString = JsonUtils.toJsonString(product); } - catch (JsonProcessingException e) { + catch (JacksonException e) { throw new RuntimeException(e); } diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ReferenceTest.java index b9c81296524..6dfa0ca6cf9 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ReferenceTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ReferenceTest.java @@ -8,13 +8,14 @@ import com.commercetools.api.models.common.GenericReference; import com.commercetools.api.models.custom_object.GenericCustomObject; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.type.TypeReference; import io.vrap.rmf.base.client.utils.json.JsonUtils; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import tools.jackson.core.type.TypeReference; + public class ReferenceTest { @Test public void customObjectReference() { diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ReviewTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ReviewTest.java index f0f476f34d1..74862a8fc5b 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ReviewTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ReviewTest.java @@ -12,13 +12,14 @@ import com.commercetools.api.models.product.ProductResourceIdentifier; import com.commercetools.api.models.review.Review; import com.commercetools.api.models.review.ReviewDraft; -import com.fasterxml.jackson.core.JsonProcessingException; import io.vrap.rmf.base.client.utils.json.JsonUtils; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import tools.jackson.core.JacksonException; + public class ReviewTest { @Test @@ -114,7 +115,7 @@ public void setInvalidObjectReviewDraft() { } @Test - public void serializeDraft() throws JsonProcessingException { + public void serializeDraft() throws JacksonException { ReviewDraft draft = ReviewDraft.of(); draft.setTarget(ProductResourceIdentifier.of()); String s = JsonUtils.toJsonString(draft); @@ -122,7 +123,7 @@ public void serializeDraft() throws JsonProcessingException { } @Test - public void serialize() throws JsonProcessingException { + public void serialize() throws JacksonException { Review review = Review.of(); review.setTarget(ProductReference.of()); String s = JsonUtils.toJsonString(review); diff --git a/commercetools/commercetools-sdk-java-importapi/src/integrationTest/java/com/commercetools/importapi/ImportSerializerTest.java b/commercetools/commercetools-sdk-java-importapi/src/integrationTest/java/com/commercetools/importapi/ImportSerializerTest.java index d91f496974a..07c4a241789 100644 --- a/commercetools/commercetools-sdk-java-importapi/src/integrationTest/java/com/commercetools/importapi/ImportSerializerTest.java +++ b/commercetools/commercetools-sdk-java-importapi/src/integrationTest/java/com/commercetools/importapi/ImportSerializerTest.java @@ -6,18 +6,21 @@ import com.commercetools.importapi.models.common.ProductVariantKeyReferenceBuilder; import com.commercetools.importapi.models.importrequests.ProductVariantPatchRequestBuilder; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.ObjectMapper; import io.vrap.rmf.base.client.ResponseSerializer; -import io.vrap.rmf.base.client.utils.json.JsonUtils; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.json.JsonMapper; + public class ImportSerializerTest { @Test public void importSerializer() { - ObjectMapper mapper = JsonUtils.createObjectMapper().setSerializationInclusion(JsonInclude.Include.ALWAYS); + ObjectMapper mapper = JsonMapper.builder() + .changeDefaultPropertyInclusion(incl -> incl.withValueInclusion(JsonInclude.Include.ALWAYS)) + .build(); ProjectApiRoot apiRoot = ImportApiRootBuilder.of() .defaultClient("") diff --git a/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/AttributeMixin.java b/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/AttributeMixin.java index 64886ddcdfd..fef9cfa216d 100644 --- a/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/AttributeMixin.java +++ b/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/AttributeMixin.java @@ -1,7 +1,7 @@ package com.commercetools.importapi.json; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import tools.jackson.databind.annotation.JsonDeserialize; @JsonDeserialize(using = ErrorAttributeDeserializer.class) public interface AttributeMixin { diff --git a/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ErrorAttributeDeserializer.java b/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ErrorAttributeDeserializer.java index 6ae5178303f..b4d79084792 100644 --- a/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ErrorAttributeDeserializer.java +++ b/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ErrorAttributeDeserializer.java @@ -1,25 +1,25 @@ package com.commercetools.importapi.json; -import static com.fasterxml.jackson.databind.node.JsonNodeType.OBJECT; +import static tools.jackson.databind.node.JsonNodeType.OBJECT; -import java.io.IOException; import java.util.*; import com.commercetools.importapi.models.common.*; import com.commercetools.importapi.models.productvariants.*; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.JsonNodeType; -public class ErrorAttributeDeserializer extends JsonDeserializer { +import tools.jackson.core.JsonParser; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ValueDeserializer; +import tools.jackson.databind.node.JsonNodeType; + +public class ErrorAttributeDeserializer extends ValueDeserializer { protected ErrorAttributeDeserializer() { } @Override - public Attribute deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + public Attribute deserialize(JsonParser p, DeserializationContext ctxt) { JsonNode node = p.readValueAsTree(); JsonNode valueNode = node.get("value"); @@ -27,14 +27,17 @@ public Attribute deserialize(JsonParser p, DeserializationContext ctxt) throws I switch (valueNodeType) { case BOOLEAN: return BooleanAttributeBuilder.of() - .name(node.get("name").asText()) + .name(node.get("name").asString()) .value(valueNode.asBoolean()) .build(); case NUMBER: - return NumberAttributeBuilder.of().name(node.get("name").asText()).value(valueNode.asDouble()).build(); + return NumberAttributeBuilder.of() + .name(node.get("name").asString()) + .value(valueNode.asDouble()) + .build(); case STRING: - return TextAttributeBuilder.of().name(node.get("name").asText()).value(valueNode.asText()).build(); + return TextAttributeBuilder.of().name(node.get("name").asString()).value(valueNode.asString()).build(); case OBJECT: return createAttributeFromObject(node); case ARRAY: @@ -43,20 +46,25 @@ public Attribute deserialize(JsonParser p, DeserializationContext ctxt) throws I switch (firstElementNodeType) { case STRING: List stringValues = new ArrayList<>(); - valueNode.elements().forEachRemaining(element -> stringValues.add(element.asText())); - return TextSetAttributeBuilder.of().name(node.get("name").asText()).value(stringValues).build(); + valueNode.values().iterator().forEachRemaining(element -> stringValues.add(element.asString())); + return TextSetAttributeBuilder.of() + .name(node.get("name").asString()) + .value(stringValues) + .build(); case NUMBER: List numberValues = new ArrayList<>(); - valueNode.elements().forEachRemaining(element -> numberValues.add(element.asDouble())); + valueNode.values().iterator().forEachRemaining(element -> numberValues.add(element.asDouble())); return NumberSetAttributeBuilder.of() - .name(node.get("name").asText()) + .name(node.get("name").asString()) .value(numberValues) .build(); case BOOLEAN: List booleanValues = new ArrayList<>(); - valueNode.elements().forEachRemaining(element -> booleanValues.add(element.asBoolean())); + valueNode.values() + .iterator() + .forEachRemaining(element -> booleanValues.add(element.asBoolean())); return BooleanSetAttributeBuilder.of() - .name(node.get("name").asText()) + .name(node.get("name").asString()) .value(booleanValues) .build(); case OBJECT: @@ -64,7 +72,7 @@ public Attribute deserialize(JsonParser p, DeserializationContext ctxt) throws I } default: AttributeImpl attribute = new AttributeImpl(); - attribute.setName(node.get("name").asText()); + attribute.setName(node.get("name").asString()); return attribute; } } @@ -82,36 +90,37 @@ private Attribute createAttributeFromObject(JsonNode node) { JsonNode label = valueNode.get("label"); if (label.getNodeType() == OBJECT) { return LocalizableEnumAttributeBuilder.of() - .name(node.get("name").asText()) - .value(valueNode.get("key").textValue()) + .name(node.get("name").asString()) + .value(valueNode.get("key").asString()) .build(); } return EnumAttributeBuilder.of() - .name(node.get("name").asText()) - .value(valueNode.get("key").textValue()) + .name(node.get("name").asString()) + .value(valueNode.get("key").asString()) .build(); } if (valueNode.has("currencyCode")) { return MoneyAttributeBuilder.of() - .name(node.get("name").asText()) + .name(node.get("name").asString()) .value(typedMoneyBuilder -> typedMoneyBuilder.centPrecisionBuilder() - .currencyCode(valueNode.get("currencyCode").asText()) + .currencyCode(valueNode.get("currencyCode").asString()) .centAmount(valueNode.get("centAmount").asLong()) .fractionDigits(valueNode.get("fractionDigits").asInt())) .build(); } if (valueNode.has("typeId")) { return ReferenceAttributeBuilder.of() - .name(node.get("name").asText()) + .name(node.get("name").asString()) // this is not working because reference contains ID and KeyReference requires ID // .value((KeyReference) p.getCodec().treeAsTokens(valueNode).readValueAs(getTypeRef(valueNode.get("typeId").asText()))) .value(createKeyReference(valueNode)) .build(); } - return LocalizableTextAttributeBuilder.of().name(node.get("name").asText()).value(localizedStringBuilder -> { - valueNode.fields() + return LocalizableTextAttributeBuilder.of().name(node.get("name").asString()).value(localizedStringBuilder -> { + valueNode.properties() + .iterator() .forEachRemaining(nodeEntry -> localizedStringBuilder.addValue(nodeEntry.getKey(), - nodeEntry.getValue().asText())); + nodeEntry.getValue().asString())); return localizedStringBuilder; }).build(); } @@ -121,58 +130,60 @@ private Attribute createSetAttributeFromObject(JsonNode node) { JsonNode firstElement = valueNode.get(0); if (firstElement.has("key") && firstElement.has("label")) { List keys = new ArrayList<>(); - valueNode.iterator().forEachRemaining(jsonNode -> jsonNode.fields().forEachRemaining(nodeEntry -> { - String key = nodeEntry.getKey(); - if (key.equals("key")) { - keys.add(nodeEntry.getValue().asText()); - } - })); + valueNode.iterator() + .forEachRemaining(jsonNode -> jsonNode.properties().iterator().forEachRemaining(nodeEntry -> { + String key = nodeEntry.getKey(); + if (key.equals("key")) { + keys.add(nodeEntry.getValue().asString()); + } + })); JsonNode label = firstElement.get("label"); if (label.getNodeType() == OBJECT) { - return LocalizableEnumSetAttributeBuilder.of().name(node.get("name").asText()).value(keys).build(); + return LocalizableEnumSetAttributeBuilder.of().name(node.get("name").asString()).value(keys).build(); } - return EnumSetAttributeBuilder.of().name(node.get("name").asText()).value(keys).build(); + return EnumSetAttributeBuilder.of().name(node.get("name").asString()).value(keys).build(); } if (firstElement.has("typeId")) { List keyReferences = new ArrayList<>(); valueNode.iterator().forEachRemaining(nodeEntry -> { keyReferences.add(createKeyReference(nodeEntry)); }); - return ReferenceSetAttributeBuilder.of().name(node.get("name").asText()).value(keyReferences).build(); + return ReferenceSetAttributeBuilder.of().name(node.get("name").asString()).value(keyReferences).build(); } if (firstElement.has("currencyCode")) { List values = new ArrayList<>(); valueNode.iterator().forEachRemaining(nodeEntry -> { values.add(MoneyBuilder.of() - .currencyCode(nodeEntry.get("currencyCode").asText()) + .currencyCode(nodeEntry.get("currencyCode").asString()) .centAmount(nodeEntry.get("centAmount").asLong()) .fractionDigits(nodeEntry.get("fractionDigits").asInt()) .build()); }); - return MoneySetAttributeBuilder.of().name(node.get("name").asText()).value(values).build(); + return MoneySetAttributeBuilder.of().name(node.get("name").asString()).value(values).build(); } List values = new ArrayList<>(); valueNode.iterator().forEachRemaining(jsonNode -> { LocalizedStringBuilder localizedStringBuilder = LocalizedStringBuilder.of(); - jsonNode.fields() + jsonNode.properties() + .iterator() .forEachRemaining(nodeEntry -> localizedStringBuilder.addValue(nodeEntry.getKey(), - nodeEntry.getValue().asText())); + nodeEntry.getValue().asString())); values.add(localizedStringBuilder.build()); }); - return LocalizableTextSetAttributeBuilder.of().name(node.get("name").asText()).value(values).build(); + return LocalizableTextSetAttributeBuilder.of().name(node.get("name").asString()).value(values).build(); } private KeyReference createKeyReference(JsonNode node) { return new KeyReference() { @Override public String getKey() { - return node.get("id").asText(); + return node.get("id").asString(); } @Override public ReferenceType getTypeId() { - return getReferenceType(node.get("typeId").asText()); + return getReferenceType(node.get("typeId").asString()); } @Override diff --git a/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ImportApiModule.java b/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ImportApiModule.java index 4e633b014a9..ef636115000 100644 --- a/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ImportApiModule.java +++ b/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ImportApiModule.java @@ -3,12 +3,13 @@ import com.commercetools.importapi.models.productvariants.Attribute; import com.commercetools.importapi.models.productvariants.Attributes; -import com.fasterxml.jackson.databind.module.SimpleModule; import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; +import tools.jackson.databind.module.SimpleModule; + /** - * Module to configure the default jackson {@link com.fasterxml.jackson.databind.ObjectMapper} e.g. to deserialize attributes and custom fields + * Module to configure the default jackson {@link tools.jackson.databind.ObjectMapper} e.g. to deserialize attributes and custom fields */ public class ImportApiModule extends SimpleModule { private static final long serialVersionUID = 0L; diff --git a/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ImportApiModuleSupplier.java b/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ImportApiModuleSupplier.java index 8061d7e0411..8fcee07c876 100644 --- a/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ImportApiModuleSupplier.java +++ b/commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/json/ImportApiModuleSupplier.java @@ -1,11 +1,11 @@ package com.commercetools.importapi.json; -import com.fasterxml.jackson.databind.module.SimpleModule; - import io.vrap.rmf.base.client.utils.json.ModuleSupplier; import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; +import tools.jackson.databind.module.SimpleModule; + public class ImportApiModuleSupplier implements ModuleSupplier { @Override public SimpleModule getModule(ModuleOptions options) { diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java/com/commerctools/importapi/PatchTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java/com/commerctools/importapi/PatchTest.java index efd9307d08a..d935b62a4b5 100644 --- a/commercetools/commercetools-sdk-java-importapi/src/test/java/com/commerctools/importapi/PatchTest.java +++ b/commercetools/commercetools-sdk-java-importapi/src/test/java/com/commerctools/importapi/PatchTest.java @@ -4,17 +4,18 @@ import com.commercetools.importapi.models.productvariants.AttributeBuilder; import com.commercetools.importapi.models.productvariants.ProductVariantPatch; import com.commercetools.importapi.models.productvariants.ProductVariantPatchBuilder; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import io.vrap.rmf.base.client.utils.json.JsonUtils; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.ObjectMapper; + public class PatchTest { @Test - public void testPatchDelete() throws JsonProcessingException { + public void testPatchDelete() throws JacksonException { final ObjectMapper objectMapper = JsonUtils.createObjectMapper(); final ProductVariantPatch variantPatch = ProductVariantPatchBuilder.of() diff --git a/commercetools/internal-docs/build.gradle b/commercetools/internal-docs/build.gradle index 0a24d500363..c057f033bf4 100644 --- a/commercetools/internal-docs/build.gradle +++ b/commercetools/internal-docs/build.gradle @@ -7,12 +7,13 @@ dependencies { implementation project(":commercetools:commercetools-okhttp-client4") implementation project(":commercetools:commercetools-apachehttp-client") implementation project(":commercetools:commercetools-reactornetty-client") - implementation project(":commercetools:commercetools-sdk-compat-v1") + // implementation project(":commercetools:commercetools-sdk-compat-v1") implementation project(":commercetools:commercetools-graphql-api") implementation project(":commercetools:commercetools-monitoring-newrelic") implementation project(":commercetools:commercetools-monitoring-datadog") testImplementation project(path: ':commercetools:commercetools-graphql-api', configuration: 'integrationTestArtifacts') testImplementation 'com.commercetools.sdk.jvm.core:commercetools-models:2.16.0' + testImplementation 'com.commercetools.sdk.jvm.core:commercetools-java-client:2.16.0' testImplementation project(":commercetools:commercetools-javanet-client") testImplementation commons.io version commons.io_version diff --git a/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/GraphQL.java b/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/GraphQL.java index 28733bbaebc..65c99e6f1a5 100644 --- a/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/GraphQL.java +++ b/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/GraphQL.java @@ -29,7 +29,7 @@ * {@include.example example.GraphQLModuleTest#queryBuilding} * *

The module provides a {@link com.commercetools.graphql.api.GraphQLModule Jackson module}. It's configured - * as SPI and gets automatically registered to the SDKs {@link com.fasterxml.jackson.databind.ObjectMapper}. This module + * as SPI and gets automatically registered to the SDKs {@link tools.jackson.databind.ObjectMapper}. This module * will configure the ObjectMapper to deserialize the response data object as {@link com.commercetools.graphql.api.GraphQLData} * instance too and can access it's methods by casting it.

* diff --git a/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/HelperMethods.java b/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/HelperMethods.java index d692e6d98d8..4dc0c5c33c2 100644 --- a/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/HelperMethods.java +++ b/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/HelperMethods.java @@ -12,7 +12,8 @@ import com.commercetools.api.models.common.*; import com.commercetools.api.models.product.ByIdVariantIdentifier; import com.commercetools.api.models.tax_category.TaxRate; -import com.fasterxml.jackson.databind.JsonNode; + +import tools.jackson.databind.JsonNode; /** *

The helper methods simplify the use of our SDK.

diff --git a/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/Serialization.java b/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/Serialization.java index 0c80d2a7702..5db1c617d82 100644 --- a/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/Serialization.java +++ b/commercetools/internal-docs/src/main/java/com/commercetools/docs/meta/Serialization.java @@ -8,7 +8,7 @@ *

Serialization

* *

The SDK uses Jackson for searializing and deserializing JSON. - * The default configured {@link com.fasterxml.jackson.databind.ObjectMapper} uses some modules to correctly work with our API. + * The default configured {@link tools.jackson.databind.ObjectMapper} uses some modules to correctly work with our API. * The details can be found in {@link io.vrap.rmf.base.client.utils.json.JsonUtils#createObjectMapper(ModuleOptions)}

* *

Customization

diff --git a/commercetools/internal-docs/src/test/java/example/GraphQLTest.java b/commercetools/internal-docs/src/test/java/example/GraphQLTest.java index 16cb5bbff1c..3a055ed16ef 100644 --- a/commercetools/internal-docs/src/test/java/example/GraphQLTest.java +++ b/commercetools/internal-docs/src/test/java/example/GraphQLTest.java @@ -9,13 +9,14 @@ import com.commercetools.api.models.graph_ql.GraphQLRequest; import com.commercetools.api.models.graph_ql.GraphQLResponse; import com.commercetools.api.models.product.Product; -import com.fasterxml.jackson.databind.JsonNode; import io.vrap.rmf.base.client.ApiHttpResponse; import io.vrap.rmf.base.client.oauth2.ClientCredentials; import org.assertj.core.api.Assertions; +import tools.jackson.databind.JsonNode; + public class GraphQLTest { private ProjectApiRoot createProjectClient() { return ApiRootBuilder.of() diff --git a/commercetools/internal-docs/src/test/java/example/SerializationTest.java b/commercetools/internal-docs/src/test/java/example/SerializationTest.java index a501e45ad1f..70b38842119 100644 --- a/commercetools/internal-docs/src/test/java/example/SerializationTest.java +++ b/commercetools/internal-docs/src/test/java/example/SerializationTest.java @@ -22,17 +22,18 @@ import com.commercetools.api.models.subscription.DeliveryPayload; import com.commercetools.api.models.subscription.MessageDeliveryPayload; import com.commercetools.api.models.subscription.ResourceCreatedDeliveryPayload; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import io.vrap.rmf.base.client.ResponseSerializer; import io.vrap.rmf.base.client.utils.json.JsonUtils; import org.junit.jupiter.api.Test; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.ObjectMapper; + public class SerializationTest { @Test - public void dateAsString() throws JsonProcessingException { + public void dateAsString() throws JacksonException { ApiModuleOptions options = ApiModuleOptions.of() .withDateAttributeAsString(true) .withDateCustomFieldAsString(true); @@ -77,7 +78,7 @@ public void dateAsString() throws JsonProcessingException { } @Test - public void jsonNodes() throws JsonProcessingException { + public void jsonNodes() throws JacksonException { ApiModuleOptions options = ApiModuleOptions.of().withCustomFieldAsJsonNode(true).withAttributeAsJsonNode(true); ObjectMapper mapper = JsonUtils.createObjectMapper(options); @@ -88,7 +89,7 @@ public void jsonNodes() throws JsonProcessingException { } @Test - public void attributesNumberAsDouble() throws JsonProcessingException { + public void attributesNumberAsDouble() throws JacksonException { ApiModuleOptions options = ApiModuleOptions.of().withAttributeNumberAsDouble(true); ObjectMapper mapper = JsonUtils.createObjectMapper(options); diff --git a/common-plugins/src/main/kotlin/com/commercetools/sdk/plugins/GraphQLTask.kt b/common-plugins/src/main/kotlin/com/commercetools/sdk/plugins/GraphQLTask.kt index c667720bf52..3debc79c67f 100644 --- a/common-plugins/src/main/kotlin/com/commercetools/sdk/plugins/GraphQLTask.kt +++ b/common-plugins/src/main/kotlin/com/commercetools/sdk/plugins/GraphQLTask.kt @@ -66,7 +66,7 @@ open class GraphQLTask: DefaultTask() { val graphQLData = TypeSpec.interfaceBuilder("GraphQLData") .addModifiers(Modifier.PUBLIC) - .addAnnotation(AnnotationSpec.builder(ClassName.get("com.fasterxml.jackson.databind.annotation", "JsonDeserialize")) + .addAnnotation(AnnotationSpec.builder(ClassName.get("tools.jackson.databind.annotation", "JsonDeserialize")) .addMember("as", "GraphQLDataImpl.class") .build()) .addMethod(MethodSpec.methodBuilder("get") diff --git a/examples/spring-dynatrace-oneagent/Task b/examples/spring-dynatrace-oneagent/Task new file mode 100644 index 00000000000..e69de29bb2d diff --git a/gradle-scripts/extensions.gradle b/gradle-scripts/extensions.gradle index f9e1ed98cd5..350012b1376 100644 --- a/gradle-scripts/extensions.gradle +++ b/gradle-scripts/extensions.gradle @@ -30,11 +30,11 @@ ext { ] jackson_core = [ - version: '2.19.0', + version: '3.1.0', annotations: 'com.fasterxml.jackson.core:jackson-annotations:2.21', - databind: 'com.fasterxml.jackson.core:jackson-databind:2.21.4', - core: 'com.fasterxml.jackson.core:jackson-core:2.21.4', - datatype: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.4', + databind: 'tools.jackson.core:jackson-databind:3.1.0', + core: 'tools.jackson.core:jackson-core:3.1.0', + //datatype: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:3.1.0', ] google = [ diff --git a/licenses/commercetools-apachehttp-client/index.json b/licenses/commercetools-apachehttp-client/index.json index 1475773d000..f9dc803f606 100644 --- a/licenses/commercetools-apachehttp-client/index.json +++ b/licenses/commercetools-apachehttp-client/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -228,6 +189,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-async-http-client/index.json b/licenses/commercetools-async-http-client/index.json index 229418fe2e2..25fb3282cc7 100644 --- a/licenses/commercetools-async-http-client/index.json +++ b/licenses/commercetools-async-http-client/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -141,7 +102,7 @@ }, { "moduleName": "io.netty:netty-buffer", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -154,7 +115,7 @@ }, { "moduleName": "io.netty:netty-codec", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -167,7 +128,7 @@ }, { "moduleName": "io.netty:netty-codec-base", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -180,7 +141,7 @@ }, { "moduleName": "io.netty:netty-codec-compression", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -193,7 +154,7 @@ }, { "moduleName": "io.netty:netty-codec-http", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -206,7 +167,7 @@ }, { "moduleName": "io.netty:netty-codec-marshalling", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -219,7 +180,7 @@ }, { "moduleName": "io.netty:netty-codec-protobuf", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -232,7 +193,7 @@ }, { "moduleName": "io.netty:netty-codec-socks", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -245,7 +206,7 @@ }, { "moduleName": "io.netty:netty-common", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -258,7 +219,7 @@ }, { "moduleName": "io.netty:netty-handler", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -271,7 +232,7 @@ }, { "moduleName": "io.netty:netty-handler-proxy", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -284,7 +245,7 @@ }, { "moduleName": "io.netty:netty-resolver", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -297,7 +258,7 @@ }, { "moduleName": "io.netty:netty-transport", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -362,7 +323,7 @@ }, { "moduleName": "io.netty:netty-transport-native-unix-common", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -500,6 +461,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-graphql-api/index.json b/licenses/commercetools-graphql-api/index.json index 930a0846c04..8d4c5af48bd 100644 --- a/licenses/commercetools-graphql-api/index.json +++ b/licenses/commercetools-graphql-api/index.json @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", + "moduleVersion": "2.18.3", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", + "moduleVersion": "2.18.3", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -39,19 +39,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -339,6 +326,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-http-client/index.json b/licenses/commercetools-http-client/index.json index 229418fe2e2..25fb3282cc7 100644 --- a/licenses/commercetools-http-client/index.json +++ b/licenses/commercetools-http-client/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -141,7 +102,7 @@ }, { "moduleName": "io.netty:netty-buffer", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -154,7 +115,7 @@ }, { "moduleName": "io.netty:netty-codec", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -167,7 +128,7 @@ }, { "moduleName": "io.netty:netty-codec-base", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -180,7 +141,7 @@ }, { "moduleName": "io.netty:netty-codec-compression", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -193,7 +154,7 @@ }, { "moduleName": "io.netty:netty-codec-http", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -206,7 +167,7 @@ }, { "moduleName": "io.netty:netty-codec-marshalling", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -219,7 +180,7 @@ }, { "moduleName": "io.netty:netty-codec-protobuf", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -232,7 +193,7 @@ }, { "moduleName": "io.netty:netty-codec-socks", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -245,7 +206,7 @@ }, { "moduleName": "io.netty:netty-common", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -258,7 +219,7 @@ }, { "moduleName": "io.netty:netty-handler", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -271,7 +232,7 @@ }, { "moduleName": "io.netty:netty-handler-proxy", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -284,7 +245,7 @@ }, { "moduleName": "io.netty:netty-resolver", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -297,7 +258,7 @@ }, { "moduleName": "io.netty:netty-transport", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -362,7 +323,7 @@ }, { "moduleName": "io.netty:netty-transport-native-unix-common", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -500,6 +461,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-importapi-utils/index.json b/licenses/commercetools-importapi-utils/index.json index 138ae53640f..736e287fb01 100644 --- a/licenses/commercetools-importapi-utils/index.json +++ b/licenses/commercetools-importapi-utils/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -235,6 +196,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-javanet-client/index.json b/licenses/commercetools-javanet-client/index.json index 1f673a59892..227d737f855 100644 --- a/licenses/commercetools-javanet-client/index.json +++ b/licenses/commercetools-javanet-client/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -176,6 +137,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-monitoring-datadog/index.json b/licenses/commercetools-monitoring-datadog/index.json index b629ed056b9..588102f147c 100644 --- a/licenses/commercetools-monitoring-datadog/index.json +++ b/licenses/commercetools-monitoring-datadog/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.datadoghq:datadog-api-client", - "moduleVersion": "2.54.0", + "moduleVersion": "2.55.0", "moduleUrls": [ "https://github.com/DataDog/datadog-api-client-java" ], @@ -45,7 +45,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", + "moduleVersion": "2.20.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -58,7 +58,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", + "moduleVersion": "2.20.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -71,7 +71,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", + "moduleVersion": "2.20.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], @@ -84,7 +84,7 @@ }, { "moduleName": "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations", - "moduleVersion": "2.21.3", + "moduleVersion": "2.20.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-base" ], @@ -1076,6 +1076,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-monitoring-newrelic/index.json b/licenses/commercetools-monitoring-newrelic/index.json index c3c15a2ea6d..8b03a7bcfdc 100644 --- a/licenses/commercetools-monitoring-newrelic/index.json +++ b/licenses/commercetools-monitoring-newrelic/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -176,6 +137,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-monitoring-opentelemetry/index.json b/licenses/commercetools-monitoring-opentelemetry/index.json index da35bc74e29..e1b2d4189e3 100644 --- a/licenses/commercetools-monitoring-opentelemetry/index.json +++ b/licenses/commercetools-monitoring-opentelemetry/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -202,6 +163,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-okhttp-client3/index.json b/licenses/commercetools-okhttp-client3/index.json index e0776a7cf00..8f4289b1f7e 100644 --- a/licenses/commercetools-okhttp-client3/index.json +++ b/licenses/commercetools-okhttp-client3/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -238,6 +199,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-okhttp-client4/index.json b/licenses/commercetools-okhttp-client4/index.json index 314c59993b8..900e7b8d822 100644 --- a/licenses/commercetools-okhttp-client4/index.json +++ b/licenses/commercetools-okhttp-client4/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -267,6 +228,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-okhttp-client5/index.json b/licenses/commercetools-okhttp-client5/index.json index 7c62db07872..7b29098dfb0 100644 --- a/licenses/commercetools-okhttp-client5/index.json +++ b/licenses/commercetools-okhttp-client5/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -245,6 +206,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-reactornetty-client/index.json b/licenses/commercetools-reactornetty-client/index.json index feedcbc05e0..bb58019ba24 100644 --- a/licenses/commercetools-reactornetty-client/index.json +++ b/licenses/commercetools-reactornetty-client/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -530,6 +491,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-sdk-compat-v1/index.json b/licenses/commercetools-sdk-compat-v1/index.json index 8e3e92323dd..05bd19dc3fc 100644 --- a/licenses/commercetools-sdk-compat-v1/index.json +++ b/licenses/commercetools-sdk-compat-v1/index.json @@ -779,6 +779,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] -} \ No newline at end of file +} diff --git a/licenses/commercetools-sdk-java-api/index.json b/licenses/commercetools-sdk-java-api/index.json index 138ae53640f..736e287fb01 100644 --- a/licenses/commercetools-sdk-java-api/index.json +++ b/licenses/commercetools-sdk-java-api/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -235,6 +196,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-sdk-java-checkout/index.json b/licenses/commercetools-sdk-java-checkout/index.json index c2248f8f8d7..462475a9e87 100644 --- a/licenses/commercetools-sdk-java-checkout/index.json +++ b/licenses/commercetools-sdk-java-checkout/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -185,6 +146,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-sdk-java-history/index.json b/licenses/commercetools-sdk-java-history/index.json index c2248f8f8d7..462475a9e87 100644 --- a/licenses/commercetools-sdk-java-history/index.json +++ b/licenses/commercetools-sdk-java-history/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -185,6 +146,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/commercetools-sdk-java-importapi/index.json b/licenses/commercetools-sdk-java-importapi/index.json index c2248f8f8d7..462475a9e87 100644 --- a/licenses/commercetools-sdk-java-importapi/index.json +++ b/licenses/commercetools-sdk-java-importapi/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -185,6 +146,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/index.json b/licenses/index.json index 8762177b12b..48410240363 100644 --- a/licenses/index.json +++ b/licenses/index.json @@ -1,78 +1,8 @@ { "dependencies": [ - { - "moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client", - "moduleVersion": "2.16.0", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client-ahc-2_0", - "moduleVersion": "2.16.0", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client-core", - "moduleVersion": "2.16.0", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.commercetools.sdk.jvm.core:commercetools-models", - "moduleVersion": "2.16.0", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.commercetools.sdk.jvm.core:commercetools-sdk-base", - "moduleVersion": "2.16.0", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.commercetools.sdk.jvm.core:sdk-http", - "moduleVersion": "2.16.0", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.commercetools.sdk.jvm.core:sdk-http-ahc-2_0", - "moduleVersion": "2.16.0", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.datadoghq:datadog-api-client", - "moduleVersion": "2.54.0", + "moduleVersion": "2.55.0", "moduleUrls": [ "https://github.com/DataDog/datadog-api-client-java" ], @@ -115,7 +45,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", + "moduleVersion": "2.18.3", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -127,10 +57,10 @@ ] }, { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", + "moduleName": "com.fasterxml.jackson.core:jackson-core", + "moduleVersion": "2.20.1", "moduleUrls": [ - "https://github.com/FasterXML/jackson" + "https://github.com/FasterXML/jackson-core" ], "moduleLicenses": [ { @@ -140,10 +70,10 @@ ] }, { - "moduleName": "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", - "moduleVersion": "2.21.3", + "moduleName": "com.fasterxml.jackson.core:jackson-databind", + "moduleVersion": "2.18.3", "moduleUrls": [ - "https://github.com/FasterXML/jackson-dataformats-binary" + "https://github.com/FasterXML/jackson" ], "moduleLicenses": [ { @@ -153,10 +83,10 @@ ] }, { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", + "moduleName": "com.fasterxml.jackson.core:jackson-databind", + "moduleVersion": "2.20.1", "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" + "https://github.com/FasterXML/jackson" ], "moduleLicenses": [ { @@ -166,10 +96,10 @@ ] }, { - "moduleName": "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations", - "moduleVersion": "2.21.3", + "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "moduleVersion": "2.20.1", "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-base" + "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], "moduleLicenses": [ { @@ -179,10 +109,10 @@ ] }, { - "moduleName": "com.fasterxml.jackson.module:jackson-module-parameter-names", - "moduleVersion": "2.21.3", + "moduleName": "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations", + "moduleVersion": "2.20.1", "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names" + "https://github.com/FasterXML/jackson-modules-base" ], "moduleLicenses": [ { @@ -368,19 +298,6 @@ } ] }, - { - "moduleName": "com.neovisionaries:nv-i18n", - "moduleVersion": "1.28", - "moduleUrls": [ - "https://github.com/TakahikoKawasaki/nv-i18n" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.netflix.graphql.dgs.codegen:graphql-dgs-codegen-shared-core", "moduleVersion": "8.5.0", @@ -472,10 +389,6 @@ "moduleName": "com.squareup.okio:okio", "moduleVersion": "3.17.0" }, - { - "moduleName": "com.squareup.okio:okio", - "moduleVersion": "3.6.0" - }, { "moduleName": "com.squareup.okio:okio-jvm", "moduleVersion": "3.17.0", @@ -489,19 +402,6 @@ } ] }, - { - "moduleName": "com.squareup.okio:okio-jvm", - "moduleVersion": "3.6.0", - "moduleUrls": [ - "https://github.com/square/okio/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.sun.activation:jakarta.activation", "moduleVersion": "1.2.2", @@ -544,16 +444,6 @@ } ] }, - { - "moduleName": "com.typesafe.netty:netty-reactive-streams", - "moduleVersion": "1.0.8", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.typesafe.netty:netty-reactive-streams", "moduleVersion": "2.0.17", @@ -622,7 +512,7 @@ }, { "moduleName": "io.netty:netty-buffer", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -635,7 +525,7 @@ }, { "moduleName": "io.netty:netty-codec", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -661,7 +551,7 @@ }, { "moduleName": "io.netty:netty-codec-base", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -700,7 +590,7 @@ }, { "moduleName": "io.netty:netty-codec-compression", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -739,7 +629,7 @@ }, { "moduleName": "io.netty:netty-codec-http", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -779,7 +669,7 @@ }, { "moduleName": "io.netty:netty-codec-marshalling", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -809,7 +699,7 @@ }, { "moduleName": "io.netty:netty-codec-protobuf", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -835,7 +725,7 @@ }, { "moduleName": "io.netty:netty-codec-socks", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -861,7 +751,7 @@ }, { "moduleName": "io.netty:netty-common", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -887,7 +777,7 @@ }, { "moduleName": "io.netty:netty-handler", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -913,7 +803,7 @@ }, { "moduleName": "io.netty:netty-handler-proxy", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -939,7 +829,7 @@ }, { "moduleName": "io.netty:netty-resolver", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -1004,7 +894,7 @@ }, { "moduleName": "io.netty:netty-transport", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -1054,19 +944,6 @@ } ] }, - { - "moduleName": "io.netty:netty-transport-native-epoll", - "moduleVersion": "4.0.54.Final", - "moduleUrls": [ - "http://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.netty:netty-transport-native-epoll", "moduleVersion": "4.1.133.Final", @@ -1121,7 +998,7 @@ }, { "moduleName": "io.netty:netty-transport-native-unix-common", - "moduleVersion": "4.2.13.Final", + "moduleVersion": "4.2.14.Final", "moduleUrls": [ "https://netty.io/" ], @@ -1333,24 +1210,6 @@ } ] }, - { - "moduleName": "javax.annotation:javax.annotation-api", - "moduleVersion": "1.3.2", - "moduleUrls": [ - "http://jcp.org/en/jsr/detail?id=250", - "https://javaee.github.io/glassfish" - ], - "moduleLicenses": [ - { - "moduleLicense": "CDDL + GPLv2 with classpath exception", - "moduleLicenseUrl": "https://github.com/javaee/javax.annotation/blob/master/LICENSE" - }, - { - "moduleLicense": "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0", - "moduleLicenseUrl": "https://oss.oracle.com/licenses/CDDL" - } - ] - }, { "moduleName": "javax.money:money-api", "moduleVersion": "1.1", @@ -1382,33 +1241,6 @@ } ] }, - { - "moduleName": "org.apache.commons:commons-text", - "moduleVersion": "1.15.0", - "moduleUrls": [ - "https://commons.apache.org/proper/commons-text" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "org.apache.geronimo.specs:geronimo-annotation_1.2_spec", - "moduleVersion": "1.0", - "moduleUrls": [ - "http://geronimo.apache.org/maven/${siteId}/${version}", - "http://geronimo.apache.org/maven/specs/geronimo-annotation_1.2_spec/1.0" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "org.apache.httpcomponents.client5:httpclient5", "moduleVersion": "5.5", @@ -1465,16 +1297,6 @@ } ] }, - { - "moduleName": "org.asynchttpclient:async-http-client", - "moduleVersion": "2.0.38", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "org.asynchttpclient:async-http-client", "moduleVersion": "2.15.0", @@ -1485,16 +1307,6 @@ } ] }, - { - "moduleName": "org.asynchttpclient:async-http-client-netty-utils", - "moduleVersion": "2.0.38", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "org.asynchttpclient:async-http-client-netty-utils", "moduleVersion": "2.15.0", @@ -1505,36 +1317,6 @@ } ] }, - { - "moduleName": "org.asynchttpclient:netty-codec-dns", - "moduleVersion": "2.0.38", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "org.asynchttpclient:netty-resolver", - "moduleVersion": "2.0.38", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "org.asynchttpclient:netty-resolver-dns", - "moduleVersion": "2.0.38", - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "org.glassfish.hk2.external:aopalliance-repackaged", "moduleVersion": "3.0.3", @@ -1999,45 +1781,6 @@ } ] }, - { - "moduleName": "org.javamoney.moneta:moneta-convert", - "moduleVersion": "1.4.2", - "moduleUrls": [ - "http://www.javamoney.org" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "org.javamoney.moneta:moneta-convert-ecb", - "moduleVersion": "1.4.2", - "moduleUrls": [ - "http://www.javamoney.org" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "org.javamoney.moneta:moneta-convert-imf", - "moduleVersion": "1.4.2", - "moduleUrls": [ - "http://www.javamoney.org" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "org.javamoney.moneta:moneta-core", "moduleVersion": "1.4.5", @@ -2052,19 +1795,6 @@ } ] }, - { - "moduleName": "org.javamoney:moneta", - "moduleVersion": "1.4.2", - "moduleUrls": [ - "http://javamoney.org" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "org.javassist:javassist", "moduleVersion": "3.28.0-GA", @@ -2103,19 +1833,6 @@ } ] }, - { - "moduleName": "org.jetbrains.kotlin:kotlin-stdlib", - "moduleVersion": "1.9.10", - "moduleUrls": [ - "https://kotlinlang.org/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "org.jetbrains.kotlin:kotlin-stdlib", "moduleVersion": "2.0.21", @@ -2155,19 +1872,6 @@ } ] }, - { - "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-common", - "moduleVersion": "1.9.10", - "moduleUrls": [ - "https://kotlinlang.org/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "moduleVersion": "1.8.21", @@ -2181,19 +1885,6 @@ } ] }, - { - "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk7", - "moduleVersion": "1.9.10", - "moduleUrls": [ - "https://kotlinlang.org/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "moduleVersion": "2.0.21", @@ -2220,19 +1911,6 @@ } ] }, - { - "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk8", - "moduleVersion": "1.9.10", - "moduleUrls": [ - "https://kotlinlang.org/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "moduleVersion": "2.0.21", @@ -2402,20 +2080,6 @@ } ] }, - { - "moduleName": "org.reactivestreams:reactive-streams", - "moduleVersion": "1.0.0", - "moduleUrls": [ - "http://reactive-streams.org", - "http://www.reactive-streams.org/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Creative Commons Legal Code", - "moduleLicenseUrl": "https://creativecommons.org/publicdomain/zero/1.0/legalcode" - } - ] - }, { "moduleName": "org.reactivestreams:reactive-streams", "moduleVersion": "1.0.3", @@ -2477,6 +2141,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/licenses/rmf-java-base/index.json b/licenses/rmf-java-base/index.json index 3e5f204831a..41bce4ab42a 100644 --- a/licenses/rmf-java-base/index.json +++ b/licenses/rmf-java-base/index.json @@ -13,45 +13,6 @@ } ] }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-core" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, - { - "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.21.3", - "moduleUrls": [ - "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.google.code.findbugs:jsr305", "moduleVersion": "3.0.2", @@ -163,6 +124,32 @@ "moduleLicenseUrl": "https://opensource.org/licenses/MIT" } ] + }, + { + "moduleName": "tools.jackson.core:jackson-core", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson-core" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "tools.jackson.core:jackson-databind", + "moduleVersion": "3.1.0", + "moduleUrls": [ + "https://github.com/FasterXML/jackson" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] } \ No newline at end of file diff --git a/rmf/rmf-java-base/build.gradle b/rmf/rmf-java-base/build.gradle index aa8f64393f0..3609783a156 100644 --- a/rmf/rmf-java-base/build.gradle +++ b/rmf/rmf-java-base/build.gradle @@ -3,7 +3,7 @@ dependencies { implementation google.findbugs api jackson_core.databind api jackson_core.core - api jackson_core.datatype +// api jackson_core.datatype api commons.lang3 api slf4j.api api failsafe.failsafe diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ApiHttpClient.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ApiHttpClient.java index f3829a8f903..cac0f3b6eb2 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ApiHttpClient.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ApiHttpClient.java @@ -8,11 +8,11 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Function; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; - import io.vrap.rmf.base.client.http.HandlerStack; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; + /** * Interface for an HTTP client accessing the API and mapping to a known output type */ diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ApiMethod.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ApiMethod.java index 001c23efd02..067a1b92caf 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ApiMethod.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ApiMethod.java @@ -15,12 +15,12 @@ import javax.annotation.Nullable; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; - import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; + public abstract class ApiMethod, TResult> extends Base implements RequestCommand, ClientRequestCommand, CreateHttpRequestCommand { diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/AsyncApiClient.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/AsyncApiClient.java index 5194e7fadab..dce70261f9b 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/AsyncApiClient.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/AsyncApiClient.java @@ -4,8 +4,8 @@ import java.time.Duration; import java.util.function.Function; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; public interface AsyncApiClient { TReturn execute(final ApiHttpRequest request, final Class outputType); diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/CompletableFutureApiClient.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/CompletableFutureApiClient.java index f788c12fe1b..e6ca9b81ee8 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/CompletableFutureApiClient.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/CompletableFutureApiClient.java @@ -5,8 +5,8 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Function; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; public interface CompletableFutureApiClient extends AsyncApiClient> { diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/HttpRequestCommand.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/HttpRequestCommand.java index 1e0a0508ee3..4cb6491d0ca 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/HttpRequestCommand.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/HttpRequestCommand.java @@ -1,7 +1,7 @@ package io.vrap.rmf.base.client; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; public interface HttpRequestCommand extends CreateHttpRequestCommand { TypeReference resultType(); diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ResponseSerializer.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ResponseSerializer.java index dcf16e30cdb..f53b9f9e922 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ResponseSerializer.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ResponseSerializer.java @@ -1,13 +1,13 @@ package io.vrap.rmf.base.client; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; - import io.vrap.rmf.base.client.utils.json.JsonUtils; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; +import tools.jackson.databind.ObjectMapper; + /** * Interface to deserialize a response to a specified output type */ @@ -18,7 +18,7 @@ public interface ResponseSerializer { ApiHttpResponse convertResponse(final ApiHttpResponse response, final TypeReference outputType); - byte[] toJsonByteArray(final Object value) throws JsonProcessingException; + byte[] toJsonByteArray(final Object value) throws JacksonException; static ResponseSerializer of() { return new ResponseSerializerImpl(JsonUtils.getConfiguredObjectMapper()); diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ResponseSerializerImpl.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ResponseSerializerImpl.java index 22c794dd19a..c5c97d282d1 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ResponseSerializerImpl.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ResponseSerializerImpl.java @@ -1,12 +1,10 @@ package io.vrap.rmf.base.client; -import java.io.IOException; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.JavaType; +import tools.jackson.databind.ObjectMapper; /** * Default implementation of {@link ResponseSerializer} using Jackson {@link ObjectMapper} @@ -28,7 +26,7 @@ public ApiHttpResponse convertResponse(final ApiHttpResponse resp return new ApiHttpResponse<>(response.getStatusCode(), response.getHeaders(), newBody, response.getMessage(), response.getContextMap()); } - catch (IOException e) { + catch (JacksonException e) { throw new DeserializationException(e.getMessage(), e); } } @@ -42,7 +40,7 @@ public ApiHttpResponse convertResponse(final ApiHttpResponse resp return new ApiHttpResponse<>(response.getStatusCode(), response.getHeaders(), newBody, response.getMessage(), response.getContextMap()); } - catch (IOException e) { + catch (JacksonException e) { throw new DeserializationException(e.getMessage(), e); } } @@ -57,12 +55,12 @@ public ApiHttpResponse convertResponse(final ApiHttpResponse resp return new ApiHttpResponse<>(response.getStatusCode(), response.getHeaders(), newBody, response.getMessage(), response.getContextMap()); } - catch (IOException e) { + catch (JacksonException e) { throw new DeserializationException(e.getMessage(), e); } } - public byte[] toJsonByteArray(final Object value) throws JsonProcessingException { + public byte[] toJsonByteArray(final Object value) throws JacksonException { return mapper.writeValueAsBytes(value); } } diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/SerializerOnlyApiHttpClient.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/SerializerOnlyApiHttpClient.java index e2d3b9f0214..730a8631bc2 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/SerializerOnlyApiHttpClient.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/SerializerOnlyApiHttpClient.java @@ -4,7 +4,7 @@ import java.net.URI; import java.util.concurrent.CompletableFuture; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; /** * Implementation of a non executable {@link ApiHttpClient} diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/JsonUtils.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/JsonUtils.java index 57c6de81882..0ae4ba4df3f 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/JsonUtils.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/JsonUtils.java @@ -8,14 +8,6 @@ import java.util.*; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; import io.vrap.rmf.base.client.utils.json.modules.SubTypeModule; @@ -23,6 +15,14 @@ import io.vrap.rmf.base.client.utils.json.modules.ZonedDateTimeSerializationModule; import io.vrap.rmf.base.client.utils.json.modules.deserializers.LocalDateDeserializationModule; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.*; +import tools.jackson.databind.json.JsonMapper; +import tools.jackson.databind.module.SimpleModule; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; + /** * Class with methods to customize the JSON serialization/deserialization */ @@ -54,17 +54,15 @@ public static ObjectMapper createObjectMapper(final ModuleOptions options) { final List moduleList = new ArrayList<>(); suppliers.iterator().forEachRemaining(moduleSupplier -> moduleList.add(moduleSupplier.getModule(options))); - return JsonMapper.builder() - .addModule(new JavaTimeModule()) //provides serialization and deserialization for LocalDate and LocalTime (JSR310 Jackson module) + return JsonMapper.builder() //provides serialization and deserialization for LocalDate and LocalTime (JSR310 Jackson module) .addModule(new ZonedDateTimeSerializationModule()) //custom serializer for LocalDate, LocalTime and ZonedDateTime .addModule(new ZonedDateTimeDeserializationModule()) //custom deserializer for ZonedDateTime .addModule(new LocalDateDeserializationModule()) //custom deserializer for LocalDate .addModule(new SubTypeModule("com.commercetools")) .addModules(loader) .addModules(moduleList) - .serializationInclusion(JsonInclude.Include.NON_NULL) //ignore null fields - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) + .changeDefaultPropertyInclusion(incl -> incl.withContentInclusion(JsonInclude.Include.NON_NULL) + .withValueInclusion(JsonInclude.Include.NON_NULL)) .configure(DeserializationFeature.USE_LONG_FOR_INTS, true) .configure(MapperFeature.REQUIRE_TYPE_ID_FOR_SUBTYPES, false) .build(); @@ -74,9 +72,9 @@ public static ObjectMapper createObjectMapper(final ModuleOptions options) { * serializes the given object to JSON as a byte array * @param value object to be serialized * @return json byte array - * @throws JsonProcessingException serialization errors + * @throws JacksonException serialization errors */ - public static byte[] toJsonByteArray(final Object value) throws JsonProcessingException { + public static byte[] toJsonByteArray(final Object value) throws JacksonException { return getConfiguredObjectMapper().writeValueAsBytes(value); } @@ -84,9 +82,9 @@ public static byte[] toJsonByteArray(final Object value) throws JsonProcessingEx * serializes the given object to JSON as a byte array * @param value object to be serialized * @return json string - * @throws JsonProcessingException serialization errors + * @throws JacksonException serialization errors */ - public static String toJsonString(final Object value) throws JsonProcessingException { + public static String toJsonString(final Object value) throws JacksonException { return getConfiguredObjectMapper().writeValueAsString(value); } @@ -240,10 +238,10 @@ public static ObjectMapper getConfiguredObjectMapper() { private static JsonNode secure(final JsonNode node) { if (node.isObject()) { ObjectNode objectNode = (ObjectNode) node; - Iterator> fields = node.fields(); + Iterator> fields = node.properties().iterator(); while (fields.hasNext()) { Map.Entry field = fields.next(); - if (field.getValue().isTextual() && (field.getKey().toLowerCase().contains("pass") + if (field.getValue().isString() && (field.getKey().toLowerCase().contains("pass") || field.getKey().toLowerCase().contains("access_token") || field.getKey().toLowerCase().contains("refresh_token"))) { objectNode.put(field.getKey(), "**removed from output**"); @@ -256,7 +254,7 @@ private static JsonNode secure(final JsonNode node) { } else if (node.isArray()) { ArrayNode arrayNode = (ArrayNode) node; - Iterator elements = arrayNode.elements(); + Iterator elements = arrayNode.values().iterator(); while (elements.hasNext()) { secure(elements.next()); } @@ -275,7 +273,7 @@ else if (node.isArray()) { */ public static String prettyPrint(final String json) { return executing(() -> { - final ObjectMapper jsonParser = new ObjectMapper(); + final ObjectMapper jsonParser = new tools.jackson.databind.json.JsonMapper(); final JsonNode jsonTree = jsonParser.readValue(json, JsonNode.class); secure(jsonTree); final ObjectWriter writer = jsonParser.writerWithDefaultPrettyPrinter(); diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/ModuleSupplier.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/ModuleSupplier.java index b871cdc2f64..e869d4fdf8b 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/ModuleSupplier.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/ModuleSupplier.java @@ -3,10 +3,10 @@ import java.util.ServiceLoader; -import com.fasterxml.jackson.databind.module.SimpleModule; - import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions; +import tools.jackson.databind.module.SimpleModule; + /** * Interface to supply a Jackson {@link SimpleModule} specified by a {@link ServiceLoader} */ diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/SubTypeModule.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/SubTypeModule.java index 723c68e24ca..6b7b5a12233 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/SubTypeModule.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/SubTypeModule.java @@ -3,13 +3,13 @@ import java.util.Set; -import com.fasterxml.jackson.databind.jsontype.NamedType; -import com.fasterxml.jackson.databind.module.SimpleModule; - import io.vrap.rmf.base.client.utils.json.SubType; import org.reflections.Reflections; +import tools.jackson.databind.jsontype.NamedType; +import tools.jackson.databind.module.SimpleModule; + public class SubTypeModule extends SimpleModule { public SubTypeModule(final String prefix) { diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/ZonedDateTimeDeserializationModule.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/ZonedDateTimeDeserializationModule.java index 3de5cadd261..52291ac0c2c 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/ZonedDateTimeDeserializationModule.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/ZonedDateTimeDeserializationModule.java @@ -3,10 +3,10 @@ import java.time.ZonedDateTime; -import com.fasterxml.jackson.databind.module.SimpleModule; - import io.vrap.rmf.base.client.utils.json.modules.deserializers.ZonedDateTimeDeserializer; +import tools.jackson.databind.module.SimpleModule; + public class ZonedDateTimeDeserializationModule extends SimpleModule { private static final long serialVersionUID = 0L; diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/ZonedDateTimeSerializationModule.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/ZonedDateTimeSerializationModule.java index ac3b8f9ca48..24714aaebca 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/ZonedDateTimeSerializationModule.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/ZonedDateTimeSerializationModule.java @@ -5,12 +5,12 @@ import java.time.LocalTime; import java.time.ZonedDateTime; -import com.fasterxml.jackson.databind.module.SimpleModule; - import io.vrap.rmf.base.client.utils.json.modules.serializers.LocalDateSerializer; import io.vrap.rmf.base.client.utils.json.modules.serializers.LocalTimeSerializer; import io.vrap.rmf.base.client.utils.json.modules.serializers.ZonedDateTimeSerializer; +import tools.jackson.databind.module.SimpleModule; + public class ZonedDateTimeSerializationModule extends SimpleModule { public ZonedDateTimeSerializationModule() { diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/deserializers/LocalDateDeserializationModule.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/deserializers/LocalDateDeserializationModule.java index ca1f7b02f76..b16e0994637 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/deserializers/LocalDateDeserializationModule.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/deserializers/LocalDateDeserializationModule.java @@ -5,8 +5,8 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; +import tools.jackson.databind.ext.javatime.deser.LocalDateDeserializer; +import tools.jackson.databind.module.SimpleModule; public class LocalDateDeserializationModule extends SimpleModule { private static final long serialVersionUID = 0L; diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/deserializers/ZonedDateTimeDeserializer.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/deserializers/ZonedDateTimeDeserializer.java index 546f2c57521..a7466768099 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/deserializers/ZonedDateTimeDeserializer.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/deserializers/ZonedDateTimeDeserializer.java @@ -1,14 +1,13 @@ package io.vrap.rmf.base.client.utils.json.modules.deserializers; -import java.io.IOException; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer; +import tools.jackson.core.JsonParser; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.deser.std.StdScalarDeserializer; /** * Deserializer converting string to {@link ZonedDateTime} @@ -29,8 +28,7 @@ public ZonedDateTimeDeserializer() { } @Override - public ZonedDateTime deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) - throws IOException { - return ZonedDateTime.parse(jsonParser.getText(), LENIENT_ZONED_DATE_DATE); + public ZonedDateTime deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) { + return ZonedDateTime.parse(jsonParser.getString(), LENIENT_ZONED_DATE_DATE); } } diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/LocalDateSerializer.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/LocalDateSerializer.java index 75bbfe6ce83..66372a6f4f0 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/LocalDateSerializer.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/LocalDateSerializer.java @@ -1,13 +1,12 @@ package io.vrap.rmf.base.client.utils.json.modules.serializers; -import java.io.IOException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ser.std.StdScalarSerializer; /** * serializes a {@link LocalDate} to {@link DateTimeFormatter#ISO_DATE} format @@ -21,8 +20,7 @@ public LocalDateSerializer() { } @Override - public void serialize(final LocalDate value, final JsonGenerator gen, final SerializerProvider arg2) - throws IOException { + public void serialize(final LocalDate value, final JsonGenerator gen, final SerializationContext arg2) { gen.writeString(DateTimeFormatter.ISO_DATE.format(value)); } diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/LocalTimeSerializer.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/LocalTimeSerializer.java index 5b73a4b6c58..03f241eb0d8 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/LocalTimeSerializer.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/LocalTimeSerializer.java @@ -1,13 +1,12 @@ package io.vrap.rmf.base.client.utils.json.modules.serializers; -import java.io.IOException; import java.time.LocalTime; import java.time.format.DateTimeFormatter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ser.std.StdScalarSerializer; /** * serializes a {@link LocalTime} to {@link DateTimeFormatter#ISO_TIME} format @@ -21,8 +20,7 @@ public LocalTimeSerializer() { } @Override - public void serialize(final LocalTime value, final JsonGenerator gen, final SerializerProvider arg2) - throws IOException { + public void serialize(final LocalTime value, final JsonGenerator gen, final SerializationContext arg2) { gen.writeString(DateTimeFormatter.ISO_TIME.format(value)); } diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/ZonedDateTimeSerializer.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/ZonedDateTimeSerializer.java index 276526648f9..97db8abb8ea 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/ZonedDateTimeSerializer.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/modules/serializers/ZonedDateTimeSerializer.java @@ -1,15 +1,14 @@ package io.vrap.rmf.base.client.utils.json.modules.serializers; -import java.io.IOException; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ser.std.StdScalarSerializer; /** * serializes a {@link ZonedDateTime} to {@link DateTimeFormatter#ISO_DATE} format @@ -24,8 +23,7 @@ public ZonedDateTimeSerializer() { } @Override - public void serialize(final ZonedDateTime value, final JsonGenerator gen, final SerializerProvider arg2) - throws IOException { + public void serialize(final ZonedDateTime value, final JsonGenerator gen, final SerializationContext arg2) { gen.writeString(FORMATTER.format(value.withZoneSameInstant(ZoneOffset.UTC))); } } diff --git a/rmf/rmf-java-base/src/test/java/io/vrap/rmf/base/client/utils/json/CommercetoolsObjectMapperTests.java b/rmf/rmf-java-base/src/test/java/io/vrap/rmf/base/client/utils/json/CommercetoolsObjectMapperTests.java index e98b295346d..653697bf850 100644 --- a/rmf/rmf-java-base/src/test/java/io/vrap/rmf/base/client/utils/json/CommercetoolsObjectMapperTests.java +++ b/rmf/rmf-java-base/src/test/java/io/vrap/rmf/base/client/utils/json/CommercetoolsObjectMapperTests.java @@ -4,11 +4,11 @@ import java.io.IOException; import java.time.*; -import com.fasterxml.jackson.core.JsonProcessingException; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import tools.jackson.core.JacksonException; + public class CommercetoolsObjectMapperTests { private static final int TEST_YEAR = 2010; @@ -23,32 +23,32 @@ public class CommercetoolsObjectMapperTests { private final ZoneId zoneId = ZoneId.ofOffset("UTC", ZoneOffset.ofHours(1)); @Test - public void serializeZonedDateTime() throws JsonProcessingException { + public void serializeZonedDateTime() throws JacksonException { ZonedDateTime zonedDateTime = ZonedDateTime.of(TEST_LOCAL_DATE, TEST_LOCAL_TIME, zoneId); String serializedZonedDateTime = JsonUtils.toJsonString(zonedDateTime); Assertions.assertEquals(serializedZonedDateTime, "\"2010-11-12T09:11:12.000Z\""); } @Test - public void serializeLocalDate() throws JsonProcessingException { + public void serializeLocalDate() throws JacksonException { String serializedLocalDate = JsonUtils.toJsonString(TEST_LOCAL_DATE); Assertions.assertEquals(serializedLocalDate, "\"2010-11-12\""); } @Test - public void serializeLocalDateExceeding() throws JsonProcessingException { + public void serializeLocalDateExceeding() throws JacksonException { String serializedLocalDate = JsonUtils.toJsonString(LocalDate.of(20010, TEST_MONTH, TEST_DAY)); Assertions.assertEquals("\"+20010-11-12\"", serializedLocalDate); } @Test - public void serializeLocalDateExceedingNegative() throws JsonProcessingException { + public void serializeLocalDateExceedingNegative() throws JacksonException { String serializedLocalDate = JsonUtils.toJsonString(LocalDate.of(-20010, TEST_MONTH, TEST_DAY)); Assertions.assertEquals("\"-20010-11-12\"", serializedLocalDate); } @Test - public void serializeLocalTime() throws JsonProcessingException { + public void serializeLocalTime() throws JacksonException { String serializedLocalTime = JsonUtils.toJsonString(TEST_LOCAL_TIME); Assertions.assertEquals(serializedLocalTime, "\"10:11:12\""); } diff --git a/settings.gradle b/settings.gradle index a018e720016..87be169c435 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,7 +14,7 @@ include 'commercetools:commercetools-sdk-java-api' include 'commercetools:commercetools-sdk-java-importapi' include 'commercetools:commercetools-sdk-java-checkout' include 'commercetools:commercetools-sdk-java-history' -include 'commercetools:commercetools-sdk-compat-v1' +// include 'commercetools:commercetools-sdk-compat-v1' include 'commercetools:commercetools-apachehttp-client' include 'commercetools:commercetools-reactornetty-client' include 'commercetools:commercetools-async-http-client'