feat(jersey3): add error entity deserialization support

- Add errorEntity field and getErrorEntity() method to ApiException
- Add deserializeErrorEntity() method to ApiClient for error deserialization
- Update API methods to pass errorTypes map for automatic error handling
- Add unit tests for errorEntity feature

Author: Chhida

samples/client/petstore/java/jersey3-oneOf/pom.xml

@@ -318,24 +318,6 @@
             <artifactId>jersey-apache-connector</artifactId>
             <version>${jersey-version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.tomitribe</groupId>
-            <artifactId>tomitribe-http-signatures</artifactId>
-            <version>${http-signature-version}</version>
-        </dependency>
-        <!-- Bean Validation API support -->
-        <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
-            <version>${beanvalidation-version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- For equals and hashCode using reflection -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3-version}</version>
-        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -354,8 +336,6 @@
         <jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
         <beanvalidation-version>3.0.2</beanvalidation-version>
-        <commons-lang3-version>3.12.0</commons-lang3-version>
-        <http-signature-version>1.8</http-signature-version>
         <junit-version>5.10.0</junit-version>
         <spotless.version>2.21.0</spotless.version>
     </properties>

samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/ApiClient.java

@@ -62,7 +62,6 @@
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Locale;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.time.OffsetDateTime;
@@ -975,7 +974,6 @@ public File prepareDownloadFile(Response response) throws IOException {
    * @param authNames The authentications to apply
    * @param returnType The return type into which to deserialize the response
    * @param isBodyNullable True if the body is nullable
-   * @param errorTypes Mapping of error codes to types into which to deserialize the response
    * @return The response body in type of string
    * @throws ApiException API exception
    */
@@ -992,9 +990,7 @@ public <T> ApiResponse<T> invokeAPI(
       String contentType,
       String[] authNames,
       GenericType<T> returnType,
-      boolean isBodyNullable,
-      Map<String, GenericType> errorTypes
-      )
+      boolean isBodyNullable)
       throws ApiException {
 
     String targetURL;
@@ -1005,7 +1001,7 @@ public <T> ApiResponse<T> invokeAPI(
       if (index < 0 || index >= serverConfigurations.size()) {
         throw new ArrayIndexOutOfBoundsException(
             String.format(
-                Locale.ROOT,
+                java.util.Locale.ROOT,
                 "Invalid index %d when selecting the host settings. Must be less than %d",
                 index, serverConfigurations.size()));
       }
@@ -1092,16 +1088,14 @@ public <T> ApiResponse<T> invokeAPI(
         String respBody = null;
         if (response.hasEntity()) {
           try {
-            // call bufferEntity, so that a subsequent call to `readEntity` in `deserialize` doesn't fail
-            response.bufferEntity();
             respBody = String.valueOf(response.readEntity(String.class));
             message = respBody;
           } catch (RuntimeException e) {
             // e.printStackTrace();
           }
         }
         throw new ApiException(
-            response.getStatus(), message, buildResponseHeaders(response), respBody, deserializeErrorEntity(errorTypes, response));
+            response.getStatus(), message, buildResponseHeaders(response), respBody);
       }
     } finally {
       try {
@@ -1112,30 +1106,6 @@ public <T> ApiResponse<T> invokeAPI(
       }
     }
   }
-  
-  /**
-   * Deserialize the response body into an error entity based on HTTP status code.
-   * Looks up the error type from the errorTypes map using the response status code,
-   * or falls back to the "default" error type if no match is found.
-   *
-   * @param errorTypes Map of status code strings to GenericType for deserialization
-   * @param response The HTTP response
-   * @return The deserialized error entity, or null if not found or deserialization fails
-   */
-  private Object deserializeErrorEntity(Map<String, GenericType> errorTypes, Response response) {
-    if (errorTypes == null) {
-      return null;
-    }
-    GenericType errorType = errorTypes.get(String.valueOf(response.getStatus()));
-    if (errorType == null) {
-        errorType = errorTypes.get("0"); // "0" is the "default" response
-    }
-    try {
-      return deserialize(response, errorType);
-    } catch (Exception e) {
-      return null;
-    }
-  }
 
   protected Response sendRequest(String method, Invocation.Builder invocationBuilder, Entity<?> entity) {
     Response response;
@@ -1162,7 +1132,7 @@ protected Response sendRequest(String method, Invocation.Builder invocationBuild
    */
   @Deprecated
   public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType, boolean isBodyNullable) throws ApiException {
-    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType, isBodyNullable, null/*TODO SME manage*/);
+    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType, isBodyNullable);
   }
 
   /**

samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/ApiException.java

@@ -26,7 +26,6 @@ public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
-    private Object errorEntity = null;
 
     public ApiException() {}
 
@@ -68,11 +67,6 @@ public ApiException(int code, String message, Map<String, List<String>> response
         this.responseBody = responseBody;
     }
 
-    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody, Object errorEntity) {
-        this(code, message, responseHeaders, responseBody);
-        this.errorEntity = errorEntity;
-    }
-
     /**
      * Get the HTTP status code.
      *
@@ -99,13 +93,4 @@ public Map<String, List<String>> getResponseHeaders() {
     public String getResponseBody() {
         return responseBody;
     }
-
-    /**
-     * Get the deserialized error entity (or null if this error doesn't have a model associated).
-     *
-     * @return Deserialized error entity
-     */
-    public Object getErrorEntity() {
-        return errorEntity;
-    }
 }

samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/api/DefaultApi.java

@@ -78,9 +78,8 @@ public void rootPost(@jakarta.annotation.Nullable PostRequest postRequest) throw
   public ApiResponse<Void> rootPostWithHttpInfo(@jakarta.annotation.Nullable PostRequest postRequest) throws ApiException {
     String localVarAccept = apiClient.selectHeaderAccept();
     String localVarContentType = apiClient.selectHeaderContentType("application/json");
-    final Map<String, GenericType> localVarErrorTypes = new HashMap<String, GenericType>();
     return apiClient.invokeAPI("DefaultApi.rootPost", "/", "POST", new ArrayList<>(), postRequest,
                                new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType,
-                               null, null, false, localVarErrorTypes);
+                               null, null, false);
   }
 }

samples/client/petstore/java/jersey3/README.md

@@ -1,4 +1,4 @@
-# openapi-java-client
+# petstore-jersey3
 
 OpenAPI Petstore
 
@@ -41,7 +41,7 @@ Add this dependency to your project's POM:
 ```xml
 <dependency>
   <groupId>org.openapitools</groupId>
-  <artifactId>openapi-java-client</artifactId>
+  <artifactId>petstore-jersey3</artifactId>
   <version>1.0.0</version>
   <scope>compile</scope>
 </dependency>
@@ -53,12 +53,12 @@ Add this dependency to your project's build file:
 
 ```groovy
   repositories {
-    mavenCentral()     // Needed if the 'openapi-java-client' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'openapi-java-client' jar has been published to the local maven repo.
+    mavenCentral()     // Needed if the 'petstore-jersey3' jar has been published to maven central.
+    mavenLocal()       // Needed if the 'petstore-jersey3' jar has been published to the local maven repo.
   }
 
   dependencies {
-     implementation "org.openapitools:openapi-java-client:1.0.0"
+     implementation "org.openapitools:petstore-jersey3:1.0.0"
   }
 ```
 
@@ -72,7 +72,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-- `target/openapi-java-client-1.0.0.jar`
+- `target/petstore-jersey3-1.0.0.jar`
 - `target/lib/*.jar`
 
 ## Getting Started

samples/client/petstore/java/jersey3/build.gradle

@@ -84,7 +84,7 @@ if(hasProperty('target') && target == 'android') {
     publishing {
         publications {
             maven(MavenPublication) {
-               artifactId = 'openapi-java-client'
+               artifactId = 'petstore-jersey3'
 
                from components.java
             }
@@ -104,10 +104,12 @@ ext {
     jackson_databind_version = "2.21.1"
     jackson_databind_nullable_version = "0.2.10"
     jakarta_annotation_version = "2.1.0"
+    bean_validation_version = "3.0.2"
     jersey_version = "3.0.4"
     junit_version = "5.8.2"
     scribejava_apis_version = "8.3.1"
     tomitribe_http_signatures_version = "1.7"
+    commons_lang3_version = "3.17.0"
 }
 
 dependencies {
@@ -126,6 +128,8 @@ dependencies {
     implementation "com.github.scribejava:scribejava-apis:$scribejava_apis_version"
     implementation "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
+    implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
+    implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
 }

samples/client/petstore/java/jersey3/build.sbt

@@ -1,7 +1,7 @@
 lazy val root = (project in file(".")).
   settings(
     organization := "org.openapitools",
-    name := "openapi-java-client",
+    name := "petstore-jersey3",
     version := "1.0.0",
     scalaVersion := "2.11.12",
     scalacOptions ++= Seq("-feature"),
@@ -24,6 +24,7 @@ lazy val root = (project in file(".")).
       "com.github.scribejava" % "scribejava-apis" % "8.3.1" % "compile",
       "org.tomitribe" % "tomitribe-http-signatures" % "1.7" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "2.1.0" % "compile",
+        "org.apache.commons" % "commons-lang3" % "3.17.0" % "compile",
       "org.junit.jupiter" % "junit-jupiter-api" % "5.8.2" % "test"
     )
   )

samples/client/petstore/java/jersey3/docs/ArrayTest.md

@@ -9,7 +9,7 @@
 |------------ | ------------- | ------------- | -------------|
 |**arrayOfString** | **List<String>** |  |  [optional] |
 |**arrayArrayOfInteger** | **List<List<Long>>** |  |  [optional] |
-|**arrayArrayOfModel** | **List<List<ReadOnlyFirst>>** |  |  [optional] |
+|**arrayArrayOfModel** | **List<List<@Valid ReadOnlyFirst>>** |  |  [optional] |
 
 
 

samples/client/petstore/java/jersey3/docs/FakeApi.md

@@ -427,7 +427,7 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        List<String> requestBody = Arrays.asList(); // List<String> | 
+        List<@Pattern(regexp = "[A-Z0-9]+")String> requestBody = Arrays.asList(); // List<@Pattern(regexp = "[A-Z0-9]+")String> | 
         try {
             apiInstance.postArrayOfString(requestBody);
         } catch (ApiException e) {

samples/client/petstore/java/jersey3/docs/UserApi.md

@@ -103,7 +103,7 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         UserApi apiInstance = new UserApi(defaultClient);
-        List<User> user = Arrays.asList(); // List<User> | List of user object
+        List<@Valid User> user = Arrays.asList(); // List<@Valid User> | List of user object
         try {
             apiInstance.createUsersWithArrayInput(user);
         } catch (ApiException e) {
@@ -167,7 +167,7 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         UserApi apiInstance = new UserApi(defaultClient);
-        List<User> user = Arrays.asList(); // List<User> | List of user object
+        List<@Valid User> user = Arrays.asList(); // List<@Valid User> | List of user object
         try {
             apiInstance.createUsersWithListInput(user);
         } catch (ApiException e) {