From b679e38b360bc44786d30a46a092d467080fac8b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 20 Sep 2025 23:18:25 +0800 Subject: [PATCH 1/3] test java clients with petstore in github workflow --- .../samples-java-petsore-client-jdk11.yaml | 68 +++++++++++++++++++ .../jersey2-java8/.openapi-generator-ignore | 5 +- 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/samples-java-petsore-client-jdk11.yaml diff --git a/.github/workflows/samples-java-petsore-client-jdk11.yaml b/.github/workflows/samples-java-petsore-client-jdk11.yaml new file mode 100644 index 000000000000..c0930c8892b2 --- /dev/null +++ b/.github/workflows/samples-java-petsore-client-jdk11.yaml @@ -0,0 +1,68 @@ +name: Samples Java Client JDK11 + +on: + push: + paths: + - samples/client/petstore/java/jersey2-java8/** + - samples/openapi3/client/petstore/java/jersey2-java8/** + - samples/client/petstore/java/jersey3/** + - samples/client/petstore/java/jersey3-oneOf/** + - samples/client/others/java/okhttp-gson-streaming/** + - samples/client/petstore/java/okhttp-gson/** + - samples/client/petstore/java/okhttp-gson-3.1/** + - samples/client/petstore/java/okhttp-gson-dynamicOperations/** + - samples/client/petstore/java/resteasy/** + - samples/client/petstore/java-micronaut-client/** + - samples/client/petstore/java/apache-httpclient/** + - samples/client/petstore/java/resttemplate-jakarta/** + pull_request: + paths: + - samples/client/petstore/java/jersey2-java8/** + - samples/openapi3/client/petstore/java/jersey2-java8/** + - samples/client/petstore/java/jersey3/** + - samples/client/petstore/java/jersey3-oneOf/** + - samples/client/others/java/okhttp-gson-streaming/** + - samples/client/petstore/java/okhttp-gson/** + - samples/client/petstore/java/okhttp-gson-3.1/** + - samples/client/petstore/java/okhttp-gson-dynamicOperations/** + - samples/client/petstore/java/resteasy/** + - samples/client/petstore/java-micronaut-client/** + - samples/client/petstore/java/apache-httpclient/** + - samples/client/petstore/java/resttemplate-jakarta/** +jobs: + build: + name: Build Java Client JDK11 + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + sample: + - samples/client/petstore/java/jersey2-java8 + - samples/openapi3/client/petstore/java/jersey2-java8 + - samples/client/petstore/java/jersey3 + - samples/client/petstore/java/jersey3-oneOf + - samples/client/others/java/okhttp-gson-streaming + - samples/client/petstore/java/okhttp-gson + - samples/client/petstore/java/okhttp-gson-3.1 + - samples/client/petstore/java/okhttp-gson-dynamicOperations + - samples/client/petstore/java/resteasy + - samples/client/petstore/java-micronaut-client + - samples/client/petstore/java/apache-httpclient + - samples/client/petstore/java/resttemplate-jakarta + steps: + - uses: actions/checkout@v5 + - uses: actions/setup-java@v5 + with: + distribution: 'temurin' + java-version: 11 + - name: Cache maven dependencies + uses: actions/cache@v4 + env: + cache-name: maven-repository + with: + path: | + ~/.m2 + key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} + - name: Build with Maven + working-directory: ${{ matrix.sample }} + run: mvn clean package --no-transfer-progress diff --git a/samples/client/petstore/java/jersey2-java8/.openapi-generator-ignore b/samples/client/petstore/java/jersey2-java8/.openapi-generator-ignore index 79656709d888..6fe532b49b27 100644 --- a/samples/client/petstore/java/jersey2-java8/.openapi-generator-ignore +++ b/samples/client/petstore/java/jersey2-java8/.openapi-generator-ignore @@ -1,4 +1,7 @@ # OpenAPI Generator Ignore # These are "live" test files which should not be overwritten src/test/java/org/openapitools/client/JSONTest.java -src/test/java/org/openapitools/client/JSONComposedSchemaTest.java \ No newline at end of file +src/test/java/org/openapitools/client/JSONComposedSchemaTest.java + + + From e5e753d3f730c590efbc6cbc54806b28c363c9f6 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 20 Sep 2025 23:28:41 +0800 Subject: [PATCH 2/3] update --- .../workflows/samples-java-client-jdk11.yaml | 12 ++++++ .../samples-java-petsore-client-jdk11.yaml | 43 ++++++++++++------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/.github/workflows/samples-java-client-jdk11.yaml b/.github/workflows/samples-java-client-jdk11.yaml index b4342f9f2dfd..70c220bb87bd 100644 --- a/.github/workflows/samples-java-client-jdk11.yaml +++ b/.github/workflows/samples-java-client-jdk11.yaml @@ -17,6 +17,10 @@ on: - samples/client/petstore/java/webclient-useSingleRequestParameter/** - samples/client/others/java/jersey2-oneOf-duplicates/** - samples/client/others/java/jersey2-oneOf-Mixed/** + - samples/client/petstore/java/jersey3-oneOf/** + - samples/client/others/java/okhttp-gson-streaming/** + - samples/client/others/java/resteasy/** + - samples/client/others/java/apache-httpclient/** - samples/client/others/java/resttemplate-list-schema-validation/** - samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/** pull_request: @@ -35,6 +39,10 @@ on: - samples/client/petstore/java/webclient-useSingleRequestParameter/** - samples/client/others/java/jersey2-oneOf-duplicates/** - samples/client/others/java/jersey2-oneOf-Mixed/** + - samples/client/petstore/java/jersey3-oneOf/** + - samples/client/others/java/okhttp-gson-streaming/** + - samples/client/others/java/resteasy/** + - samples/client/others/java/apache-httpclient/** - samples/client/others/java/resttemplate-list-schema-validation/** - samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/** jobs: @@ -97,6 +105,10 @@ jobs: - samples/client/others/java/jersey2-oneOf-Mixed/ - samples/client/others/java/resttemplate-list-schema-validation/ - samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/ + - samples/client/petstore/java/jersey3-oneOf/ + - samples/client/others/java/okhttp-gson-streaming/ + - samples/client/petstore/java/resteasy/ + - samples/client/petstore/java/apache-httpclient/ steps: - uses: actions/checkout@v5 - uses: actions/setup-java@v5 diff --git a/.github/workflows/samples-java-petsore-client-jdk11.yaml b/.github/workflows/samples-java-petsore-client-jdk11.yaml index c0930c8892b2..ada504b84816 100644 --- a/.github/workflows/samples-java-petsore-client-jdk11.yaml +++ b/.github/workflows/samples-java-petsore-client-jdk11.yaml @@ -1,4 +1,4 @@ -name: Samples Java Client JDK11 +name: Samples Java Petsore Client JDK11 on: push: @@ -6,29 +6,29 @@ on: - samples/client/petstore/java/jersey2-java8/** - samples/openapi3/client/petstore/java/jersey2-java8/** - samples/client/petstore/java/jersey3/** - - samples/client/petstore/java/jersey3-oneOf/** - - samples/client/others/java/okhttp-gson-streaming/** + #- samples/client/petstore/java/jersey3-oneOf/** + #- samples/client/others/java/okhttp-gson-streaming/** - samples/client/petstore/java/okhttp-gson/** - samples/client/petstore/java/okhttp-gson-3.1/** - samples/client/petstore/java/okhttp-gson-dynamicOperations/** - - samples/client/petstore/java/resteasy/** + #- samples/client/petstore/java/resteasy/** - samples/client/petstore/java-micronaut-client/** - - samples/client/petstore/java/apache-httpclient/** - - samples/client/petstore/java/resttemplate-jakarta/** + #- samples/client/petstore/java/apache-httpclient/** + #- samples/client/petstore/java/resttemplate-jakarta/** pull_request: paths: - samples/client/petstore/java/jersey2-java8/** - samples/openapi3/client/petstore/java/jersey2-java8/** - samples/client/petstore/java/jersey3/** - - samples/client/petstore/java/jersey3-oneOf/** - - samples/client/others/java/okhttp-gson-streaming/** + #- samples/client/petstore/java/jersey3-oneOf/** + #- samples/client/others/java/okhttp-gson-streaming/** - samples/client/petstore/java/okhttp-gson/** - samples/client/petstore/java/okhttp-gson-3.1/** - samples/client/petstore/java/okhttp-gson-dynamicOperations/** - - samples/client/petstore/java/resteasy/** + #- samples/client/petstore/java/resteasy/** - samples/client/petstore/java-micronaut-client/** - - samples/client/petstore/java/apache-httpclient/** - - samples/client/petstore/java/resttemplate-jakarta/** + #- samples/client/petstore/java/apache-httpclient/** + #- samples/client/petstore/java/resttemplate-jakarta/** jobs: build: name: Build Java Client JDK11 @@ -40,17 +40,28 @@ jobs: - samples/client/petstore/java/jersey2-java8 - samples/openapi3/client/petstore/java/jersey2-java8 - samples/client/petstore/java/jersey3 - - samples/client/petstore/java/jersey3-oneOf - - samples/client/others/java/okhttp-gson-streaming + #- samples/client/petstore/java/jersey3-oneOf + #- samples/client/others/java/okhttp-gson-streaming - samples/client/petstore/java/okhttp-gson - samples/client/petstore/java/okhttp-gson-3.1 - samples/client/petstore/java/okhttp-gson-dynamicOperations - - samples/client/petstore/java/resteasy + #- samples/client/petstore/java/resteasy - samples/client/petstore/java-micronaut-client - - samples/client/petstore/java/apache-httpclient - - samples/client/petstore/java/resttemplate-jakarta + #- samples/client/petstore/java/apache-httpclient + #- samples/client/petstore/java/resttemplate-jakarta + services: + petstore-api: + image: swaggerapi/petstore + ports: + - 80:8080 + env: + SWAGGER_HOST: http://petstore.swagger.io + SWAGGER_BASE_PATH: /v2 steps: - uses: actions/checkout@v5 + - name: Add hosts to /etc/hosts + run: | + sudo echo "127.0.0.1 petstore.swagger.io" | sudo tee -a /etc/hosts - uses: actions/setup-java@v5 with: distribution: 'temurin' From 8b0e7884302429c2a123fb6c730f0d689e55b8a3 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 20 Sep 2025 23:41:13 +0800 Subject: [PATCH 3/3] clean up --- .../samples-java-petsore-client-jdk11.yaml | 16 +--------------- CI/circle_parallel.sh | 12 ------------ 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/.github/workflows/samples-java-petsore-client-jdk11.yaml b/.github/workflows/samples-java-petsore-client-jdk11.yaml index ada504b84816..71fe8d7a42f9 100644 --- a/.github/workflows/samples-java-petsore-client-jdk11.yaml +++ b/.github/workflows/samples-java-petsore-client-jdk11.yaml @@ -1,3 +1,4 @@ +# run java client tests with petstore server name: Samples Java Petsore Client JDK11 on: @@ -6,29 +7,19 @@ on: - samples/client/petstore/java/jersey2-java8/** - samples/openapi3/client/petstore/java/jersey2-java8/** - samples/client/petstore/java/jersey3/** - #- samples/client/petstore/java/jersey3-oneOf/** - #- samples/client/others/java/okhttp-gson-streaming/** - samples/client/petstore/java/okhttp-gson/** - samples/client/petstore/java/okhttp-gson-3.1/** - samples/client/petstore/java/okhttp-gson-dynamicOperations/** - #- samples/client/petstore/java/resteasy/** - samples/client/petstore/java-micronaut-client/** - #- samples/client/petstore/java/apache-httpclient/** - #- samples/client/petstore/java/resttemplate-jakarta/** pull_request: paths: - samples/client/petstore/java/jersey2-java8/** - samples/openapi3/client/petstore/java/jersey2-java8/** - samples/client/petstore/java/jersey3/** - #- samples/client/petstore/java/jersey3-oneOf/** - #- samples/client/others/java/okhttp-gson-streaming/** - samples/client/petstore/java/okhttp-gson/** - samples/client/petstore/java/okhttp-gson-3.1/** - samples/client/petstore/java/okhttp-gson-dynamicOperations/** - #- samples/client/petstore/java/resteasy/** - samples/client/petstore/java-micronaut-client/** - #- samples/client/petstore/java/apache-httpclient/** - #- samples/client/petstore/java/resttemplate-jakarta/** jobs: build: name: Build Java Client JDK11 @@ -40,15 +31,10 @@ jobs: - samples/client/petstore/java/jersey2-java8 - samples/openapi3/client/petstore/java/jersey2-java8 - samples/client/petstore/java/jersey3 - #- samples/client/petstore/java/jersey3-oneOf - #- samples/client/others/java/okhttp-gson-streaming - samples/client/petstore/java/okhttp-gson - samples/client/petstore/java/okhttp-gson-3.1 - samples/client/petstore/java/okhttp-gson-dynamicOperations - #- samples/client/petstore/java/resteasy - samples/client/petstore/java-micronaut-client - #- samples/client/petstore/java/apache-httpclient - #- samples/client/petstore/java/resttemplate-jakarta services: petstore-api: image: swaggerapi/petstore diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 1dc32c6e963b..36ce7d151860 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -121,17 +121,5 @@ else (cd samples/client/petstore/scala-sttp-circe && mvn integration-test) (cd samples/client/petstore/scala-sttp4 && mvn integration-test) (cd samples/client/petstore/clojure && mvn integration-test) - (cd samples/client/petstore/java/jersey2-java8 && mvn integration-test) - (cd samples/openapi3/client/petstore/java/jersey2-java8 && mvn integration-test) - (cd samples/client/petstore/java/jersey3 && mvn integration-test) - (cd samples/client/petstore/java/jersey3-oneOf && mvn integration-test) - (cd samples/client/others/java/okhttp-gson-streaming && mvn integration-test) - (cd samples/client/petstore/java/okhttp-gson && mvn integration-test) - (cd samples/client/petstore/java/okhttp-gson-3.1 && mvn integration-test) - (cd samples/client/petstore/java/okhttp-gson-dynamicOperations && mvn integration-test) - (cd samples/client/petstore/java/resteasy && mvn integration-test) - (cd samples/client/petstore/java-micronaut-client && mvn integration-test) - (cd samples/client/petstore/java/apache-httpclient && mvn integration-test) - (cd samples/client/petstore/java/resttemplate-jakarta && mvn integration-test) fi