Merge remote-tracking branch 'origin/5.3.x' into 6.0.x

2021-07-12 17:11:35 +08:00
parent 702e274659 39fbf53150
commit 35f933b27f
3874 changed files with 120282 additions and 21640 deletions
--- a/samples/client/petstore/java/native/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/native/.openapi-generator/VERSION
@@ -1 +1,5 @@
-6.0.0-SNAPSHOT
+<<<<<<< HEAD
+6.0.0-SNAPSHOT
+=======
+5.3.0-SNAPSHOT
+>>>>>>> origin/5.3.x
--- a/samples/client/petstore/java/native/build.gradle
+++ b/samples/client/petstore/java/native/build.gradle
@@ -22,6 +22,17 @@ apply plugin: 'maven'
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11

+// Some text from the schema is copy pasted into the source files as UTF-8
+// but the default still seems to be to use platform encoding
+tasks.withType(JavaCompile) {
+    configure(options) {
+        options.encoding = 'UTF-8'
+    }
+}
+javadoc {
+    options.encoding = 'UTF-8'
+}
+
 install {
    repositories.mavenInstaller {
        pom.artifactId = 'petstore-native'
@@ -53,7 +64,6 @@ ext {
    swagger_annotations_version = "1.5.22"
    jackson_version = "2.10.4"
    junit_version = "4.13.1"
-    ws_rs_version = "2.1.1"
 }

 dependencies {
@@ -65,6 +75,5 @@ dependencies {
    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
    implementation "org.openapitools:jackson-databind-nullable:0.2.1"
    implementation 'javax.annotation:javax.annotation-api:1.3.2'
-    implementation "javax.ws.rs:javax.ws.rs-api:$ws_rs_version"
    testImplementation "junit:junit:$junit_version"
 }
--- a/samples/client/petstore/java/native/pom.xml
+++ b/samples/client/petstore/java/native/pom.xml
@@ -200,13 +200,6 @@
            <scope>provided</scope>
        </dependency>

-        <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>${javax-ws-rs-api-version}</version>
-        </dependency>
-
        <!-- test dependencies -->
        <dependency>
            <groupId>junit</groupId>
@@ -224,7 +217,6 @@
        <jackson-version>2.10.4</jackson-version>
        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
        <javax-annotation-version>1.3.2</javax-annotation-version>
-        <javax-ws-rs-api-version>2.1.1</javax-ws-rs-api-version>
        <junit-version>4.13.1</junit-version>
    </properties>
 </project>
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/JSON.java
@@ -11,11 +11,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.ext.ContextResolver;

@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class JSON implements ContextResolver<ObjectMapper> {
+public class JSON {
  private ObjectMapper mapper;

  public JSON() {
@@ -41,11 +39,6 @@ public class JSON implements ContextResolver<ObjectMapper> {
    mapper.setDateFormat(dateFormat);
  }

-  @Override
-  public ObjectMapper getContext(Class<?> type) {
-    return mapper;
-  }
-
  /**
   * Get the object mapper
   *
@@ -178,10 +171,10 @@ public class JSON implements ContextResolver<ObjectMapper> {
    visitedClasses.add(modelClass);

    // Traverse the oneOf/anyOf composed schemas.
-    Map<String, GenericType> descendants = modelDescendants.get(modelClass);
+    Map<String, Class<?>> descendants = modelDescendants.get(modelClass);
    if (descendants != null) {
-      for (GenericType childType : descendants.values()) {
-        if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
+      for (Class<?> childType : descendants.values()) {
+        if (isInstanceOf(childType, inst, visitedClasses)) {
          return true;
        }
      }
@@ -192,12 +185,12 @@ public class JSON implements ContextResolver<ObjectMapper> {
  /**
   * A map of discriminators for all model classes.
   */
-  private static Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<Class<?>, ClassDiscriminatorMapping>();
+  private static Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<>();

  /**
   * A map of oneOf/anyOf descendants for each model class.
   */
-  private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<Class<?>, Map<String, GenericType>>();
+  private static Map<Class<?>, Map<String, Class<?>>> modelDescendants = new HashMap<>();

  /**
    * Register a model class discriminator.
@@ -217,7 +210,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
    * @param modelClass the model class
    * @param descendants a map of oneOf/anyOf descendants.
    */
-  public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
+  public static void registerDescendants(Class<?> modelClass, Map<String, Class<?>> descendants) {
    modelDescendants.put(modelClass, descendants);
  }

--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -58,12 +58,17 @@ public class AnotherFakeApi {
    memberVarResponseInterceptor = apiClient.getResponseInterceptor();
  }

-  protected ApiException createApiException(HttpResponse<InputStream> response, String msgPrefix) throws IOException {
+  protected ApiException getApiException(String operationId, HttpResponse<InputStream> response) throws IOException {
    String body = response.body() == null ? null : new String(response.body().readAllBytes());
-    if (body != null) {
-      msgPrefix += ": " + body;
+    String message = formatExceptionMessage(operationId, response.statusCode(), body);
+    return new ApiException(response.statusCode(), message, response.headers(), body);
+  }
+
+  private String formatExceptionMessage(String operationId, int statusCode, String body) {
+    if (body == null || body.isEmpty()) {
+      body = "[no body]";
    }
-    return new ApiException(response.statusCode(), msgPrefix, response.headers(), body);
+    return operationId + " call failed with: " + statusCode + " - " + body;
  }

  /**
@@ -95,7 +100,7 @@ public class AnotherFakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "call123testSpecialTags call received non-success response");
+        throw getApiException("call123testSpecialTags", localVarResponse);
      }
      return new ApiResponse<Client>(
          localVarResponse.statusCode(),
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -66,12 +66,17 @@ public class FakeApi {
    memberVarResponseInterceptor = apiClient.getResponseInterceptor();
  }

-  protected ApiException createApiException(HttpResponse<InputStream> response, String msgPrefix) throws IOException {
+  protected ApiException getApiException(String operationId, HttpResponse<InputStream> response) throws IOException {
    String body = response.body() == null ? null : new String(response.body().readAllBytes());
-    if (body != null) {
-      msgPrefix += ": " + body;
+    String message = formatExceptionMessage(operationId, response.statusCode(), body);
+    return new ApiException(response.statusCode(), message, response.headers(), body);
+  }
+
+  private String formatExceptionMessage(String operationId, int statusCode, String body) {
+    if (body == null || body.isEmpty()) {
+      body = "[no body]";
    }
-    return new ApiException(response.statusCode(), msgPrefix, response.headers(), body);
+    return operationId + " call failed with: " + statusCode + " - " + body;
  }

  /**
@@ -101,7 +106,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "createXmlItem call received non-success response");
+        throw getApiException("createXmlItem", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -175,7 +180,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "fakeOuterBooleanSerialize call received non-success response");
+        throw getApiException("fakeOuterBooleanSerialize", localVarResponse);
      }
      return new ApiResponse<Boolean>(
          localVarResponse.statusCode(),
@@ -245,7 +250,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "fakeOuterCompositeSerialize call received non-success response");
+        throw getApiException("fakeOuterCompositeSerialize", localVarResponse);
      }
      return new ApiResponse<OuterComposite>(
          localVarResponse.statusCode(),
@@ -315,7 +320,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "fakeOuterNumberSerialize call received non-success response");
+        throw getApiException("fakeOuterNumberSerialize", localVarResponse);
      }
      return new ApiResponse<BigDecimal>(
          localVarResponse.statusCode(),
@@ -385,7 +390,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "fakeOuterStringSerialize call received non-success response");
+        throw getApiException("fakeOuterStringSerialize", localVarResponse);
      }
      return new ApiResponse<String>(
          localVarResponse.statusCode(),
@@ -453,7 +458,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "testBodyWithFileSchema call received non-success response");
+        throw getApiException("testBodyWithFileSchema", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -527,7 +532,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "testBodyWithQueryParams call received non-success response");
+        throw getApiException("testBodyWithQueryParams", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -614,7 +619,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "testClientModel call received non-success response");
+        throw getApiException("testClientModel", localVarResponse);
      }
      return new ApiResponse<Client>(
          localVarResponse.statusCode(),
@@ -712,7 +717,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "testEndpointParameters call received non-success response");
+        throw getApiException("testEndpointParameters", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -804,7 +809,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "testEnumParameters call received non-success response");
+        throw getApiException("testEnumParameters", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -927,7 +932,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "testGroupParameters call received non-success response");
+        throw getApiException("testGroupParameters", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -1096,7 +1101,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "testInlineAdditionalProperties call received non-success response");
+        throw getApiException("testInlineAdditionalProperties", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -1170,7 +1175,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "testJsonFormData call received non-success response");
+        throw getApiException("testJsonFormData", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -1248,7 +1253,7 @@ public class FakeApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "testQueryParameterCollectionFormat call received non-success response");
+        throw getApiException("testQueryParameterCollectionFormat", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -58,12 +58,17 @@ public class FakeClassnameTags123Api {
    memberVarResponseInterceptor = apiClient.getResponseInterceptor();
  }

-  protected ApiException createApiException(HttpResponse<InputStream> response, String msgPrefix) throws IOException {
+  protected ApiException getApiException(String operationId, HttpResponse<InputStream> response) throws IOException {
    String body = response.body() == null ? null : new String(response.body().readAllBytes());
-    if (body != null) {
-      msgPrefix += ": " + body;
+    String message = formatExceptionMessage(operationId, response.statusCode(), body);
+    return new ApiException(response.statusCode(), message, response.headers(), body);
+  }
+
+  private String formatExceptionMessage(String operationId, int statusCode, String body) {
+    if (body == null || body.isEmpty()) {
+      body = "[no body]";
    }
-    return new ApiException(response.statusCode(), msgPrefix, response.headers(), body);
+    return operationId + " call failed with: " + statusCode + " - " + body;
  }

  /**
@@ -95,7 +100,7 @@ public class FakeClassnameTags123Api {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "testClassname call received non-success response");
+        throw getApiException("testClassname", localVarResponse);
      }
      return new ApiResponse<Client>(
          localVarResponse.statusCode(),
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
@@ -61,12 +61,17 @@ public class PetApi {
    memberVarResponseInterceptor = apiClient.getResponseInterceptor();
  }

-  protected ApiException createApiException(HttpResponse<InputStream> response, String msgPrefix) throws IOException {
+  protected ApiException getApiException(String operationId, HttpResponse<InputStream> response) throws IOException {
    String body = response.body() == null ? null : new String(response.body().readAllBytes());
-    if (body != null) {
-      msgPrefix += ": " + body;
+    String message = formatExceptionMessage(operationId, response.statusCode(), body);
+    return new ApiException(response.statusCode(), message, response.headers(), body);
+  }
+
+  private String formatExceptionMessage(String operationId, int statusCode, String body) {
+    if (body == null || body.isEmpty()) {
+      body = "[no body]";
    }
-    return new ApiException(response.statusCode(), msgPrefix, response.headers(), body);
+    return operationId + " call failed with: " + statusCode + " - " + body;
  }

  /**
@@ -96,7 +101,7 @@ public class PetApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "addPet call received non-success response");
+        throw getApiException("addPet", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -170,7 +175,7 @@ public class PetApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "deletePet call received non-success response");
+        throw getApiException("deletePet", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -242,7 +247,7 @@ public class PetApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "findPetsByStatus call received non-success response");
+        throw getApiException("findPetsByStatus", localVarResponse);
      }
      return new ApiResponse<List<Pet>>(
          localVarResponse.statusCode(),
@@ -323,7 +328,7 @@ public class PetApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "findPetsByTags call received non-success response");
+        throw getApiException("findPetsByTags", localVarResponse);
      }
      return new ApiResponse<Set<Pet>>(
          localVarResponse.statusCode(),
@@ -400,7 +405,7 @@ public class PetApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "getPetById call received non-success response");
+        throw getApiException("getPetById", localVarResponse);
      }
      return new ApiResponse<Pet>(
          localVarResponse.statusCode(),
@@ -467,7 +472,7 @@ public class PetApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "updatePet call received non-success response");
+        throw getApiException("updatePet", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -543,7 +548,7 @@ public class PetApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "updatePetWithForm call received non-success response");
+        throw getApiException("updatePetWithForm", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -616,7 +621,7 @@ public class PetApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "uploadFile call received non-success response");
+        throw getApiException("uploadFile", localVarResponse);
      }
      return new ApiResponse<ModelApiResponse>(
          localVarResponse.statusCode(),
@@ -689,7 +694,7 @@ public class PetApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "uploadFileWithRequiredFile call received non-success response");
+        throw getApiException("uploadFileWithRequiredFile", localVarResponse);
      }
      return new ApiResponse<ModelApiResponse>(
          localVarResponse.statusCode(),
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -58,12 +58,17 @@ public class StoreApi {
    memberVarResponseInterceptor = apiClient.getResponseInterceptor();
  }

-  protected ApiException createApiException(HttpResponse<InputStream> response, String msgPrefix) throws IOException {
+  protected ApiException getApiException(String operationId, HttpResponse<InputStream> response) throws IOException {
    String body = response.body() == null ? null : new String(response.body().readAllBytes());
-    if (body != null) {
-      msgPrefix += ": " + body;
+    String message = formatExceptionMessage(operationId, response.statusCode(), body);
+    return new ApiException(response.statusCode(), message, response.headers(), body);
+  }
+
+  private String formatExceptionMessage(String operationId, int statusCode, String body) {
+    if (body == null || body.isEmpty()) {
+      body = "[no body]";
    }
-    return new ApiException(response.statusCode(), msgPrefix, response.headers(), body);
+    return operationId + " call failed with: " + statusCode + " - " + body;
  }

  /**
@@ -93,7 +98,7 @@ public class StoreApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "deleteOrder call received non-success response");
+        throw getApiException("deleteOrder", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -160,7 +165,7 @@ public class StoreApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "getInventory call received non-success response");
+        throw getApiException("getInventory", localVarResponse);
      }
      return new ApiResponse<Map<String, Integer>>(
          localVarResponse.statusCode(),
@@ -224,7 +229,7 @@ public class StoreApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "getOrderById call received non-success response");
+        throw getApiException("getOrderById", localVarResponse);
      }
      return new ApiResponse<Order>(
          localVarResponse.statusCode(),
@@ -293,7 +298,7 @@ public class StoreApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "placeOrder call received non-success response");
+        throw getApiException("placeOrder", localVarResponse);
      }
      return new ApiResponse<Order>(
          localVarResponse.statusCode(),
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
@@ -58,12 +58,17 @@ public class UserApi {
    memberVarResponseInterceptor = apiClient.getResponseInterceptor();
  }

-  protected ApiException createApiException(HttpResponse<InputStream> response, String msgPrefix) throws IOException {
+  protected ApiException getApiException(String operationId, HttpResponse<InputStream> response) throws IOException {
    String body = response.body() == null ? null : new String(response.body().readAllBytes());
-    if (body != null) {
-      msgPrefix += ": " + body;
+    String message = formatExceptionMessage(operationId, response.statusCode(), body);
+    return new ApiException(response.statusCode(), message, response.headers(), body);
+  }
+
+  private String formatExceptionMessage(String operationId, int statusCode, String body) {
+    if (body == null || body.isEmpty()) {
+      body = "[no body]";
    }
-    return new ApiException(response.statusCode(), msgPrefix, response.headers(), body);
+    return operationId + " call failed with: " + statusCode + " - " + body;
  }

  /**
@@ -93,7 +98,7 @@ public class UserApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "createUser call received non-success response");
+        throw getApiException("createUser", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -165,7 +170,7 @@ public class UserApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "createUsersWithArrayInput call received non-success response");
+        throw getApiException("createUsersWithArrayInput", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -237,7 +242,7 @@ public class UserApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "createUsersWithListInput call received non-success response");
+        throw getApiException("createUsersWithListInput", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -309,7 +314,7 @@ public class UserApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "deleteUser call received non-success response");
+        throw getApiException("deleteUser", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -378,7 +383,7 @@ public class UserApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "getUserByName call received non-success response");
+        throw getApiException("getUserByName", localVarResponse);
      }
      return new ApiResponse<User>(
          localVarResponse.statusCode(),
@@ -449,7 +454,7 @@ public class UserApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "loginUser call received non-success response");
+        throw getApiException("loginUser", localVarResponse);
      }
      return new ApiResponse<String>(
          localVarResponse.statusCode(),
@@ -527,7 +532,7 @@ public class UserApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "logoutUser call received non-success response");
+        throw getApiException("logoutUser", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
@@ -591,7 +596,7 @@ public class UserApi {
        memberVarResponseInterceptor.accept(localVarResponse);
      }
      if (localVarResponse.statusCode()/ 100 != 2) {
-        throw createApiException(localVarResponse, "updateUser call received non-success response");
+        throw getApiException("updateUser", localVarResponse);
      }
      return new ApiResponse<Void>(
          localVarResponse.statusCode(),
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
@@ -17,7 +17,6 @@ import org.openapitools.client.ApiException;
 import java.util.Objects;
 import java.lang.reflect.Type;
 import java.util.Map;
-import javax.ws.rs.core.GenericType;

 import com.fasterxml.jackson.annotation.JsonValue;

@@ -46,7 +45,7 @@ public abstract class AbstractOpenApiSchema {
     *
     * @return an instance of the actual schema/object
     */
-    public abstract Map<String, GenericType> getSchemas();
+    public abstract Map<String, Class<?>> getSchemas();

    /**
     * Get the actual instance