Skip to content
This repository was archived by the owner on Feb 14, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9440fbd
Merge pull request #3 from xdev-software/master
AB-xdev Aug 8, 2023
9093b71
Add Editor shield
AB-xdev Aug 8, 2023
051c5c3
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Aug 8, 2023
99193da
Fix typo
AB-xdev Aug 8, 2023
b603842
Update README.md
AB-xdev Aug 8, 2023
6cf71f4
Bump org.openapitools:openapi-generator-maven-plugin from 6.6.0 to 7.0.0
dependabot[bot] Aug 28, 2023
4883a90
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 5, 2023
bca34c3
Merge pull request #3 from xdev-software/dependabot/github_actions/ac…
AB-xdev Sep 7, 2023
2decbe8
Merge pull request #5 from xdev-software/update-from-template
AB-xdev Sep 7, 2023
7c38b04
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 7, 2023
ff8b438
Merge pull request #4 from xdev-software/dependabot/github_actions/ac…
AB-xdev Sep 7, 2023
37cc0b7
Merge pull request #3 from xdev-software/update-from-template
AB-xdev Sep 7, 2023
5021b2f
Merge pull request #1 from xdev-software/dependabot/maven/org.openapi…
AB-xdev Sep 7, 2023
a388aea
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Sep 7, 2023
3e44882
Regenerate code after generator update
AB-xdev Sep 7, 2023
fb89eae
Update CHANGELOG.md
AB-xdev Sep 7, 2023
48f0a23
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.0
dependabot[bot] Sep 18, 2023
e7e16bb
Bump org.openapitools:openapi-generator-maven-plugin from 7.0.0 to 7.0.1
dependabot[bot] Sep 19, 2023
c2ca04b
Bump com.mycila:license-maven-plugin from 4.2 to 4.3
dependabot[bot] Sep 28, 2023
fca16a1
Merge pull request #7 from xdev-software/dependabot/maven/com.mycila-…
AB-xdev Sep 29, 2023
fa88646
Merge pull request #6 from xdev-software/dependabot/maven/org.apache.…
AB-xdev Sep 29, 2023
a99358b
MOVE IT
AB-xdev Sep 29, 2023
dc1bd00
Merge branch 'update-from-template'
AB-xdev Sep 29, 2023
2ab3fae
Merge pull request #5 from xdev-software/dependabot/maven/org.openapi…
AB-xdev Sep 29, 2023
8980688
Update update-from-template.yml
AB-xdev Oct 2, 2023
747b92f
Merge pull request #4 from xdev-software/replace-repo-sync-pull-request
AB-xdev Oct 2, 2023
3442223
Merge pull request #8 from xdev-software/update-from-template
AB-xdev Oct 2, 2023
cfc0913
Replace outdated repo-sync/pull-request
AB-xdev Oct 2, 2023
220d29f
Merge pull request #8 from xdev-software/update-from-template
AB-xdev Oct 2, 2023
745d181
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Oct 11, 2023
8a4f845
Fixes #12
AB-xdev Oct 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/checkBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 14 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand All @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/update-from-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 1.0.2
* Throw ``APIException`` instead ``ClassCastException`` when error is encountered #12
* Updated dependencies

# 1.0.1
* Updated OpenApi generator

# 1.0.0

* Initial release
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/sched-java-client?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/sched-java-client)
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/sched-java-client/checkBuild.yml?branch=develop)](https://github.com/xdev-software/sched-java-client/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_sched-java-client&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_sched-java-client)
[![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/sched-java-client/develop/openapi/openapi.yml)

# <img src="https://i0.wp.com/sched.com/wp-content/uploads/2021/11/cropped-favicon.png?fit=28,28&ssl=1" height="28" /> [sched](https://sched.com/)-java-client
Java client for the [Sched API](https://sched.com/api)
Expand All @@ -21,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
>
Expand All @@ -38,7 +39,7 @@ This client [is generated](./sched-java-client/pom.xml) from an [``openapi.yml``
* Modify ✔️
* Delete ✔️
* List ✔️
* Export
* Export ✔️
* Seats
* Count
* User
Expand Down
8 changes: 4 additions & 4 deletions sched-java-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.2</version>
<version>4.3</version>
<configuration>
<properties>
<email>${project.organization.url}</email>
Expand Down Expand Up @@ -188,7 +188,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -328,7 +328,7 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>6.6.0</version>
<version>7.0.1</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -401,7 +401,7 @@
<fileMask>ApiClient.java</fileMask>
<findRegex>"text\/plain"\.equalsIgnoreCase\(mimeType\)</findRegex>
<!-- @formatter:off DO NOT INTRODUCE LINE BREAK -->
<replaceValue>"text/plain".equalsIgnoreCase(mimeType) || "text/html".equalsIgnoreCase(mimeType)</replaceValue>
<replaceValue><![CDATA[valueRawType.equals(String.class) && ("text/plain".equalsIgnoreCase(mimeType) || "text/html".equalsIgnoreCase(mimeType))]]></replaceValue>
<!-- @formatter:on -->
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ public <T> T deserialize(CloseableHttpResponse response, TypeReference<T> 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() : "");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down