Merge pull request #59 from xdev-software/develop

Release 1.1.3

Author: AB-xdev

.github/workflows/checkBuild.yml

@@ -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

.github/workflows/release.yml

@@ -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

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.1.3
+* Updated dependencies
+
 # 1.1.2
 * Removed unused dependency ``com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider``
 

sessionize-java-client-demo/pom.xml

@@ -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>
@@ -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>

sessionize-java-client/pom.xml

@@ -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>
@@ -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 -->
@@ -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>
@@ -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>

sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiClient.java

@@ -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;
@@ -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;
@@ -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);
       }

sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/HttpBearerAuth.java

@@ -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;
@@ -33,7 +35,7 @@ public HttpBearerAuth(String scheme) {
    * @return The bearer token
    */
   public String getBearerToken() {
-    return bearerToken;
+    return tokenSupplier.get();
   }
 
   /**
@@ -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;
     }