Skip to content

Commit 03b509c

Browse files
committed
Merge remote-tracking branch 'origin/DEVX-796-Spring-Boot-supportability-version-4' into DEVX-796-Spring-Boot-supportability-version-4
2 parents c017b63 + 748d5bc commit 03b509c

8,018 files changed

Lines changed: 14024 additions & 10308 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ c4e2bf407aa0b7a3d34605134791013ba8a2d376
2626
f00f4fe6ed5e22cdd2e3f68370c2da96e6bbc8e7
2727
899ed51a7b6607161fcda5c1000115a076cc4fe7
2828
53b9d9cc4fc4091b89f84effb6e526371d3bae68
29+
383b1b8dee10fbed5dab6566ea0fe49caf9e15b4

commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLDataResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import com.commercetools.api.models.graph_ql.GraphQLError;
1212
import com.fasterxml.jackson.annotation.JsonIgnore;
1313
import com.fasterxml.jackson.annotation.JsonProperty;
14-
import tools.jackson.databind.annotation.JsonDeserialize;
1514

1615
import jakarta.validation.Valid;
16+
import tools.jackson.databind.annotation.JsonDeserialize;
1717

1818
/**
1919
* GraphQLResponse

commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLModule.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package com.commercetools.graphql.api;
33

44
import com.commercetools.api.models.graph_ql.GraphQLResponse;
5+
56
import tools.jackson.databind.module.SimpleModule;
67

78
public class GraphQLModule extends SimpleModule {

commercetools/commercetools-graphql-api/src/main/java/com/commercetools/graphql/api/GraphQLResponseMixin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package com.commercetools.graphql.api;
33

44
import com.fasterxml.jackson.annotation.JsonProperty;
5+
56
import tools.jackson.databind.annotation.JsonDeserialize;
67

78
public interface GraphQLResponseMixin {

commercetools/commercetools-importapi-utils/src/test/java/com/commercetools/sdk/ProductUtilTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
import com.commercetools.api.models.product.ProductProjection;
88
import com.commercetools.api.models.product.ProductProjectionImpl;
99
import com.commercetools.importapi.models.productvariants.*;
10-
import tools.jackson.databind.ObjectMapper;
11-
import tools.jackson.databind.json.JsonMapper;
1210

1311
import io.vrap.rmf.base.client.utils.json.JsonUtils;
1412

1513
import org.junit.jupiter.api.Test;
1614

15+
import tools.jackson.databind.ObjectMapper;
16+
import tools.jackson.databind.json.JsonMapper;
17+
1718
public class ProductUtilTest {
1819
String productProjectionExample = "src/test/resources/product-projection.example.json";
1920
private final ObjectMapper objectMapper = new JsonMapper();

commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/DatadogResponseSerializer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414

1515
import com.datadog.api.client.ApiClient;
1616
import com.datadog.api.client.v2.api.MetricsApi;
17-
import tools.jackson.core.type.TypeReference;
18-
import tools.jackson.databind.JavaType;
19-
import tools.jackson.core.JacksonException;
2017

2118
import io.vrap.rmf.base.client.ApiHttpResponse;
2219
import io.vrap.rmf.base.client.ResponseSerializer;
2320

21+
import tools.jackson.core.JacksonException;
22+
import tools.jackson.core.type.TypeReference;
23+
import tools.jackson.databind.JavaType;
24+
2425
/**
2526
* This serializer uses API to submit metrics to datadog.
2627
* If you are using dogstatsd, use {@link com.commercetools.monitoring.datadog.statsd.DatadogResponseSerializer} to submit metrics to datadog with statsd.

commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/statsd/DatadogResponseSerializer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
import java.util.*;
1010
import java.util.stream.Collectors;
1111

12-
import tools.jackson.core.type.TypeReference;
13-
import tools.jackson.databind.JavaType;
1412
import com.timgroup.statsd.StatsDClient;
15-
import tools.jackson.core.JacksonException;
1613

1714
import io.vrap.rmf.base.client.ApiHttpResponse;
1815
import io.vrap.rmf.base.client.ResponseSerializer;
1916

17+
import tools.jackson.core.JacksonException;
18+
import tools.jackson.core.type.TypeReference;
19+
import tools.jackson.databind.JavaType;
20+
2021
/**
2122
* This serializer uses dogstatsd library to submit metrics to datadog.
2223
* If you are not using statsd, use {@link com.commercetools.monitoring.datadog.DatadogResponseSerializer} to submit metrics to datadog with API.

commercetools/commercetools-monitoring-datadog/src/test/java/example/ResponseSerializerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.assertj.core.api.Assertions;
1818
import org.junit.jupiter.api.Test;
1919
import org.mockito.Mockito;
20+
2021
import tools.jackson.core.JacksonException;
2122

2223
public class ResponseSerializerTest {

commercetools/commercetools-monitoring-newrelic/src/main/java/com/commercetools/monitoring/newrelic/NewrelicResponseSerializer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
import java.util.Collections;
99
import java.util.Map;
1010

11-
import tools.jackson.core.type.TypeReference;
12-
import tools.jackson.databind.JavaType;
1311
import com.newrelic.api.agent.NewRelic;
14-
import tools.jackson.core.JacksonException;
1512

1613
import io.vrap.rmf.base.client.ApiHttpResponse;
1714
import io.vrap.rmf.base.client.ResponseSerializer;
1815

16+
import tools.jackson.core.JacksonException;
17+
import tools.jackson.core.type.TypeReference;
18+
import tools.jackson.databind.JavaType;
19+
1920
/**
2021
* This serializer uses API to submit metrics to newrelic.
2122
*/

commercetools/commercetools-monitoring-opentelemetry/src/main/java/com/commercetools/monitoring/opentelemetry/OpenTelemetryResponseSerializer.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@
66
import java.util.Collections;
77
import java.util.Map;
88

9-
import tools.jackson.core.type.TypeReference;
10-
import tools.jackson.databind.JavaType;
11-
129
import io.opentelemetry.api.OpenTelemetry;
1310
import io.opentelemetry.api.common.Attributes;
1411
import io.opentelemetry.api.common.AttributesBuilder;
1512
import io.opentelemetry.api.metrics.DoubleHistogram;
1613
import io.opentelemetry.api.metrics.Meter;
17-
import tools.jackson.core.JacksonException;
18-
1914
import io.vrap.rmf.base.client.ApiHttpResponse;
2015
import io.vrap.rmf.base.client.ResponseSerializer;
2116

17+
import tools.jackson.core.JacksonException;
18+
import tools.jackson.core.type.TypeReference;
19+
import tools.jackson.databind.JavaType;
20+
2221
/**
2322
* <p>The OpenTelemetry ResponseSerializer can be used to report metrics about the De-/Serialization performance.
2423
* It can be registered as a {@link ResponseSerializer} to the {@link io.vrap.rmf.base.client.ClientBuilder#withSerializer(ResponseSerializer)} ClientBuilder

0 commit comments

Comments
 (0)