openapi-generator-maven-plugin update

matteobaccan · Oct 7, 2024 · 37566ca · 37566ca
1 parent 39ec26d
commit 37566ca
Show file tree

Hide file tree

Showing 22 changed files with 83 additions and 46 deletions.
diff --git a/cheshire-cat-java-client-generator/pom.xml b/cheshire-cat-java-client-generator/pom.xml
@@ -17,7 +17,7 @@
  <plugin>
  <groupId>org.openapitools</groupId>
  <artifactId>openapi-generator-maven-plugin</artifactId>
- <version>7.7.0</version>
+ <version>7.8.0</version>
  <executions>
  <execution>
  <goals>

diff --git a/cheshire-cat-java-client/.openapi-generator/VERSION b/cheshire-cat-java-client/.openapi-generator/VERSION
@@ -1 +1 @@
-7.7.0
+7.8.0
diff --git a/cheshire-cat-java-client/README.md b/cheshire-cat-java-client/README.md
@@ -2,7 +2,7 @@
 
 😸 Cheshire-Cat API
 - API version: 1.6.1
- - Generator version: 7.7.0
+ - Generator version: 7.8.0
 
 Production ready AI assistant framework
 

diff --git a/cheshire-cat-java-client/build.gradle b/cheshire-cat-java-client/build.gradle
@@ -112,14 +112,13 @@ dependencies {
  implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
  implementation 'com.google.code.gson:gson:2.9.1'
  implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
  implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
  implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
  implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
  testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
 }
 
 javadoc {

diff --git a/cheshire-cat-java-client/build.sbt b/cheshire-cat-java-client/build.sbt
@@ -14,14 +14,13 @@ lazy val root = (project in file(".")).
  "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
  "com.google.code.gson" % "gson" % "2.9.1",
  "org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
  "org.openapitools" % "jackson-databind-nullable" % "0.2.6",
  "io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
  "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
  "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
  "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
  "com.novocode" % "junit-interface" % "0.10" % "test",
  "org.mockito" % "mockito-core" % "3.12.4" % "test"
  )

diff --git a/cheshire-cat-java-client/pom.xml b/cheshire-cat-java-client/pom.xml
@@ -301,14 +301,9 @@
  <version>${jackson-databind-nullable-version}</version>
  </dependency>
  <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>${jsr311-api-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>${javax.ws.rs-api-version}</version>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>${jakarta.ws.rs-api-version}</version>
  </dependency>
  <!-- test dependencies -->
  <dependency>
@@ -329,14 +324,14 @@
  <maven.compiler.source>${java.version}</maven.compiler.source>
  <maven.compiler.target>${java.version}</maven.compiler.target>
  <gson-fire-version>1.9.0</gson-fire-version>
- <okhttp-version>4.11.0</okhttp-version>
+ <okhttp-version>4.12.0</okhttp-version>
  <gson-version>2.10.1</gson-version>
  <commons-lang3-version>3.14.0</commons-lang3-version>
  <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
  <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
- <junit-version>5.10.2</junit-version>
+ <junit-version>5.10.3</junit-version>
  <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
- <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
+ <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>
  <jsr311-api-version>1.1.1</jsr311-api-version>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <spotless.version>2.43.0</spotless.version>

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/ApiClient.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/ApiClient.java
@@ -733,6 +733,30 @@ public List<Pair> parameterToPairs(String collectionFormat, String name, Collect
  return params;
  }
 
+ /**
+ * Formats the specified free-form query parameters to a list of {@code Pair} objects.
+ *
+ * @param value The free-form query parameters.
+ * @return A list of {@code Pair} objects.
+ */
+ public List<Pair> freeFormParameterToPairs(Object value) {
+ List<Pair> params = new ArrayList<>();
+
+ // preconditions
+ if (value == null || !(value instanceof Map )) {
+ return params;
+ }
+
+ final Map<String, Object> valuesMap = (Map<String, Object>) value;
+
+ for (Map.Entry<String, Object> entry : valuesMap.entrySet()) {
+ params.add(new Pair(entry.getKey(), parameterToString(entry.getValue())));
+ }
+
+ return params;
+ }
+
+
  /**
  * Formats the specified collection path parameter to a string value.
  *
@@ -1171,10 +1195,6 @@ public Call buildCall(String baseUrl, String path, String method, List<Pair> que
  * @throws it.baccan.cheshirecat.ApiException If fail to serialize the request body object
  */
  public Request buildRequest(String baseUrl, String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String[] authNames, ApiCallback callback) throws ApiException {
- // aggregate queryParams (non-collection) and collectionQueryParams into allQueryParams
- List<Pair> allQueryParams = new ArrayList<Pair>(queryParams);
- allQueryParams.addAll(collectionQueryParams);
-
  final String url = buildUrl(baseUrl, path, queryParams, collectionQueryParams);
 
  // prepare HTTP request body
@@ -1202,10 +1222,12 @@ public Request buildRequest(String baseUrl, String path, String method, List<Pai
  reqBody = serialize(body, contentType);
  }
 
+ List<Pair> updatedQueryParams = new ArrayList<>(queryParams);
+
  // update parameters with authentication settings
- updateParamsForAuth(authNames, allQueryParams, headerParams, cookieParams, requestBodyToString(reqBody), method, URI.create(url));
+ updateParamsForAuth(authNames, updatedQueryParams, headerParams, cookieParams, requestBodyToString(reqBody), method, URI.create(url));
 
- final Request.Builder reqBuilder = new Request.Builder().url(url);
+ final Request.Builder reqBuilder = new Request.Builder().url(buildUrl(baseUrl, path, updatedQueryParams, collectionQueryParams));
  processHeaderParams(headerParams, reqBuilder);
  processCookieParams(cookieParams, reqBuilder);
 

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/ApiException.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/ApiException.java
@@ -21,7 +21,7 @@
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class ApiException extends Exception {
  private static final long serialVersionUID = 1L;
 

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/Configuration.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/Configuration.java
@@ -13,7 +13,7 @@
 
 package it.baccan.cheshirecat;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class Configuration {
  public static final String VERSION = "1.6.1";
 

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/Pair.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/Pair.java
@@ -13,7 +13,7 @@
 
 package it.baccan.cheshirecat;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class Pair {
  private String name = "";
  private String value = "";

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/ServerConfiguration.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/ServerConfiguration.java
@@ -1,11 +1,24 @@
+/*
+ * 😸 Cheshire-Cat API
+ * Production ready AI assistant framework
+ *
+ * The version of the OpenAPI document: 1.6.1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
 package it.baccan.cheshirecat;
 
 import java.util.Map;
 
 /**
  * Representing a Server configuration.
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class ServerConfiguration {
  public String URL;
  public String description;

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/ServerVariable.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/ServerVariable.java
@@ -1,11 +1,24 @@
+/*
+ * 😸 Cheshire-Cat API
+ * Production ready AI assistant framework
+ *
+ * The version of the OpenAPI document: 1.6.1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
 package it.baccan.cheshirecat;
 
 import java.util.HashSet;
 
 /**
  * Representing a Server Variable for server URL template substitution.
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class ServerVariable {
  public String description;
  public String defaultValue;

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/StringUtil.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class StringUtil {
  /**
  * Check if the given array contains the given value (with case-insensitive comparison).

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/auth/ApiKeyAuth.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/auth/ApiKeyAuth.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class ApiKeyAuth implements Authentication {
  private final String location;
  private final String paramName;

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/auth/HttpBearerAuth.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/auth/HttpBearerAuth.java
@@ -22,7 +22,7 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class HttpBearerAuth implements Authentication {
  private final String scheme;
  private Supplier<String> tokenSupplier;

diff --git a/...hire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/AbstractOpenApiSchema.java b/...hire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/AbstractOpenApiSchema.java
@@ -21,7 +21,7 @@
 /**
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public abstract class AbstractOpenApiSchema {
 
  // store the actual instance of the schema/object

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/BodyUploadUrl.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/BodyUploadUrl.java
@@ -38,7 +38,6 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
-import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -50,7 +49,7 @@
 /**
  * BodyUploadUrl
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class BodyUploadUrl {
  public static final String SERIALIZED_NAME_URL = "url";
  @SerializedName(SERIALIZED_NAME_URL)

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/HTTPValidationError.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/HTTPValidationError.java
@@ -40,7 +40,6 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
-import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -52,7 +51,7 @@
 /**
  * HTTPValidationError
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class HTTPValidationError {
  public static final String SERIALIZED_NAME_DETAIL = "detail";
  @SerializedName(SERIALIZED_NAME_DETAIL)

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/SettingBody.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/SettingBody.java
@@ -39,7 +39,6 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
-import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -51,7 +50,7 @@
 /**
  * SettingBody
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class SettingBody {
  public static final String SERIALIZED_NAME_NAME = "name";
  @SerializedName(SERIALIZED_NAME_NAME)

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/ValidationError.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/ValidationError.java
@@ -40,7 +40,6 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
-import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -52,7 +51,7 @@
 /**
  * ValidationError
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class ValidationError {
  public static final String SERIALIZED_NAME_LOC = "loc";
  @SerializedName(SERIALIZED_NAME_LOC)

diff --git a/...re-cat-java-client/src/main/java/it/baccan/cheshirecat/model/ValidationErrorLocInner.java b/...re-cat-java-client/src/main/java/it/baccan/cheshirecat/model/ValidationErrorLocInner.java
@@ -50,7 +50,7 @@
 
 import it.baccan.cheshirecat.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class ValidationErrorLocInner extends AbstractOpenApiSchema {
  private static final Logger log = Logger.getLogger(ValidationErrorLocInner.class.getName());
 

diff --git a/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/Value.java b/cheshire-cat-java-client/src/main/java/it/baccan/cheshirecat/model/Value.java
@@ -51,7 +51,7 @@
 
 import it.baccan.cheshirecat.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
 public class Value extends AbstractOpenApiSchema {
  private static final Logger log = Logger.getLogger(Value.class.getName());