Skip to content

Commit 6d87b53

Browse files
kodiakhq[bot]kodiakhq[bot]
authored
Merge pull request #784 from commercetools/httpclient-solutioninfos
[DEVX-516] add HttpClient info to UserAgent
2 parents dc88d99 + 85fce78 commit 6d87b53

File tree

39 files changed

+375
-190
lines changed

39 files changed

+375
-190
lines changed

‎.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Checkout
1717
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1818

19-
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
19+
- uses: gradle/actions/wrapper-validation@v4
2020

2121
- name: Setup Java
2222
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
# https://help.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
4545
# https://github.yungao-tech.community/t/action-does-not-trigger-another-on-push-tag-action/17148/8
4646
token: ${{ steps.generate_github_token.outputs.token }}
47-
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
47+
- uses: gradle/actions/wrapper-validation@v4
4848

4949
- name: Setup Java
5050
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
@@ -162,7 +162,7 @@ jobs:
162162
with:
163163
token: ${{ steps.generate_github_token.outputs.token }}
164164

165-
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
165+
- uses: gradle/actions/wrapper-validation@v4
166166

167167
- name: Setup Java
168168
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4

‎.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Checkout repository
5151
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
5252

53-
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
53+
- uses: gradle/actions/wrapper-validation@v4
5454

5555
# Initializes the CodeQL tools for scanning.
5656
- name: Initialize CodeQL

‎.github/workflows/create-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
token: ${{ steps.generate_github_token.outputs.token }}
3838

39-
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
39+
- uses: gradle/actions/wrapper-validation@v4
4040

4141
- uses: jenschude/auto-create-pr-action@a5369414c74963e6ec065dab49066d3711b8c1db # v0.3.2
4242
if: github.ref_name == 'gen-sdk-updates'

‎.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
distribution: 'temurin'
5555
java-version: '17'
5656

57-
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
57+
- uses: gradle/actions/wrapper-validation@v4
5858

5959
- name: Setup Graphviz
6060
uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2

‎.github/workflows/release-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
token: ${{ steps.generate_github_token.outputs.token }}
2828

29-
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
29+
- uses: gradle/actions/wrapper-validation@v4
3030

3131
- name: Setup Java
3232
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Checkout
2020
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2121

22-
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
22+
- uses: gradle/actions/wrapper-validation@v4
2323

2424
- name: Setup Java
2525
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
@@ -75,7 +75,7 @@ jobs:
7575
ref: main
7676
token: ${{ steps.generate_github_token.outputs.token }}
7777

78-
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
78+
- uses: gradle/actions/wrapper-validation@v4
7979

8080
- run: ./gradlew -Pversion=$REF_NAME writeVersionToExamples writeVersionToReadme setVersion nextMinorVersion snapshotVersion
8181
env:

‎.husky/pre-commit

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/usr/bin/env sh
2-
. "$(dirname -- "$0")/_/husky.sh"
3-
41
yarn lint-staged

‎commercetools/commercetools-apachehttp-client/src/main/java/com/commercetools/http/apachehttp/ApacheHttpClientSolutionInfo.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11

22
package com.commercetools.http.apachehttp;
33

4+
import io.vrap.rmf.base.client.SolutionInfo;
5+
46
import org.apache.hc.client5.http.classic.HttpClient;
57
import org.apache.hc.core5.util.VersionInfo;
68

7-
public class ApacheHttpClientSolutionInfo extends io.vrap.rmf.base.client.SolutionInfo {
9+
public class ApacheHttpClientSolutionInfo extends SolutionInfo {
810
public ApacheHttpClientSolutionInfo() {
911
setName("ApacheHttpAsyncClient");
1012
setVersion(

‎commercetools/commercetools-apachehttp-client/src/test/java/com/commercetools/http/apachehttp/SolutionInfoTest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
package com.commercetools.http.apachehttp;
3+
4+
import org.assertj.core.api.Assertions;
5+
import org.junit.jupiter.api.Test;
6+
7+
public class SolutionInfoTest {
8+
@Test
9+
public void version() {
10+
String version = new ApacheHttpClientSolutionInfo().getVersion();
11+
12+
Assertions.assertThat(version).isEqualTo("5.4.1");
13+
}
14+
}

‎commercetools/commercetools-async-http-client/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ dependencies {
33
api project(":rmf:rmf-java-base")
44
api "org.asynchttpclient:async-http-client:2.12.4"
55
api commons.io version commons.io_version
6-
api "io.netty:netty-codec-http:${netty.version}"
7-
api "io.netty:netty-codec-socks:${netty.version}"
8-
api "io.netty:netty-handler-proxy:${netty.version}"
6+
api "io.netty:netty-codec:4.1.116.Final"
7+
api "io.netty:netty-codec-http:4.1.116.Final"
8+
api "io.netty:netty-codec-socks:4.1.116.Final"
9+
api "io.netty:netty-handler-proxy:4.1.116.Final"
10+
api "io.netty:netty-handler:4.1.116.Final"
911
implementation javax.validation
1012
}

‎commercetools/commercetools-async-http-client/src/main/java/com/commercetools/http/asynchttp/AsyncHttpClientSolutionInfo.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
package com.commercetools.http.asynchttp;
3+
4+
import io.vrap.rmf.base.client.SolutionInfo;
5+
import io.vrap.rmf.base.client.VersionLoader;
6+
7+
public class AsyncHttpClientSolutionInfo extends SolutionInfo {
8+
9+
public AsyncHttpClientSolutionInfo() {
10+
setName("AsyncHttpAsyncClient");
11+
setVersion(VersionLoader.loadVersionInfo("org.asynchttpclient", "async-http-client", "pom.properties",
12+
"version", this.getClass().getClassLoader()));
13+
}
14+
}

‎commercetools/commercetools-async-http-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
com.commercetools.http.asynchttp.AsyncHttpClientSolutionInfo

‎commercetools/commercetools-async-http-client/src/test/java/com/commercetools/http/asynchttpclient/SolutionInfoTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
package com.commercetools.http.asynchttpclient;
3+
4+
import com.commercetools.http.asynchttp.AsyncHttpClientSolutionInfo;
5+
6+
import org.assertj.core.api.Assertions;
7+
import org.junit.jupiter.api.Test;
8+
9+
public class SolutionInfoTest {
10+
@Test
11+
public void version() {
12+
String version = new AsyncHttpClientSolutionInfo().getVersion();
13+
14+
Assertions.assertThat(version).isEqualTo("2.12.4");
15+
}
16+
}

‎commercetools/commercetools-javanet-client/src/main/java/com/commercetools/http/javanet/JavaNetHttpClientSolutionInfo.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
package com.commercetools.http.javanet;
3+
4+
import io.vrap.rmf.base.client.SolutionInfo;
5+
6+
import org.apache.commons.lang3.SystemUtils;
7+
8+
public class JavaNetHttpClientSolutionInfo extends SolutionInfo {
9+
10+
public JavaNetHttpClientSolutionInfo() {
11+
setName("JavaNetHttpClient");
12+
setVersion(SystemUtils.JAVA_RUNTIME_VERSION);
13+
}
14+
}

‎commercetools/commercetools-javanet-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
com.commercetools.http.javanet.JavaNetHttpClientSolutionInfo

‎commercetools/commercetools-javanet-client/src/test/java/com/commercetools/http/javanet/SolutionInfoTest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
package com.commercetools.http.javanet;
3+
4+
import org.assertj.core.api.Assertions;
5+
import org.junit.jupiter.api.Test;
6+
7+
public class SolutionInfoTest {
8+
@Test
9+
public void version() {
10+
String version = new JavaNetHttpClientSolutionInfo().getVersion();
11+
12+
Assertions.assertThat(version).isNotEmpty();
13+
}
14+
}

‎commercetools/commercetools-okhttp-client3/src/main/java/com/commercetools/http/okhttp3/OkHttpClientSolutionInfo.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
package com.commercetools.http.okhttp3;
3+
4+
import io.vrap.rmf.base.client.SolutionInfo;
5+
import io.vrap.rmf.base.client.VersionLoader;
6+
7+
public class OkHttpClientSolutionInfo extends SolutionInfo {
8+
9+
public OkHttpClientSolutionInfo() {
10+
setName("OkHttpClient");
11+
setVersion(VersionLoader.loadVersionInfo("com.squareup.okhttp3", "okhttp", "pom.properties", "version",
12+
this.getClass().getClassLoader()));
13+
}
14+
}

‎commercetools/commercetools-okhttp-client3/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
com.commercetools.http.okhttp3.OkHttpClientSolutionInfo

‎commercetools/commercetools-okhttp-client3/src/test/java/com/commercetools/http/okhttp3/SolutionInfoTest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
package com.commercetools.http.okhttp3;
3+
4+
import org.assertj.core.api.Assertions;
5+
import org.junit.jupiter.api.Test;
6+
7+
public class SolutionInfoTest {
8+
@Test
9+
public void version() {
10+
String version = new OkHttpClientSolutionInfo().getVersion();
11+
12+
Assertions.assertThat(version).isEqualTo("3.14.9");
13+
}
14+
}

‎commercetools/commercetools-okhttp-client4/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
api project(":rmf:rmf-java-base")
1414
api "com.squareup.okhttp3:okhttp:4.12.0" version {
1515
strictly '[4.0,5.0['
16-
prefer "4.10.0"
16+
prefer "4.12.0"
1717
}
1818
implementation "com.squareup.okio:okio:3.9.1"
1919

‎commercetools/commercetools-okhttp-client4/src/main/java/com/commercetools/http/okhttp4/OkHttpClientSolutionInfo.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
package com.commercetools.http.okhttp4;
3+
4+
import io.vrap.rmf.base.client.SolutionInfo;
5+
6+
import okhttp3.OkHttp;
7+
8+
public class OkHttpClientSolutionInfo extends SolutionInfo {
9+
10+
public OkHttpClientSolutionInfo() {
11+
setName("OkHttpClient");
12+
setVersion(OkHttp.VERSION);
13+
}
14+
}

‎commercetools/commercetools-okhttp-client4/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
com.commercetools.http.okhttp4.OkHttpClientSolutionInfo

‎commercetools/commercetools-okhttp-client4/src/test/java/com/commercetools/http/okhttp4/SolutionInfoTest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
package com.commercetools.http.okhttp4;
3+
4+
import org.assertj.core.api.Assertions;
5+
import org.junit.jupiter.api.Test;
6+
7+
public class SolutionInfoTest {
8+
@Test
9+
public void version() {
10+
String version = new OkHttpClientSolutionInfo().getVersion();
11+
12+
Assertions.assertThat(version).isEqualTo("4.12.0");
13+
}
14+
}

‎commercetools/commercetools-reactornetty-client/src/main/java/com/commercetools/http/netty/NettyHttpClientSolutionInfo.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
package com.commercetools.http.netty;
3+
4+
import io.vrap.rmf.base.client.SolutionInfo;
5+
6+
import reactor.netty.http.client.HttpClient;
7+
8+
public class NettyHttpClientSolutionInfo extends SolutionInfo {
9+
10+
public NettyHttpClientSolutionInfo() {
11+
setName("NettyHttpClient");
12+
setVersion(HttpClient.class.getPackage().getImplementationVersion());
13+
}
14+
}

‎commercetools/commercetools-reactornetty-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
com.commercetools.http.netty.NettyHttpClientSolutionInfo

‎commercetools/commercetools-reactornetty-client/src/test/java/com/commercetools/http/netty/SolutionInfoTest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
package com.commercetools.http.netty;
3+
4+
import org.assertj.core.api.Assertions;
5+
import org.junit.jupiter.api.Test;
6+
7+
public class SolutionInfoTest {
8+
@Test
9+
public void version() {
10+
String version = new NettyHttpClientSolutionInfo().getVersion();
11+
12+
Assertions.assertThat(version).isEqualTo("1.2.1");
13+
}
14+
}

‎commercetools/commercetools-sdk-compat-v1/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ dependencies {
2121
api project(':commercetools:commercetools-sdk-java-api')
2222
api ctsdkv1.client version ctsdkv1.version
2323
api ctsdkv1.models version ctsdkv1.version
24+
api "io.netty:netty-codec:4.1.116.Final"
25+
api "io.netty:netty-codec-http:4.1.116.Final"
2426

2527
jmhImplementation project(':commercetools:commercetools-async-http-client')
2628
jmhImplementation project(':commercetools:commercetools-apachehttp-client')

‎gradle-scripts/extensions.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@ ext {
99
}
1010
]
1111

12-
netty = [
13-
version: '4.1.109.Final'
14-
]
1512
commons = [
1613
text: 'org.apache.commons:commons-text:1.13.0',
1714
lang3: 'org.apache.commons:commons-lang3:3.17.0',
1815
io: 'commons-io:commons-io:2.18.0',
1916
io_version: {
2017
strictly '[2.8.0,)'
21-
prefer '2.11.0'
18+
prefer '2.16.1'
2219
}
2320
]
2421

‎licenses/commercetools-apachehttp-client/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
},
8181
{
8282
"moduleName": "commons-io:commons-io",
83-
"moduleVersion": "2.11.0",
83+
"moduleVersion": "2.16.1",
8484
"moduleUrls": [
8585
"https://commons.apache.org/proper/commons-io/"
8686
],

0 commit comments

Comments
 (0)