From 9093b714956f1c2c4e87a518b31dbc6558ada2fc Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Tue, 8 Aug 2023 10:21:14 +0200 Subject: [PATCH 01/15] Add Editor shield --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1e01827..5997f3f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/openapi-client-maven-template?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/openapi-client-maven-template) [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/openapi-client-maven-template/checkBuild.yml?branch=develop)](https://github.com/xdev-software/openapi-client-maven-template/actions/workflows/checkBuild.yml?query=branch%3Adevelop) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_openapi-client-maven-template&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_openapi-client-maven-template) +[![API Specification Editor](https://img.shields.io/badge/API--Spec-Editor-85ea2d?logo=swagger)](https://editor.swagger.io/?url=https://raw.githubusercontent.com/xdev-software/openapi-client-maven-template/develop/openapi/openapi.yml) # openapi-client-maven-template From 99193daed2f39f156902f7582948a9c6bf5d6acf Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Tue, 8 Aug 2023 10:34:49 +0200 Subject: [PATCH 02/15] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 34ae9b6..7ebdbbe 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ This client [is generated](./sched-java-client/pom.xml) from an [``openapi.yml`` > * Numbers are (partially) handled as string > * Dates are not formatted according to [``RFC 3339``](https://datatracker.ietf.org/doc/html/rfc3339) > * Sometimes unix timestamps are used instead of dates -> * Arrays are not handle as arrays and instead comma separated lists are used +> * Arrays are not handled as arrays and instead comma separated lists are used > * Incorrect [HTTP Request methods](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods) are used. E.g. ``GET`` for ``/api/session/del`` (should be ``DELETE``) > * Some endpoints don't return JSON by default > From b603842e8cd84a36cb7a1af819e534bc2060ceb5 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Tue, 8 Aug 2023 12:58:40 +0200 Subject: [PATCH 03/15] Update README.md Add missing endpoint --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ebdbbe..d799a08 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ This client [is generated](./sched-java-client/pom.xml) from an [``openapi.yml`` * Modify ✔️ * Delete ✔️ * List ✔️ - * Export + * Export ✔️ * Seats * Count * User From 6cf71f48035881aed7dcde22009f1227a965f5b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 00:50:13 +0000 Subject: [PATCH 04/15] Bump org.openapitools:openapi-generator-maven-plugin from 6.6.0 to 7.0.0 Bumps org.openapitools:openapi-generator-maven-plugin from 6.6.0 to 7.0.0. --- updated-dependencies: - dependency-name: org.openapitools:openapi-generator-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- openapi-client-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi-client-maven-template/pom.xml b/openapi-client-maven-template/pom.xml index 868211d..69b0ea2 100644 --- a/openapi-client-maven-template/pom.xml +++ b/openapi-client-maven-template/pom.xml @@ -328,7 +328,7 @@ org.openapitools openapi-generator-maven-plugin - 6.6.0 + 7.0.0 From 4883a900e7da367aca455ba52e5cadc9a223d531 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 00:21:20 +0000 Subject: [PATCH 05/15] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/update-from-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index 60bad1d..ab0b49e 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Required because otherwise there are always changes detected when executing diff/rev-list fetch-depth: 0 From 7c38b04b5b1ad50dd4e930d9679e67e4d8aa4f38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 07:30:12 +0000 Subject: [PATCH 06/15] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/checkBuild.yml | 2 +- .github/workflows/release.yml | 10 +++++----- .github/workflows/sonar.yml | 2 +- .github/workflows/test-deploy.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index cd0bb79..c23ac42 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -25,7 +25,7 @@ jobs: distribution: [temurin] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 609af70..53d1c12 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: check_code: # Validates the code runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 @@ -52,7 +52,7 @@ jobs: outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Configure Git run: | @@ -111,7 +111,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare_release] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Init Git and pull run: | @@ -143,7 +143,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare_release] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Init Git and pull run: | @@ -197,7 +197,7 @@ jobs: runs-on: ubuntu-latest needs: [publish_central] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Init Git and pull run: | diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 171b60d..f7c82af 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -26,7 +26,7 @@ jobs: # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 3e44f39..d2a8e2f 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -10,7 +10,7 @@ jobs: publish_central: # Publish the code to central runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK OSSRH uses: actions/setup-java@v3 From 3e4488297a66f5ff465be62f134d52d54557ca83 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 7 Sep 2023 09:42:47 +0200 Subject: [PATCH 07/15] Regenerate code after generator update --- .../src/generated/java/software/xdev/sched/api/RoleApi.java | 1 - .../src/generated/java/software/xdev/sched/api/SessionApi.java | 1 - .../src/generated/java/software/xdev/sched/api/UserApi.java | 1 - .../generated/java/software/xdev/sched/model/ExportSession.java | 1 + 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sched-java-client/src/generated/java/software/xdev/sched/api/RoleApi.java b/sched-java-client/src/generated/java/software/xdev/sched/api/RoleApi.java index 0c3d566..23b2289 100644 --- a/sched-java-client/src/generated/java/software/xdev/sched/api/RoleApi.java +++ b/sched-java-client/src/generated/java/software/xdev/sched/api/RoleApi.java @@ -17,7 +17,6 @@ import software.xdev.sched.client.ApiException; import software.xdev.sched.client.ApiClient; import software.xdev.sched.client.Configuration; -import software.xdev.sched.model.*; import software.xdev.sched.client.Pair; diff --git a/sched-java-client/src/generated/java/software/xdev/sched/api/SessionApi.java b/sched-java-client/src/generated/java/software/xdev/sched/api/SessionApi.java index 9afaa29..e3d121c 100644 --- a/sched-java-client/src/generated/java/software/xdev/sched/api/SessionApi.java +++ b/sched-java-client/src/generated/java/software/xdev/sched/api/SessionApi.java @@ -17,7 +17,6 @@ import software.xdev.sched.client.ApiException; import software.xdev.sched.client.ApiClient; import software.xdev.sched.client.Configuration; -import software.xdev.sched.model.*; import software.xdev.sched.client.Pair; import software.xdev.sched.model.ExportSession; diff --git a/sched-java-client/src/generated/java/software/xdev/sched/api/UserApi.java b/sched-java-client/src/generated/java/software/xdev/sched/api/UserApi.java index 1e1de16..39ea05c 100644 --- a/sched-java-client/src/generated/java/software/xdev/sched/api/UserApi.java +++ b/sched-java-client/src/generated/java/software/xdev/sched/api/UserApi.java @@ -17,7 +17,6 @@ import software.xdev.sched.client.ApiException; import software.xdev.sched.client.ApiClient; import software.xdev.sched.client.Configuration; -import software.xdev.sched.model.*; import software.xdev.sched.client.Pair; import java.net.URI; diff --git a/sched-java-client/src/generated/java/software/xdev/sched/model/ExportSession.java b/sched-java-client/src/generated/java/software/xdev/sched/model/ExportSession.java index 3b73299..354f873 100644 --- a/sched-java-client/src/generated/java/software/xdev/sched/model/ExportSession.java +++ b/sched-java-client/src/generated/java/software/xdev/sched/model/ExportSession.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import software.xdev.sched.model.ExportSpeaker; import com.fasterxml.jackson.annotation.JsonPropertyOrder; From fb89eae4bcc6bbcf0fe3f44a7c83b4dc5c46288b Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 7 Sep 2023 09:50:56 +0200 Subject: [PATCH 08/15] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf72754..edf7d87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.0.1 +* Updated openapi generator + # 1.0.0 * Initial release From 48f0a23f572b8212cd604f9b85f3adf33a1d8ef5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 00:35:52 +0000 Subject: [PATCH 09/15] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.0 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.5.0...maven-javadoc-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 9f74dbf..9176612 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 attach-javadocs From e7e16bbe3d2ebf624563ecdfd03a03f92acdd939 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 00:46:01 +0000 Subject: [PATCH 10/15] Bump org.openapitools:openapi-generator-maven-plugin from 7.0.0 to 7.0.1 Bumps org.openapitools:openapi-generator-maven-plugin from 7.0.0 to 7.0.1. --- updated-dependencies: - dependency-name: org.openapitools:openapi-generator-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- openapi-client-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi-client-maven-template/pom.xml b/openapi-client-maven-template/pom.xml index 69b0ea2..9cf87ad 100644 --- a/openapi-client-maven-template/pom.xml +++ b/openapi-client-maven-template/pom.xml @@ -328,7 +328,7 @@ org.openapitools openapi-generator-maven-plugin - 7.0.0 + 7.0.1 From c2ca04b205c0bb380fa66d19565da6e4b7da88de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 01:06:57 +0000 Subject: [PATCH 11/15] Bump com.mycila:license-maven-plugin from 4.2 to 4.3 Bumps com.mycila:license-maven-plugin from 4.2 to 4.3. --- updated-dependencies: - dependency-name: com.mycila:license-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 9f74dbf..349bfc7 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -89,7 +89,7 @@ com.mycila license-maven-plugin - 4.2 + 4.3 ${project.organization.url} From a99358b3875960a6abb8fd2565e2aceae09b9970 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 29 Sep 2023 11:44:48 +0200 Subject: [PATCH 12/15] MOVE IT --- .../pom.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {standard-maven-template => openapi-client-maven-template}/pom.xml (100%) diff --git a/standard-maven-template/pom.xml b/openapi-client-maven-template/pom.xml similarity index 100% rename from standard-maven-template/pom.xml rename to openapi-client-maven-template/pom.xml From 8980688df58baa1717d5326f56e58d9a28a0546e Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 2 Oct 2023 12:46:22 +0200 Subject: [PATCH 13/15] Update update-from-template.yml --- .github/workflows/update-from-template.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index ab0b49e..2b41fdd 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -81,12 +81,14 @@ jobs: echo "abort=0" >> $GITHUB_OUTPUT - name: pull-request - uses: repo-sync/pull-request@v2 if: steps.main.outputs.abort == 0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - source_branch: ${{ env.UPDATE_BRANCH }} - destination_branch: ${{ steps.main.outputs.current_branch }} - pr_title: "Update from template" - pr_body: "An automated PR to sync changes from the template into this repo" - + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh_pr_up() { + gh pr create "$@" || gh pr edit "$@" + } + gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \ + -H "${{ env.UPDATE_BRANCH }}" \ + --title "Update from template" \ + --body "An automated PR to sync changes from the template into this repo" From cfc09139877497ff163fd490910467131c614a1b Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 2 Oct 2023 12:55:20 +0200 Subject: [PATCH 14/15] Replace outdated repo-sync/pull-request --- .github/workflows/release.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53d1c12..b2ae4d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -223,9 +223,12 @@ jobs: git push origin - name: pull-request - uses: repo-sync/pull-request@v2 - with: - destination_branch: "develop" - pr_title: "Sync back" - pr_body: "An automated PR to sync changes back" - + env: + GH_TOKEN: ${{ github.token }} + run: | + gh_pr_up() { + gh pr create "$@" || gh pr edit "$@" + } + gh_pr_up -B "develop" \ + --title "Sync back" \ + --body "An automated PR to sync changes back" From 8a4f84521d208cefb47e2633b5e5793f4a3f4e17 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 11 Oct 2023 14:24:54 +0200 Subject: [PATCH 15/15] Fixes #12 --- CHANGELOG.md | 6 +++++- sched-java-client/pom.xml | 2 +- .../java/software/xdev/sched/client/ApiClient.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edf7d87..41e21b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ +# 1.0.2 +* Throw ``APIException`` instead ``ClassCastException`` when error is encountered #12 +* Updated dependencies + # 1.0.1 -* Updated openapi generator +* Updated OpenApi generator # 1.0.0 diff --git a/sched-java-client/pom.xml b/sched-java-client/pom.xml index 0d61e4d..4f90746 100644 --- a/sched-java-client/pom.xml +++ b/sched-java-client/pom.xml @@ -401,7 +401,7 @@ ApiClient.java "text\/plain"\.equalsIgnoreCase\(mimeType\) - "text/plain".equalsIgnoreCase(mimeType) || "text/html".equalsIgnoreCase(mimeType) + diff --git a/sched-java-client/src/generated/java/software/xdev/sched/client/ApiClient.java b/sched-java-client/src/generated/java/software/xdev/sched/client/ApiClient.java index b08a3d8..87fecd5 100644 --- a/sched-java-client/src/generated/java/software/xdev/sched/client/ApiClient.java +++ b/sched-java-client/src/generated/java/software/xdev/sched/client/ApiClient.java @@ -753,7 +753,7 @@ public T deserialize(CloseableHttpResponse response, TypeReference valueT } return objectMapper.readValue(content, valueType); - } else if ("text/plain".equalsIgnoreCase(mimeType) || "text/html".equalsIgnoreCase(mimeType)) { + } else if (valueRawType.equals(String.class) && ("text/plain".equalsIgnoreCase(mimeType) || "text/html".equalsIgnoreCase(mimeType))) { // convert input stream to string java.util.Scanner s = new java.util.Scanner(entity.getContent()).useDelimiter("\\A"); return (T) (s.hasNext() ? s.next() : "");