Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
36b29ae
Merge pull request #50 from xdev-software/master
AB-xdev Dec 4, 2023
960c978
Bump org.apache.httpcomponents.client5:httpclient5 from 5.2.3 to 5.3
dependabot[bot] Dec 7, 2023
4cd258e
Bump actions/upload-artifact from 3 to 4
dependabot[bot] Dec 15, 2023
80d321a
Bump com.fasterxml.jackson:jackson-bom from 2.16.0 to 2.16.1
dependabot[bot] Dec 25, 2023
5d2db85
Bump org.openapitools:openapi-generator-maven-plugin from 7.1.0 to 7.2.0
dependabot[bot] Dec 25, 2023
d200d7e
Bump org.apache.maven.plugins:maven-compiler-plugin
dependabot[bot] Dec 25, 2023
692ed05
Bump log4j2-version from 2.22.0 to 2.22.1
dependabot[bot] Dec 28, 2023
cccbc91
Merge pull request #14 from xdev-software/dependabot/github_actions/a…
AB-xdev Jan 11, 2024
4512bf8
Merge pull request #16 from xdev-software/dependabot/maven/org.apache…
AB-xdev Jan 11, 2024
a24fe7e
Fix name
AB-xdev Jan 11, 2024
768a06e
Merge branch 'update-from-template'
AB-xdev Jan 11, 2024
1d3fd04
Merge pull request #34 from xdev-software/dependabot/maven/log4j2-ver…
AB-xdev Jan 11, 2024
3b598c5
Merge pull request #28 from xdev-software/dependabot/maven/org.apache…
AB-xdev Jan 11, 2024
c893974
Merge pull request #31 from xdev-software/dependabot/maven/com.faster…
AB-xdev Jan 11, 2024
68851c3
Merge pull request #32 from xdev-software/dependabot/maven/org.openap…
AB-xdev Jan 11, 2024
73c1de0
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Jan 11, 2024
dc3eef5
Generator update to 7.2
AB-xdev Jan 11, 2024
7fae81c
Update CHANGELOG.md
AB-xdev Jan 11, 2024
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 @@ -56,7 +56,7 @@ jobs:
fi

- name: Upload demo files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: demo-files-java-${{ matrix.java }}
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}

- name: Upload licenses - Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dependencies-licenses
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 1.1.3
* Updated dependencies

# 1.1.2
* Removed unused dependency ``com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider``

Expand Down
4 changes: 2 additions & 2 deletions sessionize-java-client-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<mainClass>software.xdev.Application</mainClass>

<log4j2-version>2.22.0</log4j2-version>
<log4j2-version>2.22.1</log4j2-version>
</properties>

<dependencies>
Expand Down Expand Up @@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.12.1</version>
<configuration>
<release>${maven.compiler.release}</release>
<compilerArgs>
Expand Down
8 changes: 4 additions & 4 deletions sessionize-java-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.16.0</version>
<version>2.16.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -108,7 +108,7 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.2.3</version>
<version>5.3</version>
</dependency>

<!-- JSON processing: jackson -->
Expand Down Expand Up @@ -175,7 +175,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.12.1</version>
<configuration>
<release>${maven.compiler.release}</release>
<compilerArgs>
Expand Down Expand Up @@ -325,7 +325,7 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>7.1.0</version>
<version>7.2.0</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Date;
import java.util.function.Supplier;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand All @@ -66,6 +67,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
Expand Down Expand Up @@ -639,7 +641,7 @@ public HttpEntity serialize(Object obj, Map<String, Object> formParams, ContentT
String mimeType = contentType.getMimeType();
if (isJsonMime(mimeType)) {
try {
return new StringEntity(objectMapper.writeValueAsString(obj), contentType);
return new StringEntity(objectMapper.writeValueAsString(obj), contentType.withCharset(StandardCharsets.UTF_8));
} catch (JsonProcessingException e) {
throw new ApiException(e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@

import software.xdev.sessionize.client.Pair;

import java.util.Map;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Supplier;

@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class HttpBearerAuth implements Authentication {
private final String scheme;
private String bearerToken;
private Supplier<String> tokenSupplier;

public HttpBearerAuth(String scheme) {
this.scheme = scheme;
Expand All @@ -33,7 +35,7 @@ public HttpBearerAuth(String scheme) {
* @return The bearer token
*/
public String getBearerToken() {
return bearerToken;
return tokenSupplier.get();
}

/**
Expand All @@ -42,12 +44,22 @@ public String getBearerToken() {
* @param bearerToken The bearer token to send in the Authorization header
*/
public void setBearerToken(String bearerToken) {
this.bearerToken = bearerToken;
this.tokenSupplier = () -> bearerToken;
}

/**
* Sets the supplier of tokens, which together with the scheme, will be sent as the value of the Authorization header.
*
* @param tokenSupplier The supplier of bearer tokens to send in the Authorization header
*/
public void setBearerToken(Supplier<String> tokenSupplier) {
this.tokenSupplier = tokenSupplier;
}

@Override
public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams) {
if(bearerToken == null) {
String bearerToken = Optional.ofNullable(tokenSupplier).map(Supplier::get).orElse(null);
if (bearerToken == null) {
return;
}

Expand Down