Merge branch 'main' into reactive

# Conflicts: # rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ApiHttpClient.java # rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/StringBodyApiMethod.java
commercetools · Dec 1, 2023 · cf94c99 · cf94c99
2 parents 55150fd + 2d1e822
commit cf94c99
Show file tree

Hide file tree

Showing 4,533 changed files with 128,795 additions and 4,275 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,6 +29,9 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      - name: Setup Graphviz
+        uses: ts-graphviz/setup-graphviz@c001ccfb5aff62e28bda6a6c39b59a7e061be5b9
+
       - name: Fix code style
         if: github.event_name == 'push' && github.ref != 'refs/heads/main'
         run: ./gradlew spotlessApply
@@ -69,7 +72,7 @@ jobs:
 
       - name: Run integration tests for PR
         if: github.event_name == 'pull_request'
-        run: ./gradlew clean build publishMavenPublicationToMavenLocal runMainMethodThreadLeakTest
+        run: ./gradlew clean build publishMavenPublicationToMavenLocal runMainMethodThreadLeakTest runMainMethodMemoryLeakTest
         env:
           CTP_CLIENT_ID: ${{ secrets.CTP_CLIENT_ID_PR }}
           CTP_CLIENT_SECRET: ${{ secrets.CTP_CLIENT_SECRET_PR }}
@@ -79,7 +82,7 @@ jobs:
 
       - name: Run integration tests
         if: github.event_name != 'pull_request'
-        run: ./gradlew clean build publishMavenPublicationToMavenLocal runMainMethodThreadLeakTest
+        run: ./gradlew clean build publishMavenPublicationToMavenLocal runMainMethodThreadLeakTest runMainMethodMemoryLeakTest
         env:
             CTP_CLIENT_ID: ${{ secrets.CTP_CLIENT_ID }}
             CTP_CLIENT_SECRET: ${{ secrets.CTP_CLIENT_SECRET }}
@@ -89,6 +92,7 @@ jobs:
 
       - name: Test examples
         run: |
+          ./gradlew writeVersionToExamples
           cd examples/maven-okhttp3 && mvn verify --no-transfer-progress
           cd ../maven-okhttp4 && mvn verify --no-transfer-progress
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,13 +59,20 @@ jobs:
 
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4
 
-      - run: ./gradlew -Pversion=${{ github.ref_name }} writeVersionToReadme setVersion nextMinorVersion snapshotVersion
+      - run: ./gradlew -Pversion=${{ github.ref_name }} writeVersionToExamples writeVersionToReadme setVersion nextMinorVersion snapshotVersion
+
+      - name: "update changelog"
+        run: |
+            gh api /repos/commercetools/commercetools-sdk-java-v2/releases --paginate > releases.json
+            node scripts/changelog.js > CHANGELOG.md
+            rm -rf releases.json
+        env:
+          GH_TOKEN: ${{ github.token }}
 
       - name: "remove API reference commit SHA"
         run: rm -rf reference.txt
         continue-on-error: true
 
-      - run: ./gradlew writeVersionToExamples
 
       - uses: stefanzweifel/git-auto-commit-action@3d1b5e078a85df99db0cb2441cd4309b09d86253
         with:

diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ cache/
 dependencies-without-allowed-license.json
 project-licenses-for-check-license-task.json
 **/application.properties
+opentelemetry-javaagent.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ The latest stable SDK release can be retrieved from [Maven Central](https://sear
 ```gradle
 ext {
     versions = [
-        commercetools: "16.2.0"
+        commercetools: "17.2.0"
     ]
 }
 
@@ -43,7 +43,7 @@ dependencies {
 
 ```maven
 <properties>
-    <commercetools.version>16.2.0</commercetools.version>
+    <commercetools.version>17.2.0</commercetools.version>
 </properties>
 <dependencies>
     <dependency>
@@ -71,11 +71,11 @@ dependencies {
 
 ### Modules
 
-* `commercetools-http-client`: alias for commercetools-okhttp-client4
+* `commercetools-http-client`: alias for commercetools-async-http-client
 * `commercetools-okhttp-client3`: uses OkHttp client 3.0
 * `commercetools-okhttp-client4`: uses OkHttp client 4.0
 * `commercetools-apachehttp-client`: uses Apache HTTP async client 5.1
-* `commercetools-asynchttp-client`: uses Async HTTP client 2.12
+* `commercetools-async-http-client`: uses Async HTTP client 2.12
 * `commercetools-reactornetty-client`: uses Reactor Netty HTTP Client
 * `commercetools-javanet-client`: uses HTTP client (`java.net.http.HttpClient`) included in JDK 11+
 * `commercetools-sdk-java-api`: models and request builders for the product API
@@ -85,6 +85,7 @@ dependencies {
 * `commercetools-sdk-compat-v1`: Compatibility layer for Java v1 SDK
 * `commercetools-money`: Provider for JSR-354 money instances
 * `commercetools-monitoring-newrelic`: Middleware to integrate NewRelic monitoring
+* `commercetools-monitoring-opentelemetry`: Middleware to collect metrics using OpenTelemetry
 * `commercetools-graphql-api`: type safe support for the commercetools GraphQL API
 
 ### Migration Guidelines

diff --git a/api-java-mixin.raml b/api-java-mixin.raml
@@ -20,6 +20,9 @@ annotationTypes:
   java-implements:
     type: string
     allowedTargets: TypeDeclaration
+  java-impl-mixin:
+    type: string
+    allowedTargets: TypeDeclaration
 
 types:
   BaseAddress:
@@ -1393,7 +1396,17 @@ types:
     (java-extends): 'com.commercetools.api.models.Identifiable<AssociateRole>'
   AssociateRoleUpdateAction:
     (java-extends): 'com.commercetools.api.models.ResourceUpdateAction<AssociateRoleUpdateAction>'
+  MessageDeliveryPayload:
+    (java-extends): MessageDeliveryPayloadMixin
+    (java-impl-mixin): |
+      private com.commercetools.api.models.message.MessagePayload messagePayload;
 
+      @Override
+      public com.commercetools.api.models.message.MessagePayload getMessagePayload() {
+          return messagePayload;
+      }
+  MessagePayload:
+    (java-extends): MessagePayloadMixin
 /{projectKey}:
   /categories:
     (java-implements): 'ByProjectKeyCategoriesRequestBuilderMixin'

diff --git a/build.gradle b/build.gradle
@@ -68,7 +68,7 @@ allprojects {
     }
 
     dependencies {
-        taglet 'com.commercetools.build.taglets:commercetools-taglets:3.6.1'
+        taglet 'com.commercetools.build.taglets:commercetools-taglets:3.6.3'
         taglet 'org.jdrupes.taglets:plantuml-taglet:2.1.0'
     }
 }
@@ -194,6 +194,7 @@ def documentationProjects= [
         ":commercetools:commercetools-javanet-client",
         ":commercetools:commercetools-money",
         ":commercetools:commercetools-monitoring-newrelic",
+        ":commercetools:commercetools-monitoring-opentelemetry",
         ":commercetools:commercetools-okhttp-client3",
         ":commercetools:commercetools-okhttp-client4",
         ":commercetools:commercetools-reactornetty-client",
@@ -203,7 +204,6 @@ def documentationProjects= [
         ":commercetools:commercetools-sdk-java-importapi",
         ":commercetools:commercetools-sdk-java-ml",
         ":commercetools:internal-docs",
-        ":rmf:okhttp-client",
         ":rmf:rmf-java-base"
 ]
 
@@ -232,7 +232,7 @@ tasks.register('alljavadoc', Javadoc) {
         splitIndex = true
         noTree = true
         title = "commercetools Java SDK"
-        links 'https://docs.oracle.com/javase/8/docs/api/', "https://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/${versions.jackson}/", 'https://commercetools.github.io/commercetools-jvm-sdk/apidocs/', 'https://newrelic.github.io/java-agent-api/javadoc/'
+        links 'https://docs.oracle.com/javase/8/docs/api/', "https://fasterxml.github.io/jackson-databind/javadoc/2.14/", 'https://commercetools.github.io/commercetools-jvm-sdk/apidocs/', 'https://newrelic.github.io/java-agent-api/javadoc/'
         overview = "src/main/javadoc/overview.html"
         bottom = """
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.8.0/styles/default.min.css">
@@ -292,7 +292,7 @@ tasks.register('internaldocs', Javadoc) {
         splitIndex = true
         noTree = true
         title = "commercetools Java SDK"
-        links 'https://docs.oracle.com/javase/8/docs/api/', "https://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/${versions.jackson}/", 'https://commercetools.github.io/commercetools-jvm-sdk/apidocs/', 'https://newrelic.github.io/java-agent-api/javadoc/'
+        links 'https://docs.oracle.com/javase/8/docs/api/', "https://fasterxml.github.io/jackson-databind/javadoc/2.14/", 'https://commercetools.github.io/commercetools-jvm-sdk/apidocs/', 'https://newrelic.github.io/java-agent-api/javadoc/'
         overview = "src/main/javadoc/overview.html"
         bottom = """
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.8.0/styles/default.min.css">