diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/generate-next.ts b/packages/type-safe-api/scripts/type-safe-api/generators/generate-next.ts
index 8dcd80bdb..924f0bfd7 100755
--- a/packages/type-safe-api/scripts/type-safe-api/generators/generate-next.ts
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/generate-next.ts
@@ -178,6 +178,41 @@ const toPythonName = (namedEntity: 'model' | 'property' | 'operation', name: str
   return nameSnakeCase;
 };
 
+// @see https://github.com/OpenAPITools/openapi-generator/blob/8f2676c5c2bcbcc41942307e5c8648cee38bcc44/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java#L179
+const JAVA_KEYWORDS = new Set([
+  // special words
+  "object", "list", "file",
+  // used as internal variables, can collide with parameter names
+  "localVarPath", "localVarQueryParams", "localVarCollectionQueryParams",
+  "localVarHeaderParams", "localVarCookieParams", "localVarFormParams", "localVarPostBody",
+  "localVarAccepts", "localVarAccept", "localVarContentTypes",
+  "localVarContentType", "localVarAuthNames", "localReturnType",
+  "ApiClient", "ApiException", "ApiResponse", "Configuration", "StringUtil",
+
+  // language reserved words
+  "_", "abstract", "continue", "for", "new", "switch", "assert",
+  "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
+  "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+  "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
+  "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+  "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
+  "native", "super", "while", "null", "offsetdatetime", "localdate", "localtime"
+]);
+
+const toJavaName = (name: string) => {
+  // Check if the name is a reserved word. Reserved words that overlap with TypeScript will already be escaped
+  // with a leading _ by parseOpenapi, so we remove this to test
+  const unescapedName = _camelCase(name.startsWith('_') ? name.slice(1) : name);
+  if (JAVA_KEYWORDS.has(unescapedName)) {
+    // Special case for "class"
+    if (unescapedName === "class") {
+      return "propertyClass";
+    }
+    return `_${unescapedName}`;
+  }
+  return unescapedName;
+};
+
 /**
  * Clean up any generated code that already exists
  */
@@ -321,25 +356,31 @@ const toTypeScriptType = (property: parseOpenapi.Model): string => {
     case "reference":
       return toTypescriptPrimitive(property);
     case "array":
-      return `Array<${property.link ? toTypeScriptType(property.link) : property.type}>`;
+      return `Array<${property.link && property.link.export !== "enum" ? toTypeScriptType(property.link) : property.type}>`;
     case "dictionary":
-      return `{ [key: string]: ${property.link ? toTypeScriptType(property.link) : property.type}; }`;
+      return `{ [key: string]: ${property.link && property.link.export !== "enum" ? toTypeScriptType(property.link) : property.type}; }`;
     default:
       return property.type;
   }
 };
 
 const toJavaPrimitive = (property: parseOpenapi.Model): string => {
-  if (property.type === "string" && ["date", "date-time"].includes(property.format ?? '')) {
-    return "Date";
-  } else if (property.type === "binary") {
+  if (property.type === "string" && property.format === "date") {
+    return "LocalDate";
+  } else if (property.type === "string" && property.format === "date-time") {
+    return "OffsetDateTime";
+  } else if (property.type === "string" && (property.format as any) === "uuid") {
+    return "UUID";
+  } else if (property.type === "string" && (property.format as any) === "uri") {
+    return "URI";
+  } else if (property.type === "binary" || (property.type === "string" && ["byte", "binary"].includes(property.format as any))) {
     return "byte[]";
   } else if (property.type === "number") {
     switch(property.format) {
       case "int32":
         return "Integer";
       case "int64":
-        return "BigInteger";
+        return "Long";
       case "float":
         return "Float";
       case "double":
@@ -356,6 +397,8 @@ const toJavaPrimitive = (property: parseOpenapi.Model): string => {
     return "Boolean";
   } else if (property.type === "string") {
     return "String";
+  } else if (property.type === "any") {
+    return "Object";
   }
   return property.type;
 };
@@ -366,10 +409,14 @@ const toJavaType = (property: parseOpenapi.Model): string => {
     case "reference":
       return toJavaPrimitive(property);
     case "array":
-      return `${property.uniqueItems ? 'Set' : 'List'}<${property.link ? toTypeScriptType(property.link) : property.type}>`;
+      return `${property.uniqueItems ? 'Set' : 'List'}<${property.link && property.link.export !== "enum" ? toJavaType(property.link) : property.type}>`;
     case "dictionary":
-      return `Map<String, ${property.link ? toTypeScriptType(property.link) : property.type}>`;
+      return `Map<String, ${property.link && property.link.export !== "enum" ? toJavaType(property.link) : property.type}>`;
     default:
+      // "any" has export = interface
+      if (PRIMITIVE_TYPES.has(property.type)) {
+        return toJavaPrimitive(property);
+      }
       return property.type;
   }
 };
@@ -411,9 +458,9 @@ const toPythonType = (property: parseOpenapi.Model): string => {
     case "reference":
       return toPythonPrimitive(property);
     case "array":
-      return `List[${property.link ? toPythonType(property.link) : property.type}]`;
+      return `List[${property.link && property.link.export !== "enum" ? toPythonType(property.link) : property.type}]`;
     case "dictionary":
-      return `Dict[str, ${property.link ? toPythonType(property.link) : property.type}]`;
+      return `Dict[str, ${property.link && property.link.export !== "enum" ? toPythonType(property.link) : property.type}]`;
     default:
       // "any" has export = interface
       if (PRIMITIVE_TYPES.has(property.type)) {
@@ -432,7 +479,7 @@ const mutateModelWithAdditionalTypes = (model: parseOpenapi.Model) => {
 
   (model as any).typescriptName = model.name;
   (model as any).typescriptType = toTypeScriptType(model);
-  (model as any).javaName = model.name;
+  (model as any).javaName = toJavaName(model.name);
   (model as any).javaType = toJavaType(model);
   (model as any).pythonName = toPythonName('property', model.name);
   (model as any).pythonType = toPythonType(model);
@@ -452,6 +499,7 @@ const mutateWithOpenapiSchemaProperties = (spec: OpenAPIV3.Document, model: pars
   (model as any).deprecated = !!schema.deprecated;
   (model as any).openapiType = schema.type;
   (model as any).isNotSchema = !!schema.not;
+  (model as any).isEnum = !!schema.enum && schema.enum.length > 0;
 
   // Copy any schema vendor extensions
   (model as any).vendorExtensions = {};
@@ -506,6 +554,8 @@ const mutateWithOpenapiSchemaProperties = (spec: OpenAPIV3.Document, model: pars
 const ensureModelLinks = (spec: OpenAPIV3.Document, data: parseOpenapi.ParsedSpecification) => {
   const modelsByName = Object.fromEntries(data.models.map((m) => [m.name, m]));
   const visited = new Set<parseOpenapi.Model>();
+
+  // Ensure set for all models
   data.models.forEach((model) => {
     const schema = resolveIfRef(spec, spec?.components?.schemas?.[model.name]);
     if (schema) {
@@ -516,6 +566,27 @@ const ensureModelLinks = (spec: OpenAPIV3.Document, data: parseOpenapi.ParsedSpe
       _ensureModelLinks(spec, modelsByName, model, schema, visited)
     }
   });
+
+  // Ensure set for all parameters
+  data.services.forEach((service) => {
+    service.operations.forEach((op) => {
+      const specOp = (spec as any)?.paths?.[op.path]?.[op.method.toLowerCase()] as OpenAPIV3.OperationObject | undefined;
+
+      const specParametersByName = Object.fromEntries((specOp?.parameters ?? []).map((p) => {
+        const param = resolveIfRef(spec, p);
+        return [param.name, param];
+      }));
+
+      op.parameters.forEach((parameter) => {
+        const specParameter = specParametersByName[parameter.prop];
+        const specParameterSchema = resolveIfRef(spec, specParameter?.schema);
+
+        if (specParameterSchema) {
+          _ensureModelLinks(spec, modelsByName, parameter, specParameterSchema, visited);
+        }
+      });
+    });
+  });
 };
 
 const _ensureModelLinks = (spec: OpenAPIV3.Document, modelsByName: {[name: string]: parseOpenapi.Model}, model: parseOpenapi.Model, schema: OpenAPIV3.SchemaObject, visited: Set<parseOpenapi.Model>) => {
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/apis/apis.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/apis/apis.ejs
new file mode 100644
index 000000000..0ddd2edf3
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/apis/apis.ejs
@@ -0,0 +1,343 @@
+<%_ services.forEach((service) => { _%>
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>/api",
+  "name": "<%- service.className %>",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>.api;
+
+import <%- metadata.packageName %>.ApiCallback;
+import <%- metadata.packageName %>.ApiClient;
+import <%- metadata.packageName %>.ApiException;
+import <%- metadata.packageName %>.ApiResponse;
+import <%- metadata.packageName %>.Configuration;
+import <%- metadata.packageName %>.Pair;
+import <%- metadata.packageName %>.ProgressRequestBody;
+import <%- metadata.packageName %>.ProgressResponseBody;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.io.IOException;
+
+
+import java.math.BigDecimal;
+import java.io.File;
+<%_ service.modelImports.forEach((modelImport) => { _%>
+import <%- metadata.packageName %>.model.<%- modelImport %>;
+<%_ }); _%>
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.GenericType;
+
+public class <%- service.className %> {
+    private ApiClient localVarApiClient;
+    private int localHostIndex;
+    private String localCustomBaseUrl;
+
+    public <%- service.className %>() {
+        this(Configuration.getDefaultApiClient());
+    }
+
+    public <%- service.className %>(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
+    }
+
+    public ApiClient getApiClient() {
+        return localVarApiClient;
+    }
+
+    public void setApiClient(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
+    }
+
+    public int getHostIndex() {
+        return localHostIndex;
+    }
+
+    public void setHostIndex(int hostIndex) {
+        this.localHostIndex = hostIndex;
+    }
+
+    public String getCustomBaseUrl() {
+        return localCustomBaseUrl;
+    }
+
+    public void setCustomBaseUrl(String customBaseUrl) {
+        this.localCustomBaseUrl = customBaseUrl;
+    }
+
+    <%_ service.operations.forEach((operation) => { _%>
+    <%_ const result = operation.results[0]; _%>
+    <%_ const requiredParameters = operation.parameters.filter(p => p.isRequired); _%>
+    <%_ const optionalParameters = operation.parameters.filter(p => !p.isRequired); _%>
+    <%_
+    // In API methods, the File type is used for binary types
+    const javaType = (parameter) => parameter.javaType === "byte[]" ? "File" : parameter.javaType;
+    _%>
+    private okhttp3.Call <%- operation.name %>Call(<% operation.parameters.forEach((parameter) => { _%><%- javaType(parameter) %> <%- parameter.javaName %>, <% }); %>final ApiCallback _callback) throws ApiException {
+        String basePath = null;
+        // Operation Servers
+        String[] localBasePaths = new String[] {  };
+
+        // Determine Base Path to Use
+        if (localCustomBaseUrl != null){
+            basePath = localCustomBaseUrl;
+        } else if ( localBasePaths.length > 0 ) {
+            basePath = localBasePaths[localHostIndex];
+        } else {
+            basePath = null;
+        }
+
+        Object localVarPostBody = <% if(operation.parametersBody) { %><%- operation.parametersBody.javaName %><% } else { %>null<% } %>;
+
+        // create path and map variables
+        String localVarPath = "<%- operation.path %>"<% operation.parameters.filter(p => p.in === "path").forEach((parameter) => { %>
+            .replace("{" + "<%- parameter.prop %>" + "}", localVarApiClient.escapeString(<% if (parameter.export === "array" && parameter.collectionFormat) { %>localVarApiClient.collectionPathParameterToString("<%- parameter.collectionFormat %>", <%- parameter.javaName %>)<% } else { %><%- parameter.javaName %>.toString()<% } %>))<% }); %>;
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        <%_ operation.parameters.filter(p => p.in === "query").forEach((parameter) => { _%>
+        if (<%- parameter.javaName %> != null) {
+            <% if (parameter.export === "array" && parameter.collectionFormat) { %>localVarCollectionQueryParams.addAll(localVarApiClient.parameterToPairs("<%- parameter.collectionFormat %>", <% } else { %>localVarQueryParams.addAll(localVarApiClient.parameterToPair(<% } %>"<%- parameter.prop %>", <%- parameter.javaName %>));
+        }
+
+        <%_ }); _%>
+        <%_ operation.parameters.filter(p => p.in === "header").forEach((parameter) => { _%>
+        if (<%- parameter.javaName %> != null) {
+            localVarHeaderParams.put("<%- parameter.prop %>", localVarApiClient.parameterToString(<%- parameter.javaName %>));
+        }
+
+        <%_ }); _%>
+        <%_ operation.parameters.filter(p => p.in === "cookie").forEach((parameter) => { _%>
+        if (<%- parameter.javaName %> != null) {
+            localVarCookieParams.put("<%- parameter.prop %>", localVarApiClient.parameterToString(<%- parameter.javaName %>));
+        }
+
+        <%_ }); _%>
+        final String[] localVarAccepts = {
+            <%_ ((result || {}).mediaTypes || []).forEach((mediaType, i) => { _%>
+            "<%- mediaType %>"<% if (i < result.mediaTypes.length - 1) { %>,<% } %>
+            <%_ }); _%>
+        };
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put("Accept", localVarAccept);
+        }
+
+        final String[] localVarContentTypes = {
+            <%_ ((operation.parametersBody || {}).mediaTypes || []).forEach((mediaType, i) => { _%>
+            "<%- mediaType %>"<% if (i < operation.parametersBody.mediaTypes.length - 1) { %>,<% } %>
+            <%_ }); _%>
+        };
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        if (localVarContentType != null) {
+            localVarHeaderParams.put("Content-Type", localVarContentType);
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return localVarApiClient.buildCall(basePath, localVarPath, "<%- operation.method %>", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
+    }
+
+    <% if (operation.isDeprecated) { %>@Deprecated<% } %>
+    @SuppressWarnings("rawtypes")
+    private okhttp3.Call <%- operation.name %>ValidateBeforeCall(<% operation.parameters.forEach((parameter) => { _%><%- javaType(parameter) %> <%- parameter.javaName %>, <% }); %>final ApiCallback _callback) throws ApiException {
+        <%_ requiredParameters.forEach((parameter) => { _%>
+        // verify the required parameter '<%- parameter.javaName %>' is set
+        if (<%- parameter.javaName %> == null) {
+            throw new ApiException("Missing the required parameter '<%- parameter.javaName %>' when calling <%- operation.name %>(Async)");
+        }
+
+        <%_ }); _%>
+        return <%- operation.name %>Call(<% operation.parameters.forEach((parameter) => { _%><%- parameter.javaName %>, <% }); %>_callback);
+
+    }
+
+    <%_ const returnType = result && result.type !== 'void' ? result.javaType : 'Void'; _%>
+    private ApiResponse<<%- returnType %>> <%- operation.name %>WithHttpInfo(<% operation.parameters.forEach((parameter, i) => { _%><%- javaType(parameter) %> <%- parameter.javaName %><% if (i < operation.parameters.length - 1) { %>, <% } %><% }); %>) throws ApiException {
+        okhttp3.Call localVarCall = <%- operation.name %>ValidateBeforeCall(<% operation.parameters.forEach((parameter) => { _%><%- parameter.javaName %>, <% }); %>null);
+        <%_ if (returnType === 'Void') { _%>
+        return localVarApiClient.execute(localVarCall);
+        <%_ } else { _%>
+        Type localVarReturnType = new TypeToken<<%- returnType %>>(){}.getType();
+        return localVarApiClient.execute(localVarCall, localVarReturnType);
+        <%_ } _%>
+    }
+
+
+    private okhttp3.Call <%- operation.name %>Async(<% operation.parameters.forEach((parameter) => { _%><%- javaType(parameter) %> <%- parameter.javaName %>, <% }); %>final ApiCallback<<%- returnType %>> _callback) throws ApiException {
+
+        okhttp3.Call localVarCall = <%- operation.name %>ValidateBeforeCall(<% operation.parameters.forEach((parameter) => { _%><%- parameter.javaName %>, <% }); %>_callback);
+        <%_ if (returnType !== 'Void') { _%>
+        Type localVarReturnType = new TypeToken<<%- returnType %>>(){}.getType();
+        localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback);
+        <%_ } else { _%>
+        localVarApiClient.executeAsync(localVarCall, _callback);
+        <%_ } _%>
+        return localVarCall;
+    }
+
+    public class API<%- operation.name %>Request {
+        <%_ requiredParameters.forEach((parameter) => { _%>
+        private final <%- javaType(parameter) %> <%- parameter.javaName %>;
+        <%_ }); _%>
+        <%_ optionalParameters.forEach((parameter) => { _%>
+        private <%- javaType(parameter) %> <%- parameter.javaName %>;
+        <%_ }); _%>
+
+        private API<%- operation.name %>Request(<% requiredParameters.forEach((parameter, i) => { %><%- javaType(parameter) %> <%- parameter.javaName %><% if (i < requiredParameters.length - 1) { %>, <% } %><% }); %>) {
+            <%_ requiredParameters.forEach((parameter) => { _%>
+            this.<%- parameter.javaName %> = <%- parameter.javaName %>;
+            <%_ }); _%>
+        }
+
+        <%_ optionalParameters.forEach((parameter) => { _%>
+        /**
+         * Set <%- parameter.javaName %>
+         * @param <%- parameter.javaName %> <%- parameter.description || '' %> (optional)
+         * @return API<%- operation.name %>Request
+         */
+        public API<%- operation.name %>Request <%- parameter.javaName %>(<%- javaType(parameter) %> <%- parameter.javaName %>) {
+            this.<%- parameter.javaName %> = <%- parameter.javaName %>;
+            return this;
+        }
+
+        <%_ }); _%>
+        /**
+         * Build call for <%- operation.name %>
+         * @param _callback ApiCallback API callback
+         * @return Call to execute
+         * @throws ApiException If fail to serialize the request body object
+         <%_ if (operation.responses.length > 0) { _%>
+         * @http.response.details
+         <table summary="Response Details" border="1">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <%_ operation.responses.forEach((response) => { _%>
+            <tr><td> <%- response.code %> </td><td> <%- response.description || '' %> </td><td>  -  </td></tr>
+            <%_ }); _%>
+         </table>
+         <%_ } _%>
+         <%_ if (operation.isDeprecated) { _%>
+         * @deprecated
+         <%_ } _%>
+         */
+        <%_ if (operation.isDeprecated) { _%>
+        @Deprecated
+        <%_ } _%>
+        public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
+            return <%- operation.name %>Call(<% operation.parameters.forEach((parameter) => { %><%- parameter.javaName %>, <% }); %>_callback);
+        }
+
+        /**
+         * Execute <%- operation.name %> request<% if (returnType !== 'Void') { %>
+         * @return <%- returnType %><% } %>
+         * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+         <%_ if (operation.responses.length > 0) { _%>
+         * @http.response.details
+         <table summary="Response Details" border="1">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <%_ operation.responses.forEach((response) => { _%>
+            <tr><td> <%- response.code %> </td><td> <%- response.description || '' %> </td><td>  -  </td></tr>
+            <%_ }); _%>
+         </table>
+         <%_ } _%>
+         <%_ if (operation.isDeprecated) { _%>
+         * @deprecated
+         <%_ } _%>
+         */
+        <%_ if (operation.isDeprecated) { _%>
+        @Deprecated
+        <%_ } _%>
+        public <%- returnType === 'Void' ? 'void' : returnType %> execute() throws ApiException {
+            <% if (returnType !== 'Void') { %>ApiResponse<<%- returnType %>> localVarResp = <% } %><%- operation.name %>WithHttpInfo(<% operation.parameters.forEach((parameter, i) => { %><%- parameter.javaName %><% if (i < operation.parameters.length - 1) { %>, <% } %><% }); %>);<% if (returnType !== 'Void') { %>
+            return localVarResp.getData();<% } %>
+        }
+
+        /**
+         * Execute <%- operation.name %> request with HTTP info returned
+         * @return ApiResponse&lt;<%- returnType %>&gt;
+         * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+         <%_ if (operation.responses.length > 0) { _%>
+         * @http.response.details
+         <table summary="Response Details" border="1">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <%_ operation.responses.forEach((response) => { _%>
+            <tr><td> <%- response.code %> </td><td> <%- response.description || '' %> </td><td>  -  </td></tr>
+            <%_ }); _%>
+         </table>
+         <%_ } _%>
+         <%_ if (operation.isDeprecated) { _%>
+         * @deprecated
+         <%_ } _%>
+         */
+        <%_ if (operation.isDeprecated) { _%>
+        @Deprecated
+        <%_ } _%>
+        public ApiResponse<<%- returnType %>> executeWithHttpInfo() throws ApiException {
+            return <%- operation.name %>WithHttpInfo(<% operation.parameters.forEach((parameter, i) => { %><%- parameter.javaName %><% if (i < operation.parameters.length - 1) { %>, <% } %><% }); %>);
+        }
+
+        /**
+         * Execute <%- operation.name %> request (asynchronously)
+         * @param _callback The callback to be executed when the API call finishes
+         * @return The request call
+         * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+         <%_ if (operation.responses.length > 0) { _%>
+         * @http.response.details
+         <table summary="Response Details" border="1">
+            <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+            <%_ operation.responses.forEach((response) => { _%>
+            <tr><td> <%- response.code %> </td><td> <%- response.description || '' %> </td><td>  -  </td></tr>
+            <%_ }); _%>
+         </table>
+         <%_ } _%>
+         <%_ if (operation.isDeprecated) { _%>
+         * @deprecated
+         <%_ } _%>
+         */
+        <%_ if (operation.isDeprecated) { _%>
+        @Deprecated
+        <%_ } _%>
+        public okhttp3.Call executeAsync(final ApiCallback<<%- returnType %>> _callback) throws ApiException {
+            return <%- operation.name %>Async(<% operation.parameters.forEach((parameter) => { _%><%- parameter.javaName %>, <% }); %>_callback);
+        }
+    }
+
+    /**
+     * <%- operation.summary || '' %>
+     * <%- operation.description || '' %><% requiredParameters.forEach((parameter) => { %>
+     * @param <%- parameter.javaName %> <%- parameter.description || '' %> (required)<% }); %>
+     * @return API<%- operation.name %>Request
+     <%_ if (operation.responses.length > 0) { _%>
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <%_ operation.responses.forEach((response) => { _%>
+        <tr><td> <%- response.code %> </td><td> <%- response.description || '' %> </td><td>  -  </td></tr>
+        <%_ }); _%>
+     </table>
+     <%_ } _%>
+     <%_ if (operation.isDeprecated) { _%>
+     * @deprecated
+     <%_ } _%>
+     */
+    <% if (operation.isDeprecated) { %>@Deprecated<% } %>
+    public API<%- operation.name %>Request <%- operation.name %>(<% requiredParameters.forEach((parameter, i) => { %><%- javaType(parameter) %> <%- parameter.javaName %><% if (i < requiredParameters.length - 1) { %>, <% } %><% }); %>) {
+        return new API<%- operation.name %>Request(<% requiredParameters.forEach((parameter, i) => { %><%- parameter.javaName %><% if (i < requiredParameters.length - 1) { %>, <% } %><% }); %>);
+    }
+    <%_ }); _%>
+}
+
+<%_ }); _%>
\ No newline at end of file
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/apiKeyAuth.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/apiKeyAuth.ejs
new file mode 100644
index 000000000..59dc5617c
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/apiKeyAuth.ejs
@@ -0,0 +1,76 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>/auth",
+  "name": "ApiKeyAuth",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>.auth;
+
+import <%- metadata.packageName %>.ApiException;
+import <%- metadata.packageName %>.Pair;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.List;
+
+public class ApiKeyAuth implements Authentication {
+  private final String location;
+  private final String paramName;
+
+  private String apiKey;
+  private String apiKeyPrefix;
+
+  public ApiKeyAuth(String location, String paramName) {
+    this.location = location;
+    this.paramName = paramName;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public String getParamName() {
+    return paramName;
+  }
+
+  public String getApiKey() {
+    return apiKey;
+  }
+
+  public void setApiKey(String apiKey) {
+    this.apiKey = apiKey;
+  }
+
+  public String getApiKeyPrefix() {
+    return apiKeyPrefix;
+  }
+
+  public void setApiKeyPrefix(String apiKeyPrefix) {
+    this.apiKeyPrefix = apiKeyPrefix;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
+                           String payload, String method, URI uri) throws ApiException {
+    if (apiKey == null) {
+      return;
+    }
+    String value;
+    if (apiKeyPrefix != null) {
+      value = apiKeyPrefix + " " + apiKey;
+    } else {
+      value = apiKey;
+    }
+    if ("query".equals(location)) {
+      queryParams.add(new Pair(paramName, value));
+    } else if ("header".equals(location)) {
+      headerParams.put(paramName, value);
+    } else if ("cookie".equals(location)) {
+      cookieParams.put(paramName, value);
+    }
+  }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/authentication.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/authentication.ejs
new file mode 100644
index 000000000..1e7154d43
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/authentication.ejs
@@ -0,0 +1,33 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>/auth",
+  "name": "Authentication",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>.auth;
+
+import <%- metadata.packageName %>.Pair;
+import <%- metadata.packageName %>.ApiException;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.List;
+
+public interface Authentication {
+    /**
+     * Apply authentication settings to header and query params.
+     *
+     * @param queryParams List of query parameters
+     * @param headerParams Map of header parameters
+     * @param cookieParams Map of cookie parameters
+     * @param payload HTTP request body
+     * @param method HTTP method
+     * @param uri URI
+     * @throws ApiException if failed to update the parameters
+     */
+    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException;
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/httpBasicAuth.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/httpBasicAuth.ejs
new file mode 100644
index 000000000..15e5a6ce9
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/httpBasicAuth.ejs
@@ -0,0 +1,54 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>/auth",
+  "name": "HttpBasicAuth",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>.auth;
+
+import <%- metadata.packageName %>.Pair;
+import <%- metadata.packageName %>.ApiException;
+
+import okhttp3.Credentials;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.List;
+
+import java.io.UnsupportedEncodingException;
+
+public class HttpBasicAuth implements Authentication {
+    private String username;
+    private String password;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
+                              String payload, String method, URI uri) throws ApiException {
+        if (username == null && password == null) {
+            return;
+        }
+        headerParams.put("Authorization", Credentials.basic(
+            username == null ? "" : username,
+            password == null ? "" : password));
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/httpBearerAuth.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/httpBearerAuth.ejs
new file mode 100644
index 000000000..8996a3295
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/auth/httpBearerAuth.ejs
@@ -0,0 +1,59 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>/auth",
+  "name": "HttpBearerAuth",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>.auth;
+
+import <%- metadata.packageName %>.ApiException;
+import <%- metadata.packageName %>.Pair;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.List;
+
+public class HttpBearerAuth implements Authentication {
+  private final String scheme;
+  private String bearerToken;
+
+  public HttpBearerAuth(String scheme) {
+    this.scheme = scheme;
+  }
+
+  /**
+   * Gets the token, which together with the scheme, will be sent as the value of the Authorization header.
+   *
+   * @return The bearer token
+   */
+  public String getBearerToken() {
+    return bearerToken;
+  }
+
+  /**
+   * Sets the token, which together with the scheme, will be sent as the value of the Authorization header.
+   *
+   * @param bearerToken The bearer token to send in the Authorization header
+   */
+  public void setBearerToken(String bearerToken) {
+    this.bearerToken = bearerToken;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
+                            String payload, String method, URI uri) throws ApiException {
+    if (bearerToken == null) {
+      return;
+    }
+
+    headerParams.put("Authorization", (scheme != null ? upperCaseBearer(scheme) + " " : "") + bearerToken);
+  }
+
+  private static String upperCaseBearer(String scheme) {
+    return ("bearer".equalsIgnoreCase(scheme)) ? "Bearer" : scheme;
+  }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiCallback.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiCallback.ejs
new file mode 100644
index 000000000..6f3c12cbb
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiCallback.ejs
@@ -0,0 +1,59 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "ApiCallback",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+import java.io.IOException;
+
+import java.util.Map;
+import java.util.List;
+
+/**
+ * Callback for asynchronous API call.
+ *
+ * @param <T> The return type
+ */
+public interface ApiCallback<T> {
+    /**
+     * This is called when the API call fails.
+     *
+     * @param e The exception causing the failure
+     * @param statusCode Status code of the response if available, otherwise it would be 0
+     * @param responseHeaders Headers of the response if available, otherwise it would be null
+     */
+    void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders);
+
+    /**
+     * This is called when the API call succeeded.
+     *
+     * @param result The result deserialized from response
+     * @param statusCode Status code of the response
+     * @param responseHeaders Headers of the response
+     */
+    void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders);
+
+    /**
+     * This is called when the API upload processing.
+     *
+     * @param bytesWritten bytes Written
+     * @param contentLength content length of request body
+     * @param done write end
+     */
+    void onUploadProgress(long bytesWritten, long contentLength, boolean done);
+
+    /**
+     * This is called when the API download processing.
+     *
+     * @param bytesRead bytes Read
+     * @param contentLength content length of the response
+     * @param done Read end
+     */
+    void onDownloadProgress(long bytesRead, long contentLength, boolean done);
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiClient.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiClient.ejs
new file mode 100644
index 000000000..b72fc2f6f
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiClient.ejs
@@ -0,0 +1,1543 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "ApiClient",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+import okhttp3.*;
+import okhttp3.internal.http.HttpMethod;
+import okhttp3.internal.tls.OkHostnameVerifier;
+import okhttp3.logging.HttpLoggingInterceptor;
+import okhttp3.logging.HttpLoggingInterceptor.Level;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.Okio;
+
+import javax.net.ssl.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.text.DateFormat;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import <%- metadata.packageName %>.auth.Authentication;
+import <%- metadata.packageName %>.auth.HttpBasicAuth;
+import <%- metadata.packageName %>.auth.HttpBearerAuth;
+import <%- metadata.packageName %>.auth.ApiKeyAuth;
+
+/**
+ * <p>ApiClient class.</p>
+ */
+public class ApiClient {
+
+    private String basePath = "http://localhost";
+    protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
+    new ServerConfiguration(
+      "",
+      "No description provided",
+      new HashMap<String, ServerVariable>()
+    )
+  ));
+    protected Integer serverIndex = 0;
+    protected Map<String, String> serverVariables = null;
+    private boolean debugging = false;
+    private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
+    private Map<String, String> defaultCookieMap = new HashMap<String, String>();
+    private String tempFolderPath = null;
+
+    private Map<String, Authentication> authentications;
+
+    private DateFormat dateFormat;
+    private DateFormat datetimeFormat;
+    private boolean lenientDatetimeFormat;
+    private int dateLength;
+
+    private InputStream sslCaCert;
+    private boolean verifyingSsl;
+    private KeyManager[] keyManagers;
+
+    private OkHttpClient httpClient;
+    private JSON json;
+
+    private HttpLoggingInterceptor loggingInterceptor;
+
+    /**
+     * Basic constructor for ApiClient
+     */
+    public ApiClient() {
+        init();
+        initHttpClient();
+
+        // Setup authentications (key: authentication name, value: authentication).
+        // Prevent the authentications from being modified.
+        authentications = Collections.unmodifiableMap(authentications);
+    }
+
+    /**
+     * Basic constructor with custom OkHttpClient
+     *
+     * @param client a {@link okhttp3.OkHttpClient} object
+     */
+    public ApiClient(OkHttpClient client) {
+        init();
+
+        httpClient = client;
+
+        // Setup authentications (key: authentication name, value: authentication).
+        // Prevent the authentications from being modified.
+        authentications = Collections.unmodifiableMap(authentications);
+    }
+
+    private void initHttpClient() {
+        initHttpClient(Collections.<Interceptor>emptyList());
+    }
+
+    private void initHttpClient(List<Interceptor> interceptors) {
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        builder.addNetworkInterceptor(getProgressInterceptor());
+        for (Interceptor interceptor: interceptors) {
+            builder.addInterceptor(interceptor);
+        }
+
+        httpClient = builder.build();
+    }
+
+    private void init() {
+        verifyingSsl = true;
+
+        json = new JSON();
+
+        // Set default User-Agent.
+        setUserAgent("OpenAPI-Generator/0.0.0/java");
+
+        authentications = new HashMap<String, Authentication>();
+    }
+
+    /**
+     * Get base path
+     *
+     * @return Base path
+     */
+    public String getBasePath() {
+        return basePath;
+    }
+
+    /**
+     * Set base path
+     *
+     * @param basePath Base path of the URL (e.g http://localhost
+     * @return An instance of OkHttpClient
+     */
+    public ApiClient setBasePath(String basePath) {
+        this.basePath = basePath;
+        return this;
+    }
+
+    public List<ServerConfiguration> getServers() {
+        return servers;
+    }
+
+    public ApiClient setServers(List<ServerConfiguration> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+    public Integer getServerIndex() {
+        return serverIndex;
+    }
+
+    public ApiClient setServerIndex(Integer serverIndex) {
+        this.serverIndex = serverIndex;
+        return this;
+    }
+
+    public Map<String, String> getServerVariables() {
+        return serverVariables;
+    }
+
+    public ApiClient setServerVariables(Map<String, String> serverVariables) {
+        this.serverVariables = serverVariables;
+        return this;
+    }
+
+    /**
+     * Get HTTP client
+     *
+     * @return An instance of OkHttpClient
+     */
+    public OkHttpClient getHttpClient() {
+        return httpClient;
+    }
+
+    /**
+     * Set HTTP client, which must never be null.
+     *
+     * @param newHttpClient An instance of OkHttpClient
+     * @return Api Client
+     * @throws java.lang.NullPointerException when newHttpClient is null
+     */
+    public ApiClient setHttpClient(OkHttpClient newHttpClient) {
+        this.httpClient = Objects.requireNonNull(newHttpClient, "HttpClient must not be null!");
+        return this;
+    }
+
+    /**
+     * Get JSON
+     *
+     * @return JSON object
+     */
+    public JSON getJSON() {
+        return json;
+    }
+
+    /**
+     * Set JSON
+     *
+     * @param json JSON object
+     * @return Api client
+     */
+    public ApiClient setJSON(JSON json) {
+        this.json = json;
+        return this;
+    }
+
+    /**
+     * True if isVerifyingSsl flag is on
+     *
+     * @return True if isVerifySsl flag is on
+     */
+    public boolean isVerifyingSsl() {
+        return verifyingSsl;
+    }
+
+    /**
+     * Configure whether to verify certificate and hostname when making https requests.
+     * Default to true.
+     * NOTE: Do NOT set to false in production code, otherwise you would face multiple types of cryptographic attacks.
+     *
+     * @param verifyingSsl True to verify TLS/SSL connection
+     * @return ApiClient
+     */
+    public ApiClient setVerifyingSsl(boolean verifyingSsl) {
+        this.verifyingSsl = verifyingSsl;
+        applySslSettings();
+        return this;
+    }
+
+    /**
+     * Get SSL CA cert.
+     *
+     * @return Input stream to the SSL CA cert
+     */
+    public InputStream getSslCaCert() {
+        return sslCaCert;
+    }
+
+    /**
+     * Configure the CA certificate to be trusted when making https requests.
+     * Use null to reset to default.
+     *
+     * @param sslCaCert input stream for SSL CA cert
+     * @return ApiClient
+     */
+    public ApiClient setSslCaCert(InputStream sslCaCert) {
+        this.sslCaCert = sslCaCert;
+        applySslSettings();
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>keyManagers</code>.</p>
+     *
+     * @return an array of {@link javax.net.ssl.KeyManager} objects
+     */
+    public KeyManager[] getKeyManagers() {
+        return keyManagers;
+    }
+
+    /**
+     * Configure client keys to use for authorization in an SSL session.
+     * Use null to reset to default.
+     *
+     * @param managers The KeyManagers to use
+     * @return ApiClient
+     */
+    public ApiClient setKeyManagers(KeyManager[] managers) {
+        this.keyManagers = managers;
+        applySslSettings();
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>dateFormat</code>.</p>
+     *
+     * @return a {@link java.text.DateFormat} object
+     */
+    public DateFormat getDateFormat() {
+        return dateFormat;
+    }
+
+    /**
+     * <p>Setter for the field <code>dateFormat</code>.</p>
+     *
+     * @param dateFormat a {@link java.text.DateFormat} object
+     * @return a {@link <%- metadata.packageName %>.ApiClient} object
+     */
+    public ApiClient setDateFormat(DateFormat dateFormat) {
+        JSON.setDateFormat(dateFormat);
+        return this;
+    }
+
+    /**
+     * <p>Set SqlDateFormat.</p>
+     *
+     * @param dateFormat a {@link java.text.DateFormat} object
+     * @return a {@link <%- metadata.packageName %>.ApiClient} object
+     */
+    public ApiClient setSqlDateFormat(DateFormat dateFormat) {
+        JSON.setSqlDateFormat(dateFormat);
+        return this;
+    }
+
+    /**
+     * <p>Set OffsetDateTimeFormat.</p>
+     *
+     * @param dateFormat a {@link java.time.format.DateTimeFormatter} object
+     * @return a {@link <%- metadata.packageName %>.ApiClient} object
+     */
+    public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
+        JSON.setOffsetDateTimeFormat(dateFormat);
+        return this;
+    }
+
+    /**
+     * <p>Set LocalDateFormat.</p>
+     *
+     * @param dateFormat a {@link java.time.format.DateTimeFormatter} object
+     * @return a {@link <%- metadata.packageName %>.ApiClient} object
+     */
+    public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
+        JSON.setLocalDateFormat(dateFormat);
+        return this;
+    }
+
+    /**
+     * <p>Set LenientOnJson.</p>
+     *
+     * @param lenientOnJson a boolean
+     * @return a {@link <%- metadata.packageName %>.ApiClient} object
+     */
+    public ApiClient setLenientOnJson(boolean lenientOnJson) {
+        JSON.setLenientOnJson(lenientOnJson);
+        return this;
+    }
+
+    /**
+     * Get authentications (key: authentication name, value: authentication).
+     *
+     * @return Map of authentication objects
+     */
+    public Map<String, Authentication> getAuthentications() {
+        return authentications;
+    }
+
+    /**
+     * Get authentication for the given name.
+     *
+     * @param authName The authentication name
+     * @return The authentication, null if not found
+     */
+    public Authentication getAuthentication(String authName) {
+        return authentications.get(authName);
+    }
+
+
+    /**
+     * Helper method to set username for the first HTTP basic authentication.
+     *
+     * @param username Username
+     */
+    public void setUsername(String username) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof HttpBasicAuth) {
+                ((HttpBasicAuth) auth).setUsername(username);
+                return;
+            }
+        }
+        throw new RuntimeException("No HTTP basic authentication configured!");
+    }
+
+    /**
+     * Helper method to set password for the first HTTP basic authentication.
+     *
+     * @param password Password
+     */
+    public void setPassword(String password) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof HttpBasicAuth) {
+                ((HttpBasicAuth) auth).setPassword(password);
+                return;
+            }
+        }
+        throw new RuntimeException("No HTTP basic authentication configured!");
+    }
+
+    /**
+     * Helper method to set API key value for the first API key authentication.
+     *
+     * @param apiKey API key
+     */
+    public void setApiKey(String apiKey) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof ApiKeyAuth) {
+                ((ApiKeyAuth) auth).setApiKey(apiKey);
+                return;
+            }
+        }
+        throw new RuntimeException("No API key authentication configured!");
+    }
+
+    /**
+     * Helper method to set API key prefix for the first API key authentication.
+     *
+     * @param apiKeyPrefix API key prefix
+     */
+    public void setApiKeyPrefix(String apiKeyPrefix) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof ApiKeyAuth) {
+                ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
+                return;
+            }
+        }
+        throw new RuntimeException("No API key authentication configured!");
+    }
+
+    /**
+     * Helper method to set access token for the first OAuth2 authentication.
+     *
+     * @param accessToken Access token
+     */
+    public void setAccessToken(String accessToken) {
+        throw new RuntimeException("No OAuth2 authentication configured!");
+    }
+
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
+    /**
+     * Set the User-Agent header's value (by adding to the default header map).
+     *
+     * @param userAgent HTTP request's user agent
+     * @return ApiClient
+     */
+    public ApiClient setUserAgent(String userAgent) {
+        addDefaultHeader("User-Agent", userAgent);
+        return this;
+    }
+
+    /**
+     * Add a default header.
+     *
+     * @param key The header's key
+     * @param value The header's value
+     * @return ApiClient
+     */
+    public ApiClient addDefaultHeader(String key, String value) {
+        defaultHeaderMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * Add a default cookie.
+     *
+     * @param key The cookie's key
+     * @param value The cookie's value
+     * @return ApiClient
+     */
+    public ApiClient addDefaultCookie(String key, String value) {
+        defaultCookieMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * Check that whether debugging is enabled for this API client.
+     *
+     * @return True if debugging is enabled, false otherwise.
+     */
+    public boolean isDebugging() {
+        return debugging;
+    }
+
+    /**
+     * Enable/disable debugging for this API client.
+     *
+     * @param debugging To enable (true) or disable (false) debugging
+     * @return ApiClient
+     */
+    public ApiClient setDebugging(boolean debugging) {
+        if (debugging != this.debugging) {
+            if (debugging) {
+                loggingInterceptor = new HttpLoggingInterceptor();
+                loggingInterceptor.setLevel(Level.BODY);
+                httpClient = httpClient.newBuilder().addInterceptor(loggingInterceptor).build();
+            } else {
+                final OkHttpClient.Builder builder = httpClient.newBuilder();
+                builder.interceptors().remove(loggingInterceptor);
+                httpClient = builder.build();
+                loggingInterceptor = null;
+            }
+        }
+        this.debugging = debugging;
+        return this;
+    }
+
+    /**
+     * The path of temporary folder used to store downloaded files from endpoints
+     * with file response. The default value is <code>null</code>, i.e. using
+     * the system's default temporary folder.
+     *
+     * @see <a href="https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#createTempFile(java.lang.String,%20java.lang.String,%20java.nio.file.attribute.FileAttribute...)">createTempFile</a>
+     * @return Temporary folder path
+     */
+    public String getTempFolderPath() {
+        return tempFolderPath;
+    }
+
+    /**
+     * Set the temporary folder path (for downloading files)
+     *
+     * @param tempFolderPath Temporary folder path
+     * @return ApiClient
+     */
+    public ApiClient setTempFolderPath(String tempFolderPath) {
+        this.tempFolderPath = tempFolderPath;
+        return this;
+    }
+
+    /**
+     * Get connection timeout (in milliseconds).
+     *
+     * @return Timeout in milliseconds
+     */
+    public int getConnectTimeout() {
+        return httpClient.connectTimeoutMillis();
+    }
+
+    /**
+     * Sets the connect timeout (in milliseconds).
+     * A value of 0 means no timeout, otherwise values must be between 1 and
+     * {@link java.lang.Integer#MAX_VALUE}.
+     *
+     * @param connectionTimeout connection timeout in milliseconds
+     * @return Api client
+     */
+    public ApiClient setConnectTimeout(int connectionTimeout) {
+        httpClient = httpClient.newBuilder().connectTimeout(connectionTimeout, TimeUnit.MILLISECONDS).build();
+        return this;
+    }
+
+    /**
+     * Get read timeout (in milliseconds).
+     *
+     * @return Timeout in milliseconds
+     */
+    public int getReadTimeout() {
+        return httpClient.readTimeoutMillis();
+    }
+
+    /**
+     * Sets the read timeout (in milliseconds).
+     * A value of 0 means no timeout, otherwise values must be between 1 and
+     * {@link java.lang.Integer#MAX_VALUE}.
+     *
+     * @param readTimeout read timeout in milliseconds
+     * @return Api client
+     */
+    public ApiClient setReadTimeout(int readTimeout) {
+        httpClient = httpClient.newBuilder().readTimeout(readTimeout, TimeUnit.MILLISECONDS).build();
+        return this;
+    }
+
+    /**
+     * Get write timeout (in milliseconds).
+     *
+     * @return Timeout in milliseconds
+     */
+    public int getWriteTimeout() {
+        return httpClient.writeTimeoutMillis();
+    }
+
+    /**
+     * Sets the write timeout (in milliseconds).
+     * A value of 0 means no timeout, otherwise values must be between 1 and
+     * {@link java.lang.Integer#MAX_VALUE}.
+     *
+     * @param writeTimeout connection timeout in milliseconds
+     * @return Api client
+     */
+    public ApiClient setWriteTimeout(int writeTimeout) {
+        httpClient = httpClient.newBuilder().writeTimeout(writeTimeout, TimeUnit.MILLISECONDS).build();
+        return this;
+    }
+
+
+    /**
+     * Format the given parameter object into string.
+     *
+     * @param param Parameter
+     * @return String representation of the parameter
+     */
+    public String parameterToString(Object param) {
+        if (param == null) {
+            return "";
+        } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
+            //Serialize to json string and remove the " enclosing characters
+            String jsonStr = JSON.serialize(param);
+            return jsonStr.substring(1, jsonStr.length() - 1);
+        } else if (param instanceof Collection) {
+            StringBuilder b = new StringBuilder();
+            for (Object o : (Collection) param) {
+                if (b.length() > 0) {
+                    b.append(",");
+                }
+                b.append(o);
+            }
+            return b.toString();
+        } else {
+            return String.valueOf(param);
+        }
+    }
+
+    /**
+     * Formats the specified query parameter to a list containing a single {@code Pair} object.
+     *
+     * Note that {@code value} must not be a collection.
+     *
+     * @param name The name of the parameter.
+     * @param value The value of the parameter.
+     * @return A list containing a single {@code Pair} object.
+     */
+    public List<Pair> parameterToPair(String name, Object value) {
+        List<Pair> params = new ArrayList<Pair>();
+
+        // preconditions
+        if (name == null || name.isEmpty() || value == null || value instanceof Collection) {
+            return params;
+        }
+
+        params.add(new Pair(name, parameterToString(value)));
+        return params;
+    }
+
+    /**
+     * Formats the specified collection query parameters to a list of {@code Pair} objects.
+     *
+     * Note that the values of each of the returned Pair objects are percent-encoded.
+     *
+     * @param collectionFormat The collection format of the parameter.
+     * @param name The name of the parameter.
+     * @param value The value of the parameter.
+     * @return A list of {@code Pair} objects.
+     */
+    public List<Pair> parameterToPairs(String collectionFormat, String name, Collection value) {
+        List<Pair> params = new ArrayList<Pair>();
+
+        // preconditions
+        if (name == null || name.isEmpty() || value == null || value.isEmpty()) {
+            return params;
+        }
+
+        // create the params based on the collection format
+        if ("multi".equals(collectionFormat)) {
+            for (Object item : value) {
+                params.add(new Pair(name, escapeString(parameterToString(item))));
+            }
+            return params;
+        }
+
+        // collectionFormat is assumed to be "csv" by default
+        String delimiter = ",";
+
+        // escape all delimiters except commas, which are URI reserved
+        // characters
+        if ("ssv".equals(collectionFormat)) {
+            delimiter = escapeString(" ");
+        } else if ("tsv".equals(collectionFormat)) {
+            delimiter = escapeString("\t");
+        } else if ("pipes".equals(collectionFormat)) {
+            delimiter = escapeString("|");
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (Object item : value) {
+            sb.append(delimiter);
+            sb.append(escapeString(parameterToString(item)));
+        }
+
+        params.add(new Pair(name, sb.substring(delimiter.length())));
+
+        return params;
+    }
+
+    /**
+     * Formats the specified collection path parameter to a string value.
+     *
+     * @param collectionFormat The collection format of the parameter.
+     * @param value The value of the parameter.
+     * @return String representation of the parameter
+     */
+    public String collectionPathParameterToString(String collectionFormat, Collection value) {
+        // create the value based on the collection format
+        if ("multi".equals(collectionFormat)) {
+            // not valid for path params
+            return parameterToString(value);
+        }
+
+        // collectionFormat is assumed to be "csv" by default
+        String delimiter = ",";
+
+        if ("ssv".equals(collectionFormat)) {
+            delimiter = " ";
+        } else if ("tsv".equals(collectionFormat)) {
+            delimiter = "\t";
+        } else if ("pipes".equals(collectionFormat)) {
+            delimiter = "|";
+        }
+
+        StringBuilder sb = new StringBuilder() ;
+        for (Object item : value) {
+            sb.append(delimiter);
+            sb.append(parameterToString(item));
+        }
+
+        return sb.substring(delimiter.length());
+    }
+
+    /**
+     * Sanitize filename by removing path.
+     * e.g. ../../sun.gif becomes sun.gif
+     *
+     * @param filename The filename to be sanitized
+     * @return The sanitized filename
+     */
+    public String sanitizeFilename(String filename) {
+        return filename.replaceAll(".*[/\\\\]", "");
+    }
+
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *   application/vnd.company+json
+     * "* / *" is also default to JSON
+     * @param mime MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    public boolean isJsonMime(String mime) {
+        String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$";
+        return mime != null && (mime.matches(jsonMime) || mime.equals("*/*"));
+    }
+
+    /**
+     * Select the Accept header's value from the given accepts array:
+     *   if JSON exists in the given array, use it;
+     *   otherwise use all of them (joining into a string)
+     *
+     * @param accepts The accepts array to select from
+     * @return The Accept header to use. If the given array is empty,
+     *   null will be returned (not to set the Accept header explicitly).
+     */
+    public String selectHeaderAccept(String[] accepts) {
+        if (accepts.length == 0) {
+            return null;
+        }
+        for (String accept : accepts) {
+            if (isJsonMime(accept)) {
+                return accept;
+            }
+        }
+        return StringUtil.join(accepts, ",");
+    }
+
+    /**
+     * Select the Content-Type header's value from the given array:
+     *   if JSON exists in the given array, use it;
+     *   otherwise use the first one of the array.
+     *
+     * @param contentTypes The Content-Type array to select from
+     * @return The Content-Type header to use. If the given array is empty,
+     *   returns null. If it matches "any", JSON will be used.
+     */
+    public String selectHeaderContentType(String[] contentTypes) {
+        if (contentTypes.length == 0) {
+            return null;
+        }
+
+        if (contentTypes[0].equals("*/*")) {
+            return "application/json";
+        }
+
+        for (String contentType : contentTypes) {
+            if (isJsonMime(contentType)) {
+                return contentType;
+            }
+        }
+
+        return contentTypes[0];
+    }
+
+    /**
+     * Escape the given string to be used as URL query value.
+     *
+     * @param str String to be escaped
+     * @return Escaped string
+     */
+    public String escapeString(String str) {
+        try {
+            return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
+        } catch (UnsupportedEncodingException e) {
+            return str;
+        }
+    }
+
+    /**
+     * Deserialize response body to Java object, according to the return type and
+     * the Content-Type response header.
+     *
+     * @param <T> Type
+     * @param response HTTP response
+     * @param returnType The type of the Java object
+     * @return The deserialized Java object
+     * @throws <%- metadata.packageName %>.ApiException If fail to deserialize response body, i.e. cannot read response body
+     *   or the Content-Type of the response is not supported.
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T deserialize(Response response, Type returnType) throws ApiException {
+        if (response == null || returnType == null) {
+            return null;
+        }
+
+        if ("byte[]".equals(returnType.toString())) {
+            // Handle binary response (byte array).
+            try {
+                return (T) response.body().bytes();
+            } catch (IOException e) {
+                throw new ApiException(e);
+            }
+        } else if (returnType.equals(File.class)) {
+            // Handle file downloading.
+            return (T) downloadFileFromResponse(response);
+        }
+
+        String respBody;
+        try {
+            if (response.body() != null)
+                respBody = response.body().string();
+            else
+                respBody = null;
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+
+        if (respBody == null || "".equals(respBody)) {
+            return null;
+        }
+
+        String contentType = response.headers().get("Content-Type");
+        if (contentType == null) {
+            // ensuring a default content type
+            contentType = "application/json";
+        }
+        if (isJsonMime(contentType)) {
+            return JSON.deserialize(respBody, returnType);
+        } else if (returnType.equals(String.class)) {
+            // Expecting string, return the raw response body.
+            return (T) respBody;
+        } else {
+            throw new ApiException(
+                    "Content type \"" + contentType + "\" is not supported for type: " + returnType,
+                    response.code(),
+                    response.headers().toMultimap(),
+                    respBody);
+        }
+    }
+
+    /**
+     * Serialize the given Java object into request body according to the object's
+     * class and the request Content-Type.
+     *
+     * @param obj The Java object
+     * @param contentType The request Content-Type
+     * @return The serialized request body
+     * @throws <%- metadata.packageName %>.ApiException If fail to serialize the given object
+     */
+    public RequestBody serialize(Object obj, String contentType) throws ApiException {
+        if (obj instanceof byte[]) {
+            // Binary (byte array) body parameter support.
+            return RequestBody.create((byte[]) obj, MediaType.parse(contentType));
+        } else if (obj instanceof File) {
+            // File body parameter support.
+            return RequestBody.create((File) obj, MediaType.parse(contentType));
+        } else if ("text/plain".equals(contentType) && obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
+        } else if (isJsonMime(contentType)) {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            return RequestBody.create(content, MediaType.parse(contentType));
+        } else if (obj instanceof String) {
+            return RequestBody.create((String) obj, MediaType.parse(contentType));
+        } else {
+            throw new ApiException("Content type \"" + contentType + "\" is not supported");
+        }
+    }
+
+    /**
+     * Download file from the given response.
+     *
+     * @param response An instance of the Response object
+     * @throws <%- metadata.packageName %>.ApiException If fail to read file content from response and write to disk
+     * @return Downloaded file
+     */
+    public File downloadFileFromResponse(Response response) throws ApiException {
+        try {
+            File file = prepareDownloadFile(response);
+            BufferedSink sink = Okio.buffer(Okio.sink(file));
+            sink.writeAll(response.body().source());
+            sink.close();
+            return file;
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+    }
+
+    /**
+     * Prepare file for download
+     *
+     * @param response An instance of the Response object
+     * @return Prepared file for the download
+     * @throws java.io.IOException If fail to prepare file for download
+     */
+    public File prepareDownloadFile(Response response) throws IOException {
+        String filename = null;
+        String contentDisposition = response.header("Content-Disposition");
+        if (contentDisposition != null && !"".equals(contentDisposition)) {
+            // Get filename from the Content-Disposition header.
+            Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
+            Matcher matcher = pattern.matcher(contentDisposition);
+            if (matcher.find()) {
+                filename = sanitizeFilename(matcher.group(1));
+            }
+        }
+
+        String prefix = null;
+        String suffix = null;
+        if (filename == null) {
+            prefix = "download-";
+            suffix = "";
+        } else {
+            int pos = filename.lastIndexOf(".");
+            if (pos == -1) {
+                prefix = filename + "-";
+            } else {
+                prefix = filename.substring(0, pos) + "-";
+                suffix = filename.substring(pos);
+            }
+            // Files.createTempFile requires the prefix to be at least three characters long
+            if (prefix.length() < 3)
+                prefix = "download-";
+        }
+
+        if (tempFolderPath == null)
+            return Files.createTempFile(prefix, suffix).toFile();
+        else
+            return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
+    }
+
+    /**
+     * {@link #execute(Call, Type)}
+     *
+     * @param <T> Type
+     * @param call An instance of the Call object
+     * @return ApiResponse&lt;T&gt;
+     * @throws <%- metadata.packageName %>.ApiException If fail to execute the call
+     */
+    public <T> ApiResponse<T> execute(Call call) throws ApiException {
+        return execute(call, null);
+    }
+
+    /**
+     * Execute HTTP call and deserialize the HTTP response body into the given return type.
+     *
+     * @param returnType The return type used to deserialize HTTP response body
+     * @param <T> The return type corresponding to (same with) returnType
+     * @param call Call
+     * @return ApiResponse object containing response status, headers and
+     *   data, which is a Java object deserialized from response body and would be null
+     *   when returnType is null.
+     * @throws <%- metadata.packageName %>.ApiException If fail to execute the call
+     */
+    public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiException {
+        try {
+            Response response = call.execute();
+            T data = handleResponse(response, returnType);
+            return new ApiResponse<T>(response.code(), response.headers().toMultimap(), data);
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+    }
+
+    /**
+     * {@link #executeAsync(Call, Type, ApiCallback)}
+     *
+     * @param <T> Type
+     * @param call An instance of the Call object
+     * @param callback ApiCallback&lt;T&gt;
+     */
+    public <T> void executeAsync(Call call, ApiCallback<T> callback) {
+        executeAsync(call, null, callback);
+    }
+
+    /**
+     * Execute HTTP call asynchronously.
+     *
+     * @param <T> Type
+     * @param call The callback to be executed when the API call finishes
+     * @param returnType Return type
+     * @param callback ApiCallback
+     * @see #execute(Call, Type)
+     */
+    @SuppressWarnings("unchecked")
+    public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
+        call.enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                callback.onFailure(new ApiException(e), 0, null);
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                T result;
+                try {
+                    result = (T) handleResponse(response, returnType);
+                } catch (ApiException e) {
+                    callback.onFailure(e, response.code(), response.headers().toMultimap());
+                    return;
+                } catch (Exception e) {
+                    callback.onFailure(new ApiException(e), response.code(), response.headers().toMultimap());
+                    return;
+                }
+                callback.onSuccess(result, response.code(), response.headers().toMultimap());
+            }
+        });
+    }
+
+    /**
+     * Handle the given response, return the deserialized object when the response is successful.
+     *
+     * @param <T> Type
+     * @param response Response
+     * @param returnType Return type
+     * @return Type
+     * @throws <%- metadata.packageName %>.ApiException If the response has an unsuccessful status code or
+     *                      fail to deserialize the response body
+     */
+    public <T> T handleResponse(Response response, Type returnType) throws ApiException {
+        if (response.isSuccessful()) {
+            if (returnType == null || response.code() == 204) {
+                // returning null if the returnType is not defined,
+                // or the status code is 204 (No Content)
+                if (response.body() != null) {
+                    try {
+                        response.body().close();
+                    } catch (Exception e) {
+                        throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+                    }
+                }
+                return null;
+            } else {
+                return deserialize(response, returnType);
+            }
+        } else {
+            String respBody = null;
+            if (response.body() != null) {
+                try {
+                    respBody = response.body().string();
+                } catch (IOException e) {
+                    throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+                }
+            }
+            throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
+        }
+    }
+
+    /**
+     * Build HTTP call with the given options.
+     *
+     * @param baseUrl The base URL
+     * @param path The sub-path of the HTTP URL
+     * @param method The request method, one of "GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH" and "DELETE"
+     * @param queryParams The query parameters
+     * @param collectionQueryParams The collection query parameters
+     * @param body The request body object
+     * @param headerParams The header parameters
+     * @param cookieParams The cookie parameters
+     * @param formParams The form parameters
+     * @param authNames The authentications to apply
+     * @param callback Callback for upload/download progress
+     * @return The HTTP call
+     * @throws <%- metadata.packageName %>.ApiException If fail to serialize the request body object
+     */
+    public Call buildCall(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 {
+        Request request = buildRequest(baseUrl, path, method, queryParams, collectionQueryParams, body, headerParams, cookieParams, formParams, authNames, callback);
+
+        return httpClient.newCall(request);
+    }
+
+    /**
+     * Build an HTTP request with the given options.
+     *
+     * @param baseUrl The base URL
+     * @param path The sub-path of the HTTP URL
+     * @param method The request method, one of "GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH" and "DELETE"
+     * @param queryParams The query parameters
+     * @param collectionQueryParams The collection query parameters
+     * @param body The request body object
+     * @param headerParams The header parameters
+     * @param cookieParams The cookie parameters
+     * @param formParams The form parameters
+     * @param authNames The authentications to apply
+     * @param callback Callback for upload/download progress
+     * @return The HTTP request
+     * @throws <%- metadata.packageName %>.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
+        RequestBody reqBody;
+        String contentType = headerParams.get("Content-Type");
+
+        if (!HttpMethod.permitsRequestBody(method)) {
+            reqBody = null;
+        } else if ("application/x-www-form-urlencoded".equals(contentType)) {
+            reqBody = buildRequestBodyFormEncoding(formParams);
+        } else if ("multipart/form-data".equals(contentType)) {
+            reqBody = buildRequestBodyMultipart(formParams);
+        } else if (body == null) {
+            if ("DELETE".equals(method)) {
+                // allow calling DELETE without sending a request body
+                reqBody = null;
+            } else {
+                // use an empty request body (for POST, PUT and PATCH)
+                reqBody = RequestBody.create("", contentType == null ? null : MediaType.parse(contentType));
+            }
+        } else {
+            reqBody = serialize(body, contentType);
+        }
+
+        // update parameters with authentication settings
+        updateParamsForAuth(authNames, allQueryParams, headerParams, cookieParams, requestBodyToString(reqBody), method, URI.create(url));
+
+        final Request.Builder reqBuilder = new Request.Builder().url(url);
+        processHeaderParams(headerParams, reqBuilder);
+        processCookieParams(cookieParams, reqBuilder);
+
+        // Associate callback with request (if not null) so interceptor can
+        // access it when creating ProgressResponseBody
+        reqBuilder.tag(callback);
+
+        Request request = null;
+
+        if (callback != null && reqBody != null) {
+            ProgressRequestBody progressRequestBody = new ProgressRequestBody(reqBody, callback);
+            request = reqBuilder.method(method, progressRequestBody).build();
+        } else {
+            request = reqBuilder.method(method, reqBody).build();
+        }
+
+        return request;
+    }
+
+    /**
+     * Build full URL by concatenating base path, the given sub path and query parameters.
+     *
+     * @param baseUrl The base URL
+     * @param path The sub path
+     * @param queryParams The query parameters
+     * @param collectionQueryParams The collection query parameters
+     * @return The full URL
+     */
+    public String buildUrl(String baseUrl, String path, List<Pair> queryParams, List<Pair> collectionQueryParams) {
+        final StringBuilder url = new StringBuilder();
+        if (baseUrl != null) {
+            url.append(baseUrl).append(path);
+        } else {
+            String baseURL;
+            if (serverIndex != null) {
+                if (serverIndex < 0 || serverIndex >= servers.size()) {
+                    throw new ArrayIndexOutOfBoundsException(String.format(
+                    "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
+                    ));
+                }
+                baseURL = servers.get(serverIndex).URL(serverVariables);
+            } else {
+                baseURL = basePath;
+            }
+            url.append(baseURL).append(path);
+        }
+
+        if (queryParams != null && !queryParams.isEmpty()) {
+            // support (constant) query string in `path`, e.g. "/posts?draft=1"
+            String prefix = path.contains("?") ? "&" : "?";
+            for (Pair param : queryParams) {
+                if (param.getValue() != null) {
+                    if (prefix != null) {
+                        url.append(prefix);
+                        prefix = null;
+                    } else {
+                        url.append("&");
+                    }
+                    String value = parameterToString(param.getValue());
+                    url.append(escapeString(param.getName())).append("=").append(escapeString(value));
+                }
+            }
+        }
+
+        if (collectionQueryParams != null && !collectionQueryParams.isEmpty()) {
+            String prefix = url.toString().contains("?") ? "&" : "?";
+            for (Pair param : collectionQueryParams) {
+                if (param.getValue() != null) {
+                    if (prefix != null) {
+                        url.append(prefix);
+                        prefix = null;
+                    } else {
+                        url.append("&");
+                    }
+                    String value = parameterToString(param.getValue());
+                    // collection query parameter value already escaped as part of parameterToPairs
+                    url.append(escapeString(param.getName())).append("=").append(value);
+                }
+            }
+        }
+
+        return url.toString();
+    }
+
+    /**
+     * Set header parameters to the request builder, including default headers.
+     *
+     * @param headerParams Header parameters in the form of Map
+     * @param reqBuilder Request.Builder
+     */
+    public void processHeaderParams(Map<String, String> headerParams, Request.Builder reqBuilder) {
+        for (Entry<String, String> param : headerParams.entrySet()) {
+            reqBuilder.header(param.getKey(), parameterToString(param.getValue()));
+        }
+        for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
+            if (!headerParams.containsKey(header.getKey())) {
+                reqBuilder.header(header.getKey(), parameterToString(header.getValue()));
+            }
+        }
+    }
+
+    /**
+     * Set cookie parameters to the request builder, including default cookies.
+     *
+     * @param cookieParams Cookie parameters in the form of Map
+     * @param reqBuilder Request.Builder
+     */
+    public void processCookieParams(Map<String, String> cookieParams, Request.Builder reqBuilder) {
+        for (Entry<String, String> param : cookieParams.entrySet()) {
+            reqBuilder.addHeader("Cookie", String.format("%s=%s", param.getKey(), param.getValue()));
+        }
+        for (Entry<String, String> param : defaultCookieMap.entrySet()) {
+            if (!cookieParams.containsKey(param.getKey())) {
+                reqBuilder.addHeader("Cookie", String.format("%s=%s", param.getKey(), param.getValue()));
+            }
+        }
+    }
+
+    /**
+     * Update query and header parameters based on authentication settings.
+     *
+     * @param authNames The authentications to apply
+     * @param queryParams List of query parameters
+     * @param headerParams Map of header parameters
+     * @param cookieParams Map of cookie parameters
+     * @param payload HTTP request body
+     * @param method HTTP method
+     * @param uri URI
+     * @throws <%- metadata.packageName %>.ApiException If fails to update the parameters
+     */
+    public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams,
+                                    Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException {
+        for (String authName : authNames) {
+            Authentication auth = authentications.get(authName);
+            if (auth == null) {
+                throw new RuntimeException("Authentication undefined: " + authName);
+            }
+            auth.applyToParams(queryParams, headerParams, cookieParams, payload, method, uri);
+        }
+    }
+
+    /**
+     * Build a form-encoding request body with the given form parameters.
+     *
+     * @param formParams Form parameters in the form of Map
+     * @return RequestBody
+     */
+    public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
+        okhttp3.FormBody.Builder formBuilder = new okhttp3.FormBody.Builder();
+        for (Entry<String, Object> param : formParams.entrySet()) {
+            formBuilder.add(param.getKey(), parameterToString(param.getValue()));
+        }
+        return formBuilder.build();
+    }
+
+    /**
+     * Build a multipart (file uploading) request body with the given form parameters,
+     * which could contain text fields and file fields.
+     *
+     * @param formParams Form parameters in the form of Map
+     * @return RequestBody
+     */
+    public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
+        MultipartBody.Builder mpBuilder = new MultipartBody.Builder().setType(MultipartBody.FORM);
+        for (Entry<String, Object> param : formParams.entrySet()) {
+            if (param.getValue() instanceof File) {
+                File file = (File) param.getValue();
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), file);
+            } else if (param.getValue() instanceof List) {
+                List list = (List) param.getValue();
+                for (Object item: list) {
+                    if (item instanceof File) {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), (File) item);
+                    } else {
+                        addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
+                    }
+                }
+            } else {
+                addPartToMultiPartBuilder(mpBuilder, param.getKey(), param.getValue());
+            }
+        }
+        return mpBuilder.build();
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    public String guessContentTypeFromFile(File file) {
+        String contentType = URLConnection.guessContentTypeFromName(file.getName());
+        if (contentType == null) {
+            return "application/octet-stream";
+        } else {
+            return contentType;
+        }
+    }
+
+    /**
+     * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param file The file to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
+        Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"; filename=\"" + file.getName() + "\"");
+        MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
+        mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
+    }
+
+    /**
+     * Add a Content-Disposition Header for the given key and complex object to the MultipartBody Builder.
+     *
+     * @param mpBuilder MultipartBody.Builder
+     * @param key The key of the Header element
+     * @param obj The complex object to add to the Header
+     */
+    private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
+        RequestBody requestBody;
+        if (obj instanceof String) {
+            requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
+        } else {
+            String content;
+            if (obj != null) {
+                content = JSON.serialize(obj);
+            } else {
+                content = null;
+            }
+            requestBody = RequestBody.create(content, MediaType.parse("application/json"));
+        }
+
+        Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
+        mpBuilder.addPart(partHeaders, requestBody);
+    }
+
+    /**
+     * Get network interceptor to add it to the httpClient to track download progress for
+     * async requests.
+     */
+    private Interceptor getProgressInterceptor() {
+        return new Interceptor() {
+            @Override
+            public Response intercept(Interceptor.Chain chain) throws IOException {
+                final Request request = chain.request();
+                final Response originalResponse = chain.proceed(request);
+                if (request.tag() instanceof ApiCallback) {
+                    final ApiCallback callback = (ApiCallback) request.tag();
+                    return originalResponse.newBuilder()
+                        .body(new ProgressResponseBody(originalResponse.body(), callback))
+                        .build();
+                }
+                return originalResponse;
+            }
+        };
+    }
+
+    /**
+     * Apply SSL related settings to httpClient according to the current values of
+     * verifyingSsl and sslCaCert.
+     */
+    private void applySslSettings() {
+        try {
+            TrustManager[] trustManagers;
+            HostnameVerifier hostnameVerifier;
+            if (!verifyingSsl) {
+                trustManagers = new TrustManager[]{
+                        new X509TrustManager() {
+                            @Override
+                            public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                            }
+
+                            @Override
+                            public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                            }
+
+                            @Override
+                            public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+                                return new java.security.cert.X509Certificate[]{};
+                            }
+                        }
+                };
+                hostnameVerifier = new HostnameVerifier() {
+                    @Override
+                    public boolean verify(String hostname, SSLSession session) {
+                        return true;
+                    }
+                };
+            } else {
+                TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+
+                if (sslCaCert == null) {
+                    trustManagerFactory.init((KeyStore) null);
+                } else {
+                    char[] password = null; // Any password will work.
+                    CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
+                    Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(sslCaCert);
+                    if (certificates.isEmpty()) {
+                        throw new IllegalArgumentException("expected non-empty set of trusted certificates");
+                    }
+                    KeyStore caKeyStore = newEmptyKeyStore(password);
+                    int index = 0;
+                    for (Certificate certificate : certificates) {
+                        String certificateAlias = "ca" + (index++);
+                        caKeyStore.setCertificateEntry(certificateAlias, certificate);
+                    }
+                    trustManagerFactory.init(caKeyStore);
+                }
+                trustManagers = trustManagerFactory.getTrustManagers();
+                hostnameVerifier = OkHostnameVerifier.INSTANCE;
+            }
+
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(keyManagers, trustManagers, new SecureRandom());
+            httpClient = httpClient.newBuilder()
+                            .sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustManagers[0])
+                            .hostnameVerifier(hostnameVerifier)
+                            .build();
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityException {
+        try {
+            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            keyStore.load(null, password);
+            return keyStore;
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Convert the HTTP request body to a string.
+     *
+     * @param requestBody The HTTP request object
+     * @return The string representation of the HTTP request body
+     * @throws <%- metadata.packageName %>.ApiException If fail to serialize the request body object into a string
+     */
+    private String requestBodyToString(RequestBody requestBody) throws ApiException {
+        if (requestBody != null) {
+            try {
+                final Buffer buffer = new Buffer();
+                requestBody.writeTo(buffer);
+                return buffer.readUtf8();
+            } catch (final IOException e) {
+                throw new ApiException(e);
+            }
+        }
+
+        // empty http request body
+        return "";
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiException.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiException.ejs
new file mode 100644
index 000000000..25559d978
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiException.ejs
@@ -0,0 +1,162 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "ApiException",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+import java.util.Map;
+import java.util.List;
+
+import javax.ws.rs.core.GenericType;
+
+/**
+ * <p>ApiException class.</p>
+ */
+@SuppressWarnings("serial")
+public class ApiException extends Exception {
+    private int code = 0;
+    private Map<String, List<String>> responseHeaders = null;
+    private String responseBody = null;
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     */
+    public ApiException() {}
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param throwable a {@link java.lang.Throwable} object
+     */
+    public ApiException(Throwable throwable) {
+        super(throwable);
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param message the error message
+     */
+    public ApiException(String message) {
+        super(message);
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param message the error message
+     * @param throwable a {@link java.lang.Throwable} object
+     * @param code HTTP status code
+     * @param responseHeaders a {@link java.util.Map} of HTTP response headers
+     * @param responseBody the response body
+     */
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        super(message, throwable);
+        this.code = code;
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param message the error message
+     * @param code HTTP status code
+     * @param responseHeaders a {@link java.util.Map} of HTTP response headers
+     * @param responseBody the response body
+     */
+    public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(message, (Throwable) null, code, responseHeaders, responseBody);
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param message the error message
+     * @param throwable a {@link java.lang.Throwable} object
+     * @param code HTTP status code
+     * @param responseHeaders a {@link java.util.Map} of HTTP response headers
+     */
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
+        this(message, throwable, code, responseHeaders, null);
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param code HTTP status code
+     * @param responseHeaders a {@link java.util.Map} of HTTP response headers
+     * @param responseBody the response body
+     */
+    public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this("Response Code: " + code + " Response Body: " + responseBody, (Throwable) null, code, responseHeaders, responseBody);
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param code HTTP status code
+     * @param message a {@link java.lang.String} object
+     */
+    public ApiException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
+
+    /**
+     * <p>Constructor for ApiException.</p>
+     *
+     * @param code HTTP status code
+     * @param message the error message
+     * @param responseHeaders a {@link java.util.Map} of HTTP response headers
+     * @param responseBody the response body
+     */
+    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(code, message);
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
+
+    /**
+     * Get the HTTP status code.
+     *
+     * @return HTTP status code
+     */
+    public int getCode() {
+        return code;
+    }
+
+    /**
+     * Get the HTTP response headers.
+     *
+     * @return A map of list of string
+     */
+    public Map<String, List<String>> getResponseHeaders() {
+        return responseHeaders;
+    }
+
+    /**
+     * Get the HTTP response body.
+     *
+     * @return Response body in the form of string
+     */
+    public String getResponseBody() {
+        return responseBody;
+    }
+
+    /**
+     * Get the exception message including HTTP response data.
+     *
+     * @return The exception message
+     */
+    public String getMessage() {
+        return String.format("Message: %s%nHTTP response code: %s%nHTTP response body: %s%nHTTP response headers: %s",
+                super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders());
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiResponse.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiResponse.ejs
new file mode 100644
index 000000000..87bc15498
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/apiResponse.ejs
@@ -0,0 +1,73 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "ApiResponse",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API response returned by API call.
+ */
+public class ApiResponse<T> {
+    final private int statusCode;
+    final private Map<String, List<String>> headers;
+    final private T data;
+
+    /**
+     * <p>Constructor for ApiResponse.</p>
+     *
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers) {
+        this(statusCode, headers, null);
+    }
+
+    /**
+     * <p>Constructor for ApiResponse.</p>
+     *
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     * @param data The object deserialized from response bod
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
+        this.statusCode = statusCode;
+        this.headers = headers;
+        this.data = data;
+    }
+
+    /**
+     * <p>Get the <code>status code</code>.</p>
+     *
+     * @return the status code
+     */
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    /**
+     * <p>Get the <code>headers</code>.</p>
+     *
+     * @return a {@link java.util.Map} of headers
+     */
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
+
+    /**
+     * <p>Get the <code>data</code>.</p>
+     *
+     * @return the data
+     */
+    public T getData() {
+        return data;
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/configuration.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/configuration.ejs
new file mode 100644
index 000000000..7bedd7ab5
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/configuration.ejs
@@ -0,0 +1,35 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "Configuration",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+public class Configuration {
+    private static ApiClient defaultApiClient = new ApiClient();
+
+    /**
+     * Get the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @return Default API client
+     */
+    public static ApiClient getDefaultApiClient() {
+        return defaultApiClient;
+    }
+
+    /**
+     * Set the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @param apiClient API client
+     */
+    public static void setDefaultApiClient(ApiClient apiClient) {
+        defaultApiClient = apiClient;
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/gzipRequestInterceptor.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/gzipRequestInterceptor.ejs
new file mode 100644
index 000000000..d21889641
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/gzipRequestInterceptor.ejs
@@ -0,0 +1,82 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "GzipRequestInterceptor",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+import okhttp3.*;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.GzipSink;
+import okio.Okio;
+
+import java.io.IOException;
+
+/**
+ * Encodes request bodies using gzip.
+ *
+ * Taken from https://github.com/square/okhttp/issues/350
+ */
+class GzipRequestInterceptor implements Interceptor {
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request originalRequest = chain.request();
+        if (originalRequest.body() == null || originalRequest.header("Content-Encoding") != null) {
+            return chain.proceed(originalRequest);
+        }
+
+        Request compressedRequest = originalRequest.newBuilder()
+                                                   .header("Content-Encoding", "gzip")
+                                                   .method(originalRequest.method(), forceContentLength(gzip(originalRequest.body())))
+                                                   .build();
+        return chain.proceed(compressedRequest);
+    }
+
+    private RequestBody forceContentLength(final RequestBody requestBody) throws IOException {
+        final Buffer buffer = new Buffer();
+        requestBody.writeTo(buffer);
+        return new RequestBody() {
+            @Override
+            public MediaType contentType() {
+                return requestBody.contentType();
+            }
+
+            @Override
+            public long contentLength() {
+                return buffer.size();
+            }
+
+            @Override
+            public void writeTo(BufferedSink sink) throws IOException {
+                sink.write(buffer.snapshot());
+            }
+        };
+    }
+
+    private RequestBody gzip(final RequestBody body) {
+        return new RequestBody() {
+            @Override
+            public MediaType contentType() {
+                return body.contentType();
+            }
+
+            @Override
+            public long contentLength() {
+                return -1; // We don't know the compressed length in advance!
+            }
+
+            @Override
+            public void writeTo(BufferedSink sink) throws IOException {
+                BufferedSink gzipSink = Okio.buffer(new GzipSink(sink));
+                body.writeTo(gzipSink);
+                gzipSink.close();
+            }
+        };
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/json.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/json.ejs
new file mode 100644
index 000000000..92de06e11
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/json.ejs
@@ -0,0 +1,400 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "JSON",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.internal.bind.util.ISO8601Utils;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonElement;
+import io.gsonfire.GsonFireBuilder;
+import io.gsonfire.TypeSelector;
+
+import okio.ByteString;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.lang.reflect.Type;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
+
+/*
+ * A JSON utility class
+ *
+ * NOTE: in the future, this class may be converted to static, which may break
+ *       backward-compatibility
+ */
+public class JSON {
+    private static Gson gson;
+    private static boolean isLenientOnJson = false;
+    private static DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
+    private static SqlDateTypeAdapter sqlDateTypeAdapter = new SqlDateTypeAdapter();
+    private static OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter();
+    private static LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();
+    private static ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter();
+
+    @SuppressWarnings("unchecked")
+    public static GsonBuilder createGson() {
+        GsonFireBuilder fireBuilder = new GsonFireBuilder()
+        ;
+        GsonBuilder builder = fireBuilder.createGsonBuilder();
+        return builder;
+    }
+
+    private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
+        JsonElement element = readElement.getAsJsonObject().get(discriminatorField);
+        if (null == element) {
+            throw new IllegalArgumentException("missing discriminator field: <" + discriminatorField + ">");
+        }
+        return element.getAsString();
+    }
+
+    /**
+     * Returns the Java class that implements the OpenAPI schema for the specified discriminator value.
+     *
+     * @param classByDiscriminatorValue The map of discriminator values to Java classes.
+     * @param discriminatorValue The value of the OpenAPI discriminator in the input data.
+     * @return The Java class that implements the OpenAPI schema
+     */
+    private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue);
+        if (null == clazz) {
+            throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
+        }
+        return clazz;
+    }
+
+    {
+        GsonBuilder gsonBuilder = createGson();
+        gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
+        gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
+        gsonBuilder.registerTypeAdapter(OffsetDateTime.class, offsetDateTimeTypeAdapter);
+        gsonBuilder.registerTypeAdapter(LocalDate.class, localDateTypeAdapter);
+        gsonBuilder.registerTypeAdapter(byte[].class, byteArrayAdapter);
+        <%_ models.filter(m => m.export !== "enum").forEach((model) => { _%>
+        gsonBuilder.registerTypeAdapterFactory(new <%- metadata.packageName %>.model.<%- model.name %>.CustomTypeAdapterFactory());
+        <%_ }); _%>
+        gson = gsonBuilder.create();
+    }
+
+    /**
+     * Get Gson.
+     *
+     * @return Gson
+     */
+    public static Gson getGson() {
+        return gson;
+    }
+
+    /**
+     * Set Gson.
+     *
+     * @param gson Gson
+     */
+    public static void setGson(Gson gson) {
+        JSON.gson = gson;
+    }
+
+    public static void setLenientOnJson(boolean lenientOnJson) {
+        isLenientOnJson = lenientOnJson;
+    }
+
+    /**
+     * Serialize the given Java object into JSON string.
+     *
+     * @param obj Object
+     * @return String representation of the JSON
+     */
+    public static String serialize(Object obj) {
+        return gson.toJson(obj);
+    }
+
+    /**
+     * Deserialize the given JSON string to Java object.
+     *
+     * @param <T>        Type
+     * @param body       The JSON string
+     * @param returnType The type to deserialize into
+     * @return The deserialized Java object
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T deserialize(String body, Type returnType) {
+        try {
+            if (isLenientOnJson) {
+                JsonReader jsonReader = new JsonReader(new StringReader(body));
+                // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
+                jsonReader.setLenient(true);
+                return gson.fromJson(jsonReader, returnType);
+            } else {
+                return gson.fromJson(body, returnType);
+            }
+        } catch (JsonParseException e) {
+            // Fallback processing when failed to parse JSON form response body:
+            // return the response body string directly for the String return type;
+            if (returnType.equals(String.class)) {
+                return (T) body;
+            } else {
+                throw (e);
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for Byte Array type
+     */
+    public static class ByteArrayAdapter extends TypeAdapter<byte[]> {
+
+        @Override
+        public void write(JsonWriter out, byte[] value) throws IOException {
+            if (value == null) {
+                out.nullValue();
+            } else {
+                out.value(ByteString.of(value).base64());
+            }
+        }
+
+        @Override
+        public byte[] read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String bytesAsBase64 = in.nextString();
+                    ByteString byteString = ByteString.decodeBase64(bytesAsBase64);
+                    return byteString.toByteArray();
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for JSR310 OffsetDateTime type
+     */
+    public static class OffsetDateTimeTypeAdapter extends TypeAdapter<OffsetDateTime> {
+
+        private DateTimeFormatter formatter;
+
+        public OffsetDateTimeTypeAdapter() {
+            this(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+        }
+
+        public OffsetDateTimeTypeAdapter(DateTimeFormatter formatter) {
+            this.formatter = formatter;
+        }
+
+        public void setFormat(DateTimeFormatter dateFormat) {
+            this.formatter = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, OffsetDateTime date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                out.value(formatter.format(date));
+            }
+        }
+
+        @Override
+        public OffsetDateTime read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String date = in.nextString();
+                    if (date.endsWith("+0000")) {
+                        date = date.substring(0, date.length()-5) + "Z";
+                    }
+                    return OffsetDateTime.parse(date, formatter);
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for JSR310 LocalDate type
+     */
+    public static class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+        private DateTimeFormatter formatter;
+
+        public LocalDateTypeAdapter() {
+            this(DateTimeFormatter.ISO_LOCAL_DATE);
+        }
+
+        public LocalDateTypeAdapter(DateTimeFormatter formatter) {
+            this.formatter = formatter;
+        }
+
+        public void setFormat(DateTimeFormatter dateFormat) {
+            this.formatter = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, LocalDate date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                out.value(formatter.format(date));
+            }
+        }
+
+        @Override
+        public LocalDate read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String date = in.nextString();
+                    return LocalDate.parse(date, formatter);
+            }
+        }
+    }
+
+    public static void setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
+        offsetDateTimeTypeAdapter.setFormat(dateFormat);
+    }
+
+    public static void setLocalDateFormat(DateTimeFormatter dateFormat) {
+        localDateTypeAdapter.setFormat(dateFormat);
+    }
+
+    /**
+     * Gson TypeAdapter for java.sql.Date type
+     * If the dateFormat is null, a simple "yyyy-MM-dd" format will be used
+     * (more efficient than SimpleDateFormat).
+     */
+    public static class SqlDateTypeAdapter extends TypeAdapter<java.sql.Date> {
+
+        private DateFormat dateFormat;
+
+        public SqlDateTypeAdapter() {}
+
+        public SqlDateTypeAdapter(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        public void setFormat(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, java.sql.Date date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                String value;
+                if (dateFormat != null) {
+                    value = dateFormat.format(date);
+                } else {
+                    value = date.toString();
+                }
+                out.value(value);
+            }
+        }
+
+        @Override
+        public java.sql.Date read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String date = in.nextString();
+                    try {
+                        if (dateFormat != null) {
+                            return new java.sql.Date(dateFormat.parse(date).getTime());
+                        }
+                        return new java.sql.Date(ISO8601Utils.parse(date, new ParsePosition(0)).getTime());
+                    } catch (ParseException e) {
+                        throw new JsonParseException(e);
+                    }
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for java.util.Date type
+     * If the dateFormat is null, ISO8601Utils will be used.
+     */
+    public static class DateTypeAdapter extends TypeAdapter<Date> {
+
+        private DateFormat dateFormat;
+
+        public DateTypeAdapter() {}
+
+        public DateTypeAdapter(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        public void setFormat(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, Date date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                String value;
+                if (dateFormat != null) {
+                    value = dateFormat.format(date);
+                } else {
+                    value = ISO8601Utils.format(date, true);
+                }
+                out.value(value);
+            }
+        }
+
+        @Override
+        public Date read(JsonReader in) throws IOException {
+            try {
+                switch (in.peek()) {
+                    case NULL:
+                        in.nextNull();
+                        return null;
+                    default:
+                        String date = in.nextString();
+                        try {
+                            if (dateFormat != null) {
+                                return dateFormat.parse(date);
+                            }
+                            return ISO8601Utils.parse(date, new ParsePosition(0));
+                        } catch (ParseException e) {
+                            throw new JsonParseException(e);
+                        }
+                }
+            } catch (IllegalArgumentException e) {
+                throw new JsonParseException(e);
+            }
+        }
+    }
+
+    public static void setDateFormat(DateFormat dateFormat) {
+        dateTypeAdapter.setFormat(dateFormat);
+    }
+
+    public static void setSqlDateFormat(DateFormat dateFormat) {
+        sqlDateTypeAdapter.setFormat(dateFormat);
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/pair.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/pair.ejs
new file mode 100644
index 000000000..6a98e5a43
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/pair.ejs
@@ -0,0 +1,53 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "Pair",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+public class Pair {
+    private String name = "";
+    private String value = "";
+
+    public Pair (String name, String value) {
+        setName(name);
+        setValue(value);
+    }
+
+    private void setName(String name) {
+        if (!isValidString(name)) {
+            return;
+        }
+
+        this.name = name;
+    }
+
+    private void setValue(String value) {
+        if (!isValidString(value)) {
+            return;
+        }
+
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    private boolean isValidString(String arg) {
+        if (arg == null) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/progressRequestBody.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/progressRequestBody.ejs
new file mode 100644
index 000000000..2d8b5b1e4
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/progressRequestBody.ejs
@@ -0,0 +1,70 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "ProgressRequestBody",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+import java.io.IOException;
+
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.ForwardingSink;
+import okio.Okio;
+import okio.Sink;
+
+public class ProgressRequestBody extends RequestBody {
+
+    private final RequestBody requestBody;
+
+    private final ApiCallback callback;
+
+    public ProgressRequestBody(RequestBody requestBody, ApiCallback callback) {
+        this.requestBody = requestBody;
+        this.callback = callback;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return requestBody.contentType();
+    }
+
+    @Override
+    public long contentLength() throws IOException {
+        return requestBody.contentLength();
+    }
+
+    @Override
+    public void writeTo(BufferedSink sink) throws IOException {
+        BufferedSink bufferedSink = Okio.buffer(sink(sink));
+        requestBody.writeTo(bufferedSink);
+        bufferedSink.flush();
+    }
+
+    private Sink sink(Sink sink) {
+        return new ForwardingSink(sink) {
+
+            long bytesWritten = 0L;
+            long contentLength = 0L;
+
+            @Override
+            public void write(Buffer source, long byteCount) throws IOException {
+                super.write(source, byteCount);
+                if (contentLength == 0) {
+                    contentLength = contentLength();
+                }
+
+                bytesWritten += byteCount;
+                callback.onUploadProgress(bytesWritten, contentLength, bytesWritten == contentLength);
+            }
+        };
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/progressResponseBody.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/progressResponseBody.ejs
new file mode 100644
index 000000000..baa7e5df8
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/progressResponseBody.ejs
@@ -0,0 +1,67 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "ProgressResponseBody",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
+
+import java.io.IOException;
+
+import okio.Buffer;
+import okio.BufferedSource;
+import okio.ForwardingSource;
+import okio.Okio;
+import okio.Source;
+
+public class ProgressResponseBody extends ResponseBody {
+
+    private final ResponseBody responseBody;
+    private final ApiCallback callback;
+    private BufferedSource bufferedSource;
+
+    public ProgressResponseBody(ResponseBody responseBody, ApiCallback callback) {
+        this.responseBody = responseBody;
+        this.callback = callback;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return responseBody.contentType();
+    }
+
+    @Override
+    public long contentLength() {
+        return responseBody.contentLength();
+    }
+
+    @Override
+    public BufferedSource source() {
+        if (bufferedSource == null) {
+            bufferedSource = Okio.buffer(source(responseBody.source()));
+        }
+        return bufferedSource;
+    }
+
+    private Source source(Source source) {
+        return new ForwardingSource(source) {
+            long totalBytesRead = 0L;
+
+            @Override
+            public long read(Buffer sink, long byteCount) throws IOException {
+                long bytesRead = super.read(sink, byteCount);
+                // read() returns the number of bytes read, or -1 if this source is exhausted.
+                totalBytesRead += bytesRead != -1 ? bytesRead : 0;
+                callback.onDownloadProgress(totalBytesRead, responseBody.contentLength(), bytesRead == -1);
+                return bytesRead;
+            }
+        };
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/serverConfiguration.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/serverConfiguration.ejs
new file mode 100644
index 000000000..4b9e37ee1
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/serverConfiguration.ejs
@@ -0,0 +1,65 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "ServerConfiguration",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>;
+
+import java.util.Map;
+
+/**
+ * Representing a Server configuration.
+ */
+public class ServerConfiguration {
+    public String URL;
+    public String description;
+    public Map<String, ServerVariable> variables;
+
+    /**
+     * @param URL A URL to the target host.
+     * @param description A description of the host designated by the URL.
+     * @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template.
+     */
+    public ServerConfiguration(String URL, String description, Map<String, ServerVariable> variables) {
+        this.URL = URL;
+        this.description = description;
+        this.variables = variables;
+    }
+
+    /**
+     * Format URL template using given variables.
+     *
+     * @param variables A map between a variable name and its value.
+     * @return Formatted URL.
+     */
+    public String URL(Map<String, String> variables) {
+        String url = this.URL;
+
+        // go through variables and replace placeholders
+        for (Map.Entry<String, ServerVariable> variable: this.variables.entrySet()) {
+            String name = variable.getKey();
+            ServerVariable serverVariable = variable.getValue();
+            String value = serverVariable.defaultValue;
+
+            if (variables != null && variables.containsKey(name)) {
+                value = variables.get(name);
+                if (serverVariable.enumValues.size() > 0 && !serverVariable.enumValues.contains(value)) {
+                    throw new IllegalArgumentException("The variable " + name + " in the server URL has invalid value " + value + ".");
+                }
+            }
+            url = url.replace("{" + name + "}", value);
+        }
+        return url;
+    }
+
+    /**
+     * Format URL template using default server variables.
+     *
+     * @return Formatted URL.
+     */
+    public String URL() {
+        return URL(null);
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/serverVariable.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/serverVariable.ejs
new file mode 100644
index 000000000..b97ec48eb
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/serverVariable.ejs
@@ -0,0 +1,30 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "ServerVariable",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>;
+
+import java.util.HashSet;
+
+/**
+ * Representing a Server Variable for server URL template substitution.
+ */
+public class ServerVariable {
+    public String description;
+    public String defaultValue;
+    public HashSet<String> enumValues = null;
+
+    /**
+     * @param description A description for the server variable.
+     * @param defaultValue The default value to use for substitution.
+     * @param enumValues An enumeration of string values to be used if the substitution options are from a limited set.
+     */
+    public ServerVariable(String description, String defaultValue, HashSet<String> enumValues) {
+        this.description = description;
+        this.defaultValue = defaultValue;
+        this.enumValues = enumValues;
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/stringUtil.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/stringUtil.ejs
new file mode 100644
index 000000000..a0776ae93
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/generic/stringUtil.ejs
@@ -0,0 +1,79 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>",
+  "name": "StringUtil",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) {
+        return true;
+      }
+      if (value != null && value.equalsIgnoreCase(str)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) {
+      return "";
+    }
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+
+  /**
+   * Join a list of strings with the given separator.
+   *
+   * @param list      The list of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(Collection<String> list, String separator) {
+    Iterator<String> iterator = list.iterator();
+    StringBuilder out = new StringBuilder();
+    if (iterator.hasNext()) {
+      out.append(iterator.next());
+    }
+    while (iterator.hasNext()) {
+      out.append(separator).append(iterator.next());
+    }
+    return out.toString();
+  }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/models/abstractOpenApiSchema.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/models/abstractOpenApiSchema.ejs
new file mode 100644
index 000000000..6c6fd0138
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/models/abstractOpenApiSchema.ejs
@@ -0,0 +1,146 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>/model",
+  "name": "AbstractOpenApiSchema",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>.model;
+
+import <%- metadata.packageName %>.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;
+
+/**
+ * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
+ */
+@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
+public abstract class AbstractOpenApiSchema {
+
+    // store the actual instance of the schema/object
+    private Object instance;
+
+    // is nullable
+    private Boolean isNullable;
+
+    // schema type (e.g. oneOf, anyOf)
+    private final String schemaType;
+
+    public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
+        this.schemaType = schemaType;
+        this.isNullable = isNullable;
+    }
+
+    /**
+     * Get the list of oneOf/anyOf composed schemas allowed to be stored in this object
+     *
+     * @return an instance of the actual schema/object
+     */
+    public abstract Map<String, GenericType> getSchemas();
+
+    /**
+     * Get the actual instance
+     *
+     * @return an instance of the actual schema/object
+     */
+    //@JsonValue
+    public Object getActualInstance() {return instance;}
+
+    /**
+     * Set the actual instance
+     *
+     * @param instance the actual instance of the schema/object
+     */
+    public void setActualInstance(Object instance) {this.instance = instance;}
+
+    /**
+     * Get the instant recursively when the schemas defined in oneOf/anyof happen to be oneOf/anyOf schema as well
+     *
+     * @return an instance of the actual schema/object
+     */
+    public Object getActualInstanceRecursively() {
+        return getActualInstanceRecursively(this);
+    }
+
+    private Object getActualInstanceRecursively(AbstractOpenApiSchema object) {
+        if (object.getActualInstance() == null) {
+            return null;
+        } else if (object.getActualInstance() instanceof AbstractOpenApiSchema) {
+            return getActualInstanceRecursively((AbstractOpenApiSchema)object.getActualInstance());
+        } else {
+            return object.getActualInstance();
+        }
+    }
+
+    /**
+     * Get the schema type (e.g. anyOf, oneOf)
+     *
+     * @return the schema type
+     */
+    public String getSchemaType() {
+        return schemaType;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ").append(getClass()).append(" {\n");
+        sb.append("    instance: ").append(toIndentedString(instance)).append("\n");
+        sb.append("    isNullable: ").append(toIndentedString(isNullable)).append("\n");
+        sb.append("    schemaType: ").append(toIndentedString(schemaType)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        AbstractOpenApiSchema a = (AbstractOpenApiSchema) o;
+        return Objects.equals(this.instance, a.instance) &&
+            Objects.equals(this.isNullable, a.isNullable) &&
+            Objects.equals(this.schemaType, a.schemaType);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(instance, isNullable, schemaType);
+    }
+
+    /**
+     * Is nullable
+     *
+     * @return true if it's nullable
+     */
+    public Boolean isNullable() {
+        if (Boolean.TRUE.equals(isNullable)) {
+            return Boolean.TRUE;
+        } else {
+            return Boolean.FALSE;
+        }
+    }
+
+
+
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/models/models.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/models/models.ejs
new file mode 100644
index 000000000..8c2830704
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/client/models/models.ejs
@@ -0,0 +1,647 @@
+<%_ const lowerFirst = (str) => str.charAt(0).toLowerCase() + str.slice(1); _%>
+<%_ const modelsByName = Object.fromEntries(models.map(m => [m.name, m])); _%>
+<%_ const modelNameToParentModel = Object.fromEntries(models
+        .filter(m => m.composedModels && m.composedModels.length > 0)
+        .flatMap(parent => parent.composedModels.map(child => [child.name, parent]))); _%>
+<%_ /* Filter out models which are hoisted children of all-ofs, since for java we mix in child properties */ _%>
+<%_ models.filter(m => !(m.isHoisted && modelNameToParentModel[m.name] && modelNameToParentModel[m.name].export === "all-of")).forEach((model) => { _%>
+<%_ const getRecursiveAllOfChildren = (m) => m.export === "all-of" ? [...m.composedModels, ...m.composedModels.flatMap(c => getRecursiveAllOfChildren(c))] : []; _%>
+<%_ const recursiveAllOfChildren = getRecursiveAllOfChildren(model); _%>
+<%_ const properties = [
+    // For all-of models, filter out the properties which are composed models, since we're mixing in child properties instead
+    ...model.properties.filter(p => model.export !== "all-of" || p.name),
+    ...recursiveAllOfChildren.flatMap(m => m.properties.filter(p => model.export !== "all-of" || p.name)),
+]; _%>
+<%_ const propertyTypes = new Set(properties.map(p => p.type)); _%>
+<%_ const unique = (items) => {
+    const seen = new Set();
+    const res = [];
+    items.forEach(item => {
+        if (!seen.has(item)) {
+            res.push(item);
+            seen.add(item);
+        }
+    });
+    return res;
+}; _%>
+<%_ const uniqueImports = unique([
+    ...model.uniqueImports,
+    ...recursiveAllOfChildren.flatMap(m => m.uniqueImports),
+    // Filter out imports that aren't referenced (for all-of where we want to import the child model's properties rather than the child models)
+]).filter(uniqueImport => propertyTypes.has(uniqueImport)); _%>
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>/model",
+  "name": "<%- model.name %>",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###<%- include('../../header.partial.ejs', { info }) %>
+
+
+package <%- metadata.packageName %>.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+<%_ uniqueImports.forEach((importName) => { _%>
+import <%- metadata.packageName %>.model.<%- importName %>;
+<%_ }); _%>
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
+import <%- metadata.packageName %>.JSON;
+
+<%_ if (model.export === "enum") { _%>
+/**
+ * Gets or Sets <%- model.name %>
+ */
+@JsonAdapter(<%- model.name %>.Adapter.class)
+public enum <%- model.name %> {
+  <%_ model.enum.forEach((e, i) => { _%>
+
+  <%- e.name %>("<%- e.value.replace(/["']/g, '') %>")<% if (i < model.enum.length - 1) { %>,<% } else { %>;<% } %>
+  <%_ }); _%>
+
+  private String value;
+
+  <%- model.name %>(String value) {
+    this.value = value;
+  }
+
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  public static <%- model.name %> fromValue(String value) {
+    for (<%- model.name %> b : <%- model.name %>.values()) {
+      if (b.value.equals(value)) {
+        return b;
+      }
+    }
+    throw new IllegalArgumentException("Unexpected value '" + value + "'");
+  }
+
+  public static class Adapter extends TypeAdapter<<%- model.name %>> {
+    @Override
+    public void write(final JsonWriter jsonWriter, final <%- model.name %> enumeration) throws IOException {
+      jsonWriter.value(enumeration.getValue());
+    }
+
+    @Override
+    public <%- model.name %> read(final JsonReader jsonReader) throws IOException {
+      String value = jsonReader.nextString();
+      return <%- model.name %>.fromValue(value);
+    }
+  }
+}
+<%_ } else if (model.export === "one-of" || model.export === "any-of") { _%>
+@lombok.experimental.SuperBuilder
+public class <%- model.name %> extends AbstractOpenApiSchema {
+    private static final Logger log = Logger.getLogger(<%- model.name %>.class.getName());
+
+    public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+            if (!<%- model.name %>.class.isAssignableFrom(type.getRawType())) {
+                return null; // this class only serializes '<%- model.name %>' and its subtypes
+            }
+            final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
+            <%_ properties.forEach((composedType) => { _%>
+            final TypeAdapter<<%- composedType.javaType %>> adapter<%- composedType.javaType %> = gson.getDelegateAdapter(this, TypeToken.get(<%- composedType.javaType %>.class));
+            <%_ }); _%>
+
+            return (TypeAdapter<T>) new TypeAdapter<<%- model.name %>>() {
+                @Override
+                public void write(JsonWriter out, <%- model.name %> value) throws IOException {
+                    if (value == null || value.getActualInstance() == null) {
+                        elementAdapter.write(out, null);
+                        return;
+                    }
+
+                    <%_ properties.forEach((composedType) => { _%>
+                    // check if the actual instance is of the type `<%- composedType.javaType %>`
+                    if (value.getActualInstance() instanceof <%- composedType.javaType %>) {
+                        JsonObject obj = adapter<%- composedType.javaType %>.toJsonTree((<%- composedType.javaType %>)value.getActualInstance()).getAsJsonObject();
+                        elementAdapter.write(out, obj);
+                        return;
+                    }
+
+                    <%_ }); _%>
+                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: <%- properties.map((p) => p.javaType).join(', ') %>");
+                }
+
+                @Override
+                public <%- model.name %> read(JsonReader in) throws IOException {
+                    Object deserialized = null;
+                    JsonObject jsonObject = elementAdapter.read(in).getAsJsonObject();
+
+                    <%_ if (model.export === "one-of") { _%>
+                    int match = 0;
+                    ArrayList<String> errorMessages = new ArrayList<>();
+                    TypeAdapter actualAdapter = elementAdapter;
+                    <%_ } _%>
+
+                    <%_ properties.forEach((composedType) => { _%>
+                    // deserialize <%- composedType.javaType %>
+                    try {
+                        // validate the JSON object to see if any exception is thrown
+                        <%- composedType.javaType %>.validateJsonObject(jsonObject);
+                        <%_ if (model.export === "one-of") { _%>
+                        actualAdapter = adapter<%- composedType.javaType %>;
+                        match++;
+                        <%_ } _%>
+                        log.log(Level.FINER, "Input data matches schema '<%- composedType.javaType %>'");
+                        <%_ if (model.export === "any-of") { _%>
+                        <%- model.name %> ret = new <%- model.name %>();
+                        ret.setActualInstance(adapter<%- composedType.javaType %>.fromJsonTree(jsonObject));
+                        return ret;
+                        <%_ } _%>
+                    } catch (Exception e) {
+                        // deserialization failed, continue
+                        <%_ if (model.export === "one-of") { _%>
+                        errorMessages.add(String.format("Deserialization for <%- composedType.javaType %> failed with `%s`.", e.getMessage()));
+                        <%_ } _%>
+                        log.log(Level.FINER, "Input data does not match schema '<%- composedType.javaType %>'", e);
+                    }
+
+                    <%_ }); _%>
+                    <%_ if (model.export === "one-of") { _%>
+                    if (match == 1) {
+                        <%- model.name %> ret = new <%- model.name %>();
+                        ret.setActualInstance(actualAdapter.fromJsonTree(jsonObject));
+                        return ret;
+                    }
+                    <%_ } _%>
+
+                    <%_ if (model.export === "one-of") { _%>
+                    throw new IOException(String.format("Failed deserialization for <%- model.name %>: %d classes match result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", match, errorMessages, jsonObject.toString()));
+                    <%_ } else { _%>
+                    throw new IOException(String.format("Failed deserialization for <%- model.name %>: no class matched. JSON: %s", jsonObject.toString()));
+                    <%_ } _%>
+                }
+            }.nullSafe();
+        }
+    }
+
+    // store a list of schema names defined in <%- model.export === "one-of" ? "oneOf" : "anyOf" %>
+    public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+
+    public <%- model.name %>() {
+        super("<%- model.export === "one-of" ? "oneOf" : "anyOf" %>", <% if (model.isNullable) { %>Boolean.TRUE<% } else { %>Boolean.FALSE<% } %>);
+    }
+
+    <%_ properties.forEach((composedType) => { _%>
+    public <%- model.name %>(<%- composedType.javaType %> o) {
+        super("<%- model.export === "one-of" ? "oneOf" : "anyOf" %>", <% if (model.isNullable) { %>Boolean.TRUE<% } else { %>Boolean.FALSE<% } %>);
+        setActualInstance(o);
+    }
+
+    <%_ }); _%>
+    static {
+        <%_ properties.forEach((composedType) => { _%>
+        schemas.put("<%- composedType.javaType %>", new GenericType<<%- composedType.javaType %>>() {
+        });
+        <%_ }); _%>
+    }
+
+    @Override
+    public Map<String, GenericType> getSchemas() {
+        return <%- model.name %>.schemas;
+    }
+
+    /**
+     * Set the instance that matches the <%- model.export === "one-of" ? "oneOf" : "anyOf" %> child schema, check
+     * the instance parameter is valid against the <%- model.export === "one-of" ? "oneOf" : "anyOf" %> child schemas:
+     * <%- properties.map((p) => p.javaType).join(', ') %>
+     *
+     * It could be an instance of the '<%- model.export === "one-of" ? "oneOf" : "anyOf" %>' schemas.
+     * The <%- model.export === "one-of" ? "oneOf" : "anyOf" %> child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
+    @Override
+    public void setActualInstance(Object instance) {
+        <%_ if (model.isNullable) { _%>
+        if (instance == null) {
+            super.setActualInstance(instance);
+            return;
+        }
+
+        <%_ } _%>
+        <%_ properties.forEach((composedType) => { _%>
+        if (instance instanceof <%- composedType.javaType %>) {
+            super.setActualInstance(instance);
+            return;
+        }
+
+        <%_ }); _%>
+        throw new RuntimeException("Invalid instance type. Must be <%- properties.map((p) => p.javaType).join(', ') %>");
+    }
+
+    /**
+     * Get the actual instance, which can be the following:
+     * <%- properties.map((p) => p.javaType).join(', ') %>
+     *
+     * @return The actual instance (<%- properties.map((p) => p.javaType).join(', ') %>)
+     */
+    @Override
+    public Object getActualInstance() {
+        return super.getActualInstance();
+    }
+
+  <%_ properties.forEach((composedType) => { _%>
+    /**
+     * Get the actual instance of `<%- composedType.javaType %>`. If the actual instance is not `<%- composedType.javaType %>`,
+     * the ClassCastException will be thrown.
+     *
+     * @return The actual instance of `<%- composedType.javaType %>`
+     * @throws ClassCastException if the instance is not `<%- composedType.javaType %>`
+     */
+    public <%- composedType.javaType %> get<%- composedType.javaType %>() throws ClassCastException {
+        return (<%- composedType.javaType %>)super.getActualInstance();
+    }
+
+  <%_ }); _%>
+
+ /**
+  * Validates the JSON Object and throws an exception if issues found
+  *
+  * @param jsonObj JSON Object
+  * @throws IOException if the JSON Object is invalid with respect to <%- model.name %>
+  */
+  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
+    // validate <%- model.export === "one-of" ? "oneOf" : "anyOf" %> schemas one by one
+    int validCount = 0;
+    <%_ if (model.export === "one-of") { _%>
+    ArrayList<String> errorMessages = new ArrayList<>();
+    <%_ } _%>
+    <%_ properties.forEach((composedType) => { _%>
+    // validate the json string with <%- composedType.javaType %>
+    try {
+      <%- composedType.javaType %>.validateJsonObject(jsonObj);
+      <%_ if (model.export === "one-of") { _%>
+      validCount++;
+      <%_ } else { _%>
+      return; // return earlier as at least one schema is valid with respect to the Json object
+      //validCount++;
+      <%_ } _%>
+    } catch (Exception e) {
+      <%_ if (model.export === "one-of") { _%>
+      errorMessages.add(String.format("Deserialization for <%- composedType.javaType %> failed with `%s`.", e.getMessage()));
+      <%_ } _%>
+      // continue to the next one
+    }
+    <%_ }); _%>
+    <%_ if (model.export === "one-of") { _%>
+    if (validCount != 1) {
+      throw new IOException(String.format("The JSON string is invalid for <%- model.name %> with oneOf schemas: <%- properties.map((p) => p.javaType).join(', ') %>. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonObj.toString()));
+    }
+    <%_ } else { _%>
+    if (validCount == 0) {
+      throw new IOException(String.format("The JSON string is invalid for <%- model.name %> with anyOf schemas: <%- properties.map((p) => p.javaType).join(', ') %>. JSON: %s", jsonObj.toString()));
+    }
+    <%_ } _%>
+  }
+
+ /**
+  * Create an instance of <%- model.name %> given an JSON string
+  *
+  * @param jsonString JSON string
+  * @return An instance of <%- model.name %>
+  * @throws IOException if the JSON string is invalid with respect to <%- model.name %>
+  */
+  public static <%- model.name %> fromJson(String jsonString) throws IOException {
+    return JSON.getGson().fromJson(jsonString, <%- model.name %>.class);
+  }
+
+ /**
+  * Convert an instance of <%- model.name %> to an JSON string
+  *
+  * @return JSON string
+  */
+  public String toJson() {
+    return JSON.getGson().toJson(this);
+  }
+
+}
+<%_ } else { _%>
+/**
+ * <%- model.description || model.name %>
+ <%_ if (model.isDeprecated) { _%>
+ * @deprecated
+ <%_ } _%>
+ */
+@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
+public class <%- model.name %> {
+  <%_ properties.forEach((property) => { _%>
+  public static final String SERIALIZED_NAME_<%- property.pythonName.toUpperCase() %> = "<%- property.name %>";
+  @SerializedName(SERIALIZED_NAME_<%- property.pythonName.toUpperCase() %>)
+  <%_ if (property.export === "array" || property.export === "dictionary") { _%>
+  private <%- property.javaType %> <%- property.javaName %> = <% if (property.isRequired) { %>new <%- property.export === "array" ? 'ArrayList' : 'HashMap' %><>()<% } else { %>null<% } %>;
+  <%_ } else { _%>
+  private <%- property.javaType %> <%- property.javaName %><% if (property.type === "any") { %> = null<% } %>;
+  <%_ } _%>
+
+  <%_ }); _%>
+  public <%- model.name %>() {
+  }
+
+  <%_ properties.forEach((property) => { _%>
+  public <%- model.name %> <%- property.javaName %>(<%- property.javaType %> <%- property.javaName %>) {
+
+    this.<%- property.javaName %> = <%- property.javaName %>;
+    return this;
+  }
+  <%_ if (property.export === "array") { _%>
+
+  public <%- model.name %> <%- include('../../getterSetter.partial.ejs', { prefix: 'add', name: property.javaName }) %>Item(<%- property.link.javaType %> <%- property.javaName %>Item) {
+    <%_ if (!property.isRequired) { _%>
+    if (this.<%- property.javaName %> == null) {
+      this.<%- property.javaName %> = new ArrayList<>();
+    }
+    <%_ } _%>
+    this.<%- property.javaName %>.add(<%- property.javaName %>Item);
+    return this;
+  }
+  <%_ } else if (property.export === "dictionary") { _%>
+
+  public <%- model.name %> <%- include('../../getterSetter.partial.ejs', { prefix: 'put', name: property.javaName }) %>Item(String key, <%- property.link.javaType %> <%- property.javaName %>Item) {
+    <%_ if (!property.isRequired) { _%>
+    if (this.<%- property.javaName %> == null) {
+      this.<%- property.javaName %> = new HashMap<>();
+    }
+    <%_ } _%>
+    this.<%- property.javaName %>.put(key, <%- property.javaName %>Item);
+    return this;
+  }
+  <%_ } _%>
+
+   /**
+   * <% if (property.description) { %><%- property.description %><% } else { %>Get <%- property.javaName %><% } %>
+   * @return <%- property.javaName %>
+  **/
+  @javax.annotation.<%- property.isNullable || !property.isRequired ? 'Nullable' : 'Nonnull' %>
+  public <%- property.javaType %> <%- include('../../getterSetter.partial.ejs', { prefix: 'get', name: property.javaName }) %>() {
+    return <%- property.javaName %>;
+  }
+
+
+  public void <%- include('../../getterSetter.partial.ejs', { prefix: 'set', name: property.javaName }) %>(<%- property.javaType %> <%- property.javaName %>) {
+    this.<%- property.javaName %> = <%- property.javaName %>;
+  }
+
+  <%_ }); _%>
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    <%- model.name %> <%- lowerFirst(model.name) %> = (<%- model.name %>) o;
+    return <% properties.forEach((property, i) => { %>Objects.equals(this.<%- property.javaName %>, <%- lowerFirst(model.name) %>.<%- property.javaName %>)<% if (i < properties.length - 1) { %> &&<% } else { %>;<% } %>
+        <% }); %>
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(<%- properties.map((property) => property.javaName).join(', ') %>);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class <%- model.name %> {\n");
+    <%_ properties.forEach((property) => { _%>
+    sb.append("    <%- property.javaName %>: ").append(toIndentedString(<%- property.javaName %>)).append("\n");
+    <%_ }); _%>
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+
+  public static HashSet<String> openapiFields;
+  public static HashSet<String> openapiRequiredFields;
+
+  static {
+    // a set of all properties/fields (JSON key names)
+    openapiFields = new HashSet<String>();
+    <%_ properties.forEach((property) => { _%>
+    openapiFields.add("<%- property.name %>");
+    <%_ }); _%>
+
+    // a set of required properties/fields (JSON key names)
+    openapiRequiredFields = new HashSet<String>();
+    <%_ properties.filter(p => p.isRequired).forEach((property) => { _%>
+    openapiRequiredFields.add("<%- property.name %>");
+    <%_ }); _%>
+  }
+
+ /**
+  * Validates the JSON Object and throws an exception if issues found
+  *
+  * @param jsonObj JSON Object
+  * @throws IOException if the JSON Object is invalid with respect to <%- model.name %>
+  */
+  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
+      if (jsonObj == null) {
+        if (!<%- model.name %>.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
+          throw new IllegalArgumentException(String.format("The required field(s) %s in <%- model.name %> is not found in the empty JSON string", <%- model.name %>.openapiRequiredFields.toString()));
+        }
+      }
+
+      Set<Entry<String, JsonElement>> entries = jsonObj.entrySet();
+      // check to see if the JSON string contains additional fields
+      for (Entry<String, JsonElement> entry : entries) {
+        if (!<%- model.name %>.openapiFields.contains(entry.getKey())) {
+          throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `<%- model.name %>` properties. JSON: %s", entry.getKey(), jsonObj.toString()));
+        }
+      }
+      <%_ if (properties.filter(p => p.isRequired).length > 0) { _%>
+
+      // check to make sure all required properties/fields are present in the JSON string
+      for (String requiredField : <%- model.name %>.openapiRequiredFields) {
+        if (jsonObj.get(requiredField) == null) {
+          throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonObj.toString()));
+        }
+      }
+      <%_ } _%>
+      <%_ properties.forEach((property) => { _%>
+      <%_ if (property.export === "array") { _%>
+      <%_ if (!property.link.isPrimitive) { _%>
+      <%_ if (property.isRequired) { _%>
+      // ensure the json data is an array
+      if (!jsonObj.get("<%- property.name %>").isJsonArray()) {
+        throw new IllegalArgumentException(String.format("Expected the field `<%- property.name %>` to be an array in the JSON string but got `%s`", jsonObj.get("<%- property.name %>").toString()));
+      }
+
+      JsonArray jsonArray<%- property.javaName %> = jsonObj.getAsJsonArray("<%- property.name %>");
+      // validate the required field `<%- property.name %>` (array)
+      for (int i = 0; i < jsonArray<%- property.javaName %>.size(); i++) {
+        <%- property.link.javaType %>.validateJsonObject(jsonArray<%- property.javaName %>.get(i).getAsJsonObject());
+      };
+      <%_ } else { _%>
+      if (jsonObj.get("<%- property.name %>") != null && !jsonObj.get("<%- property.name %>").isJsonNull()) {
+        JsonArray jsonArray<%- property.javaName %> = jsonObj.getAsJsonArray("<%- property.name %>");
+        if (jsonArray<%- property.javaName %> != null) {
+          // ensure the json data is an array
+          if (!jsonObj.get("<%- property.name %>").isJsonArray()) {
+            throw new IllegalArgumentException(String.format("Expected the field `<%- property.name %>` to be an array in the JSON string but got `%s`", jsonObj.get("<%- property.name %>").toString()));
+          }
+
+          // validate the optional field `<%- property.name %>` (array)
+          for (int i = 0; i < jsonArray<%- property.javaName %>.size(); i++) {
+            <%- property.link.javaType %>.validateJsonObject(jsonArray<%- property.javaName %>.get(i).getAsJsonObject());
+          };
+        }
+      }
+      <%_ } _%>
+      <%_ } else { _%>
+      <%_ if (!property.isRequired) { _%>
+      // ensure the optional json data is an array if present
+      if (jsonObj.get("<%- property.name %>") != null && !jsonObj.get("<%- property.name %>").isJsonArray()) {
+        throw new IllegalArgumentException(String.format("Expected the field `<%- property.name %>` to be an array in the JSON string but got `%s`", jsonObj.get("<%- property.name %>").toString()));
+      }
+      <%_ } else { _%>
+      // ensure the required json array is present
+      if (jsonObj.get("<%- property.name %>") == null) {
+        throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`");
+      } else if (!jsonObj.get("<%- property.name %>").isJsonArray()) {
+        throw new IllegalArgumentException(String.format("Expected the field `<%- property.name %>` to be an array in the JSON string but got `%s`", jsonObj.get("<%- property.name %>").toString()));
+      }
+      <%_ } _%>
+      <%_ } _%>
+      <%_ } _%>
+      <%_ if (property.isPrimitive) { _%>
+      <%_ if (property.type === "string") { _%>
+      if (<% if (!property.isRequired) { %>(jsonObj.get("<%- property.name %>") != null && !jsonObj.get("<%- property.name %>").isJsonNull()) && <% } %>!jsonObj.get("<%- property.name %>").isJsonPrimitive()) {
+        throw new IllegalArgumentException(String.format("Expected the field `<%- property.name %>` to be a primitive type in the JSON string but got `%s`", jsonObj.get("<%- property.name %>").toString()));
+      }
+      <%_ } _%>
+      <%_ } else if (property.export !== "array" && property.export !== "dictionary") { _%>
+      <%_ if (property.isRequired) { _%>
+      // validate the required field `<%- property.name %>`
+      <%- property.javaType %>.validateJsonObject(jsonObj.getAsJsonObject("<%- property.name %>"));
+      <%_ } else { _%>
+      // validate the optional field `<%- property.name %>`
+      if (jsonObj.get("<%- property.name %>") != null && !jsonObj.get("<%- property.name %>").isJsonNull()) {
+        <%- property.javaType %>.validateJsonObject(jsonObj.getAsJsonObject("<%- property.name %>"));
+      }
+      <%_ } _%>
+      <%_ } _%>
+      <%_ }); _%>
+  }
+
+  public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+       if (!<%- model.name %>.class.isAssignableFrom(type.getRawType())) {
+         return null; // this class only serializes '<%- model.name %>' and its subtypes
+       }
+       final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
+       final TypeAdapter<<%- model.name %>> thisAdapter
+                        = gson.getDelegateAdapter(this, TypeToken.get(<%- model.name %>.class));
+
+       return (TypeAdapter<T>) new TypeAdapter<<%- model.name %>>() {
+           @Override
+           public void write(JsonWriter out, <%- model.name %> value) throws IOException {
+             JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
+             elementAdapter.write(out, obj);
+           }
+
+           @Override
+           public <%- model.name %> read(JsonReader in) throws IOException {
+             JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
+             validateJsonObject(jsonObj);
+             return thisAdapter.fromJsonTree(jsonObj);
+           }
+
+       }.nullSafe();
+    }
+  }
+
+ /**
+  * Create an instance of <%- model.name %> given an JSON string
+  *
+  * @param jsonString JSON string
+  * @return An instance of <%- model.name %>
+  * @throws IOException if the JSON string is invalid with respect to <%- model.name %>
+  */
+  public static <%- model.name %> fromJson(String jsonString) throws IOException {
+    return JSON.getGson().fromJson(jsonString, <%- model.name %>.class);
+  }
+
+ /**
+  * Convert an instance of <%- model.name %> to an JSON string
+  *
+  * @return JSON string
+  */
+  public String toJson() {
+    return JSON.getGson().toJson(this);
+  }
+}
+<%_ } _%>
+<%_ }); _%>
\ No newline at end of file
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/getterSetter.partial.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/getterSetter.partial.ejs
new file mode 100644
index 000000000..01cb35f01
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/getterSetter.partial.ejs
@@ -0,0 +1,14 @@
+<%_
+const getterSetterCapitalize = (str) => {
+    // De-escape reserved names as we'll add a prefix
+    if (str.startsWith('_')) {
+        str = str.slice(1);
+    }
+    if (str.length > 1 && str.charAt(0).toLowerCase() === str.charAt(0) && str.charAt(1).toUpperCase() === str.charAt(1)) {
+        return str;
+    }
+    return str.charAt(0).toUpperCase() + str.slice(1);
+};
+const capitalized = getterSetterCapitalize(name);
+_%>
+<%- prefix %><%- capitalized -%>
\ No newline at end of file
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/header.partial.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/header.partial.ejs
new file mode 100644
index 000000000..2518c7298
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/header.partial.ejs
@@ -0,0 +1,10 @@
+/*
+ * <%- info.title %>
+ * <%- info.description || '' %>
+ *
+ * The version of the OpenAPI document: <%- info.version %>
+ *
+ *
+ * NOTE: This class is auto generated.
+ * Do not edit the class manually.
+ */
\ No newline at end of file
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/operationConfig.mustache b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/operationConfig.mustache
deleted file mode 100644
index 852464e43..000000000
--- a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/operationConfig.mustache
+++ /dev/null
@@ -1,50 +0,0 @@
-{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.operation_config;
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis.0}}
-import {{modelPackage}}.*;
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis}}
-{{#imports}}import {{import}};
-{{/imports}}
-{{/apis}}
-{{/apiInfo}}
-
-import java.util.HashMap;
-import java.util.Map;
-
-// Generic type for object "keyed" by operation names
-{{>generatedAnnotation}}
-@lombok.Builder @lombok.Getter
-public class OperationConfig<T> {
-    {{#apiInfo}}
-    {{#apis}}
-    {{#operations}}
-    {{#operation}}
-    private T {{nickname}};
-    {{/operation}}
-    {{/operations}}
-    {{/apis}}
-    {{/apiInfo}}
-
-    public Map<String, T> asMap() {
-        Map<String, T> map = new HashMap<>();
-        {{#apiInfo}}
-        {{#apis}}
-        {{#operations}}
-        {{#operation}}
-        map.put("{{nickname}}", this.{{nickname}});
-        {{/operation}}
-        {{/operations}}
-        {{/apis}}
-        {{/apiInfo}}
-        return map;
-    }
-}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/operationLookup.mustache b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/operationLookup.mustache
deleted file mode 100644
index f638a7925..000000000
--- a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/operationLookup.mustache
+++ /dev/null
@@ -1,58 +0,0 @@
-{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.operation_config;
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis.0}}
-import {{modelPackage}}.*;
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis}}
-{{#imports}}import {{import}};
-{{/imports}}
-{{/apis}}
-{{/apiInfo}}
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import java.util.Arrays;
-
-
-// Look up path and http method for a given operation name
-{{>generatedAnnotation}}
-public class OperationLookup {
-    @lombok.Builder @lombok.Getter
-    public static class OperationLookupEntry {
-        private String method;
-        private String path;
-        private List<String> contentTypes;
-    }
-
-    /**
-     * Returns the operation lookup information for the TypeSafeRestApi construct
-     */
-    public static Map<String, OperationLookupEntry> getOperationLookup() {
-        final Map<String, OperationLookupEntry> config = new HashMap<>();
-
-        {{#apiInfo}}
-        {{#apis}}
-        {{#operations}}
-        {{#operation}}
-        config.put("{{nickname}}", OperationLookupEntry.builder()
-            .path("{{path}}")
-            .method("{{httpMethod}}")
-            .contentTypes(Arrays.asList({{^consumes}}"application/json"{{/consumes}}{{#consumes}}{{#mediaType}}"{{{.}}}"{{^-last}},{{/-last}}{{/mediaType}}{{/consumes}}))
-            .build());
-        {{/operation}}
-        {{/operations}}
-        {{/apis}}
-        {{/apiInfo}}
-
-        return config;
-    }
-}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/handlers.mustache b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/handlers.ejs
similarity index 70%
rename from packages/type-safe-api/scripts/type-safe-api/generators/java/templates/handlers.mustache
rename to packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/handlers.ejs
index 90eec5589..0ebb093c2 100644
--- a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/handlers.mustache
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/handlers.ejs
@@ -1,23 +1,15 @@
-###TSAPI_SPLIT_FILE###
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "Handlers",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis.0}}
-import {{modelPackage}}.*;
-import {{package}}.interceptors.ResponseHeadersInterceptor;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
+
+import <%- metadata.packageName %>.model.*;
+import <%- metadata.packageName %>.api.interceptors.ResponseHeadersInterceptor;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -46,20 +38,8 @@ import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-{{#apiInfo}}
-{{#apis}}
-{{#imports}}import {{import}};
-{{/imports}}
-{{/apis}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis.0}}
-import {{invokerPackage}}.JSON;
-{{/apis.0}}
-{{/apiInfo}}
+import <%- metadata.packageName %>.JSON;
 
-{{>generatedAnnotation}}
 public class Handlers {
 
     static {
@@ -431,16 +411,13 @@ public class Handlers {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "Response",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
 
 import java.util.Map;
 import java.util.List;
@@ -468,16 +445,13 @@ public interface Response {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "ApiResponse",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
 
 import java.util.Map;
 import java.util.List;
@@ -493,16 +467,13 @@ public class ApiResponse implements Response {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "Interceptor",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
 
 /**
  * Interceptors can perform generic operations on requests and/or responses, optionally delegating to the remainder
@@ -517,16 +488,13 @@ public interface Interceptor<TInput> {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "Interceptors",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -544,16 +512,13 @@ public @interface Interceptors {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "HandlerChain",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
 /**
  * A handler chain represents a series of interceptors, which may or may not delegate to following interceptors.
  * The lambda handler is always the last method in the chain.
@@ -566,16 +531,13 @@ public interface HandlerChain<TInput> {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "RequestInput",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
 
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.Context;
@@ -605,16 +567,13 @@ public interface RequestInput<TInput> {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "ChainedRequestInput",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
 
 /**
  * Reqeust input with a handler chain
@@ -627,16 +586,13 @@ public interface ChainedRequestInput<TInput> extends RequestInput<TInput> {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "InterceptorWarmupChainedRequestInput",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
 
 import com.amazonaws.services.lambda.runtime.ClientContext;
 import com.amazonaws.services.lambda.runtime.CognitoIdentity;
@@ -762,16 +718,13 @@ public class InterceptorWarmupChainedRequestInput<T> implements ChainedRequestIn
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "InterceptorWithWarmup",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
 
 import org.crac.Resource;
 import org.crac.Core;
@@ -804,69 +757,46 @@ public abstract class InterceptorWithWarmup<TInput> implements Interceptor<TInpu
         this.handle(new InterceptorWarmupChainedRequestInput<>());
     }
 }
-{{#apiInfo}}
-{{#apis}}
-{{#operations}}
-{{#operation}}
+<%_ allOperations.forEach((operation) => { _%>
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers/{{operationIdSnakeCase}}",
-  "name": "{{operationIdCamelCase}}Response",
+  "dir": "<%- metadata.srcDir %>/api/handlers/<%- operation.operationIdSnakeCase %>",
+  "name": "<%- operation.operationIdPascalCase %>Response",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers.{{operationIdSnakeCase}};
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers.<%- operation.operationIdSnakeCase %>;
 
-import {{package}}.handlers.Response;
+import <%- metadata.packageName %>.api.handlers.Response;
 
 /**
- * Response for the {{nickname}} operation
+ * Response for the <%- operation.name %> operation
  */
-public interface {{operationIdCamelCase}}Response extends Response {}
-{{/operation}}
-{{/operations}}
-{{/apis}}
-{{/apiInfo}}
-{{#apiInfo}}
-{{#apis}}
-{{#operations}}
-{{#operation}}
-{{#responses}}
+public interface <%- operation.operationIdPascalCase %>Response extends Response {}
+<%_ }); _%>
+<%_ allOperations.forEach((operation) => { _%>
+<%_ operation.responses.forEach((response) => { _%>
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers/{{operationIdSnakeCase}}",
-  "name": "{{operationIdCamelCase}}{{code}}Response",
+  "dir": "<%- metadata.srcDir %>/api/handlers/<%- operation.operationIdSnakeCase %>",
+  "name": "<%- operation.operationIdPascalCase %><%- response.code %>Response",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers.{{operationIdSnakeCase}};
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis.0}}
-import {{modelPackage}}.*;
-{{/apis.0}}
-{{/apiInfo}}
-{{#apiInfo}}
-{{#apis.0}}
-import {{invokerPackage}}.JSON;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers.<%- operation.operationIdSnakeCase %>;
+
+import <%- metadata.packageName %>.model.*;
+import <%- metadata.packageName %>.JSON;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
 
 /**
- * Response with status code {{code}} for the {{nickname}} operation
+ * Response with status code <%- response.code %> for the <%- operation.name %> operation
  */
-public class {{operationIdCamelCase}}{{code}}Response extends RuntimeException implements {{operationIdCamelCase}}Response {
+public class <%- operation.operationIdPascalCase %><%- response.code %>Response extends RuntimeException implements <%- operation.operationIdPascalCase %>Response {
     static {
         // JSON has a static instance of Gson which is instantiated lazily the first time it is initialised.
         // Create an instance here if required to ensure that the static Gson instance is always available.
@@ -875,21 +805,22 @@ public class {{operationIdCamelCase}}{{code}}Response extends RuntimeException i
         }
     }
 
+    <%_ const responseType = response.isPrimitive ? 'String' : response.javaType _%>
     private final String body;
-    {{#dataType}}private final {{#isPrimitiveType}}String{{/isPrimitiveType}}{{^isPrimitiveType}}{{.}}{{/isPrimitiveType}} typedBody;{{/dataType}}
+    <% if (response.type !== 'void') { %>private final <%- responseType %> typedBody;<% } %>
     private final Map<String, String> headers;
     private final Map<String, List<String>> multiValueHeaders;
 
-    private {{operationIdCamelCase}}{{code}}Response({{#dataType}}final {{#isPrimitiveType}}String{{/isPrimitiveType}}{{^isPrimitiveType}}{{.}}{{/isPrimitiveType}} body, {{/dataType}}final Map<String, String> headers, final Map<String, List<String>> multiValueHeaders) {
-        {{#dataType}}this.typedBody = body;{{/dataType}}
-        this.body = {{#dataType}}{{#isPrimitiveType}}body{{/isPrimitiveType}}{{^isPrimitiveType}}body.toJson(){{/isPrimitiveType}}{{/dataType}}{{^dataType}}""{{/dataType}};
+    private <%- operation.operationIdPascalCase %><%- response.code %>Response(<% if (response.type !== 'void') { %>final <%- responseType %> body, <% } %>final Map<String, String> headers, final Map<String, List<String>> multiValueHeaders) {
+        <% if (response.type !== 'void') { %>this.typedBody = body;<% } %>
+        this.body = <% if (response.type !== 'void') { %><% if (response.isPrimitive) { %>body<% } else { %>body.toJson()<% } %><% } else { %>""<% } %>;
         this.headers = headers;
         this.multiValueHeaders = multiValueHeaders;
     }
 
     @Override
     public int getStatusCode() {
-        return {{code}};
+        return <%- response.code %>;
     }
 
     @Override
@@ -897,11 +828,11 @@ public class {{operationIdCamelCase}}{{code}}Response extends RuntimeException i
         return this.body;
     }
 
-    {{#dataType}}
-    public {{#isPrimitiveType}}String{{/isPrimitiveType}}{{^isPrimitiveType}}{{.}}{{/isPrimitiveType}} getTypedBody() {
+    <%_ if (response.type !== 'void') { _%>
+    public <%- responseType %> getTypedBody() {
         return this.typedBody;
     }
-    {{/dataType}}
+    <%_ } _%>
 
     @Override
     public Map<String, String> getHeaders() {
@@ -914,53 +845,40 @@ public class {{operationIdCamelCase}}{{code}}Response extends RuntimeException i
     }
 
     /**
-     * Create a {{operationIdCamelCase}}{{code}}Response with{{^dataType}}out{{/dataType}} a body
+     * Create a <%- operation.operationIdPascalCase %><%- response.code %>Response with<% if (response.type === 'void') { %>out<% } %> a body
      */
-    public static {{operationIdCamelCase}}{{code}}Response of({{#dataType}}final {{#isPrimitiveType}}String{{/isPrimitiveType}}{{^isPrimitiveType}}{{.}}{{/isPrimitiveType}} body{{/dataType}}) {
-        return new {{operationIdCamelCase}}{{code}}Response({{#dataType}}body, {{/dataType}}new HashMap<>(), new HashMap<>());
+    public static <%- operation.operationIdPascalCase %><%- response.code %>Response of(<% if (response.type !== 'void') { %>final <%- responseType %> body<% } %>) {
+        return new <%- operation.operationIdPascalCase %><%- response.code %>Response(<% if (response.type !== 'void') { %>body, <% } %>new HashMap<>(), new HashMap<>());
     }
 
     /**
-     * Create a {{operationIdCamelCase}}{{code}}Response with{{^dataType}}out{{/dataType}} a body and headers
+     * Create a <%- operation.operationIdPascalCase %><%- response.code %>Response with<% if (response.type === 'void') { %>out<% } %> a body and headers
      */
-    public static {{operationIdCamelCase}}{{code}}Response of({{#dataType}}final {{#isPrimitiveType}}String{{/isPrimitiveType}}{{^isPrimitiveType}}{{.}}{{/isPrimitiveType}} body, {{/dataType}}final Map<String, String> headers) {
-        return new {{operationIdCamelCase}}{{code}}Response({{#dataType}}body, {{/dataType}}headers, new HashMap<>());
+    public static <%- operation.operationIdPascalCase %><%- response.code %>Response of(<% if (response.type !== 'void') { %>final <%- responseType %> body, <% } %>final Map<String, String> headers) {
+        return new <%- operation.operationIdPascalCase %><%- response.code %>Response(<% if (response.type !== 'void') { %>body, <% } %>headers, new HashMap<>());
     }
 
     /**
-     * Create a {{operationIdCamelCase}}{{code}}Response with{{^dataType}}out{{/dataType}} a body, headers and multi-value headers
+     * Create a <%- operation.operationIdPascalCase %><%- response.code %>Response with<% if (response.type === 'void') { %>out<% } %> a body, headers and multi-value headers
      */
-    public static {{operationIdCamelCase}}{{code}}Response of({{#dataType}}final {{#isPrimitiveType}}String{{/isPrimitiveType}}{{^isPrimitiveType}}{{.}}{{/isPrimitiveType}} body, {{/dataType}}final Map<String, String> headers, final Map<String, List<String>> multiValueHeaders) {
-        return new {{operationIdCamelCase}}{{code}}Response({{#dataType}}body, {{/dataType}}headers, multiValueHeaders);
+    public static <%- operation.operationIdPascalCase %><%- response.code %>Response of(<% if (response.type !== 'void') { %>final <%- responseType %> body, <% } %>final Map<String, String> headers, final Map<String, List<String>> multiValueHeaders) {
+        return new <%- operation.operationIdPascalCase %><%- response.code %>Response(<% if (response.type !== 'void') { %>body, <% } %>headers, multiValueHeaders);
     }
 }
-{{/responses}}
-{{/operation}}
-{{/operations}}
-{{/apis}}
-{{/apiInfo}}
-{{#apiInfo}}
-{{#apis}}
-{{#operations}}
-{{#operation}}
+<%_ }); _%>
+<%_ }); _%>
+<%_ allOperations.forEach((operation) => { _%>
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers/{{operationIdSnakeCase}}",
-  "name": "{{operationIdCamelCase}}RequestParameters",
+  "dir": "<%- metadata.srcDir %>/api/handlers/<%- operation.operationIdSnakeCase %>",
+  "name": "<%- operation.operationIdPascalCase %>RequestParameters",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers.{{operationIdSnakeCase}};
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis.0}}
-import {{package}}.handlers.Handlers;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers.<%- operation.operationIdSnakeCase %>;
+
+import <%- metadata.packageName %>.api.handlers.Handlers;
 import java.util.Optional;
 import java.util.Map;
 import java.util.List;
@@ -969,21 +887,22 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import <%- metadata.packageName %>.model.*;
+
 /**
- * Query, path and header parameters for the {{operationIdCamelCase}} operation
+ * Query, path and header parameters for the <%- operation.operationIdPascalCase %> operation
  */
 @lombok.Builder
 @lombok.AllArgsConstructor
-public class {{operationIdCamelCase}}RequestParameters {
-    {{#allParams}}
-    {{^isBodyParam}}
-    private final {{^required}}Optional<{{/required}}{{{dataType}}}{{^required}}>{{/required}} {{paramName}};
-    {{/isBodyParam}}
-    {{/allParams}}
-
-    public {{operationIdCamelCase}}RequestParameters(final APIGatewayProxyRequestEvent event) {
+public class <%- operation.operationIdPascalCase %>RequestParameters {
+    <%_ operation.parameters.filter(p => p.in !== "body").forEach((parameter) => { _%>
+    private final <% if (!parameter.isRequired) { %>Optional<<% } %><%- parameter.javaType %><% if (!parameter.isRequired) { %>><% } %> <%- parameter.javaName %>;
+    <%_ }); _%>
+
+    public <%- operation.operationIdPascalCase %>RequestParameters(final APIGatewayProxyRequestEvent event) {
         Map<String, String> rawStringParameters = new HashMap<>();
         Handlers.putAllFromNullableMap(event.getPathParameters(), rawStringParameters);
         Handlers.putAllFromNullableMap(event.getQueryStringParameters(), rawStringParameters);
@@ -995,52 +914,31 @@ public class {{operationIdCamelCase}}RequestParameters {
         Handlers.putAllFromNullableMap(event.getMultiValueHeaders(), rawStringArrayParameters);
         Map<String, List<String>> decodedStringArrayParameters = Handlers.decodeRequestArrayParameters(rawStringArrayParameters);
 
-        {{#allParams}}
-        {{^isBodyParam}}
-        this.{{paramName}} = {{^required}}Optional.ofNullable({{/required}}Handlers.coerce{{#isArray}}{{#items}}{{{dataType}}}Array{{/items}}{{/isArray}}{{^isArray}}{{{dataType}}}{{/isArray}}Parameter("{{baseName}}", {{required}}, decodedString{{#isArray}}Array{{/isArray}}Parameters){{^required}}){{/required}};
-        {{/isBodyParam}}
-        {{/allParams}}
+        <%_ operation.parameters.filter(p => p.in !== "body").forEach((parameter) => { _%>
+        this.<%- parameter.javaName %> = <% if (!parameter.isRequired) { %>Optional.ofNullable(<% } %><% if (parameter.isEnum) { %><%- parameter.javaType %>.fromValue(<% } %>Handlers.coerce<% if (parameter.export === "array") { %><%- parameter.link.javaType %>Array<% } else { %><%- parameter.isEnum ? 'String' : parameter.javaType %><% } %>Parameter("<%- parameter.prop %>", <%- !!parameter.isRequired %>, decodedString<% if (parameter.export === "array") { %>Array<% } %>Parameters)<% if (parameter.export === "array" && parameter.link.isEnum) { %>.stream().map(<%- parameter.link.name %>::fromValue).collect(Collectors.toList())<% } %><% if (parameter.isEnum) { %>)<% } %><% if (!parameter.isRequired) { %>)<% } %>;
+        <%_ }); _%>
     }
 
-    {{#allParams}}
-    {{^isBodyParam}}
-    public {{^required}}Optional<{{/required}}{{{dataType}}}{{^required}}>{{/required}} {{#schema}}{{getter}}{{/schema}}() {
-        return this.{{paramName}};
+    <%_ operation.parameters.filter(p => p.in !== "body").forEach((parameter) => { _%>
+    public <% if (!parameter.isRequired) { %>Optional<<% } %><%- parameter.javaType %><% if (!parameter.isRequired) { %>><% } %> <%- include('../getterSetter.partial.ejs', { prefix: 'get', name: parameter.javaName }) %>() {
+        return this.<%- parameter.javaName %>;
     }
-    {{/isBodyParam}}
-    {{/allParams}}
+    <%_ }); _%>
 }
-{{/operation}}
-{{/operations}}
-{{/apis}}
-{{/apiInfo}}
-{{#apiInfo}}
-{{#apis}}
-{{#operations}}
-{{#operation}}
+<%_ }); _%>
+<%_ allOperations.forEach((operation) => { _%>
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers/{{operationIdSnakeCase}}",
-  "name": "{{operationIdCamelCase}}Input",
+  "dir": "<%- metadata.srcDir %>/api/handlers/<%- operation.operationIdSnakeCase %>",
+  "name": "<%- operation.operationIdPascalCase %>Input",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers.{{operationIdSnakeCase}};
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis.0}}
-import {{modelPackage}}.*;
-{{/apis.0}}
-{{/apiInfo}}
-{{#apiInfo}}
-{{#apis.0}}
-import {{invokerPackage}}.JSON;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers.<%- operation.operationIdSnakeCase %>;
+
+import <%- metadata.packageName %>.model.*;
+import <%- metadata.packageName %>.JSON;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Optional;
@@ -1050,11 +948,11 @@ import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import java.io.IOException;
 
 /**
- * Input for the {{nickname}} operation
+ * Input for the <%- operation.name %> operation
  */
 @lombok.Builder
 @lombok.AllArgsConstructor
-public class {{operationIdCamelCase}}Input {
+public class <%- operation.operationIdPascalCase %>Input {
     static {
         // JSON has a static instance of Gson which is instantiated lazily the first time it is initialised.
         // Create an instance here if required to ensure that the static Gson instance is always available.
@@ -1063,68 +961,50 @@ public class {{operationIdCamelCase}}Input {
         }
     }
 
-    private final {{operationIdCamelCase}}RequestParameters requestParameters;
-    {{#bodyParam}}
-    private final {{#isModel}}{{dataType}}{{/isModel}}{{^isModel}}String{{/isModel}} body;
-    {{/bodyParam}}
+    private final <%- operation.operationIdPascalCase %>RequestParameters requestParameters;
+    <%_ if (operation.parametersBody) { _%>
+    private final <%- operation.parametersBody.isPrimitive ? 'String' : operation.parametersBody.javaType %> body;
+    <%_ } _%>
 
-    public {{operationIdCamelCase}}Input(final APIGatewayProxyRequestEvent event) {
-        this.requestParameters = new {{operationIdCamelCase}}RequestParameters(event);
-        {{#bodyParam}}
-        {{#isModel}}
+    public <%- operation.operationIdPascalCase %>Input(final APIGatewayProxyRequestEvent event) {
+        this.requestParameters = new <%- operation.operationIdPascalCase %>RequestParameters(event);
+        <%_ if (operation.parametersBody) { _%>
+        <%_ if (!operation.parametersBody.isPrimitive) { _%>
         try {
-            this.body = {{dataType}}.fromJson(event.getBody());
+            this.body = <%- operation.parametersBody.javaType %>.fromJson(event.getBody());
         } catch (IOException e) {
             throw new RuntimeException(e);
         };
-        {{/isModel}}
-        {{^isModel}}
+        <%_ } else { _%>
         this.body = event.getBody();
-        {{/isModel}}
-        {{/bodyParam}}
+        <%_ } _%>
+        <%_ } _%>
     }
 
-    public {{operationIdCamelCase}}RequestParameters getRequestParameters() {
+    public <%- operation.operationIdPascalCase %>RequestParameters getRequestParameters() {
         return this.requestParameters;
     }
 
-    {{#bodyParam}}
-    public {{#isModel}}{{dataType}}{{/isModel}}{{^isModel}}String{{/isModel}} getBody() {
+    <%_ if (operation.parametersBody) { _%>
+    public <%- operation.parametersBody.isPrimitive ? 'String' : operation.parametersBody.javaType %> getBody() {
         return this.body;
     }
-    {{/bodyParam}}
+    <%_ } _%>
 }
-{{/operation}}
-{{/operations}}
-{{/apis}}
-{{/apiInfo}}
-{{#apiInfo}}
-{{#apis}}
-{{#operations}}
-{{#operation}}
+<%_ }); _%>
+<%_ allOperations.forEach((operation) => { _%>
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers/{{operationIdSnakeCase}}",
-  "name": "{{operationIdCamelCase}}RequestInput",
+  "dir": "<%- metadata.srcDir %>/api/handlers/<%- operation.operationIdSnakeCase %>",
+  "name": "<%- operation.operationIdPascalCase %>RequestInput",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers.{{operationIdSnakeCase}};
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis.0}}
-import {{modelPackage}}.*;
-{{/apis.0}}
-{{/apiInfo}}
-{{#apiInfo}}
-{{#apis.0}}
-import {{package}}.handlers.RequestInput;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers.<%- operation.operationIdSnakeCase %>;
+
+import <%- metadata.packageName %>.model.*;
+import <%- metadata.packageName %>.api.handlers.RequestInput;
 import java.util.List;
 import java.util.Optional;
 import java.util.Map;
@@ -1134,20 +1014,20 @@ import java.io.IOException;
 import com.amazonaws.services.lambda.runtime.Context;
 
 /**
- * Full request input for the {{nickname}} operation, including the raw API Gateway event
+ * Full request input for the <%- operation.name %> operation, including the raw API Gateway event
  */
 @lombok.Builder
 @lombok.AllArgsConstructor
-public class {{operationIdCamelCase}}RequestInput implements RequestInput<{{operationIdCamelCase}}Input> {
+public class <%- operation.operationIdPascalCase %>RequestInput implements RequestInput<<%- operation.operationIdPascalCase %>Input> {
     private final APIGatewayProxyRequestEvent event;
     private final Context context;
     private final Map<String, Object> interceptorContext;
-    private final {{operationIdCamelCase}}Input input;
+    private final <%- operation.operationIdPascalCase %>Input input;
 
     /**
      * Returns the typed request input, with path, query and body parameters
      */
-    public {{operationIdCamelCase}}Input getInput() {
+    public <%- operation.operationIdPascalCase %>Input getInput() {
         return this.input;
     }
 
@@ -1172,40 +1052,23 @@ public class {{operationIdCamelCase}}RequestInput implements RequestInput<{{oper
         return this.interceptorContext;
     }
 }
-{{/operation}}
-{{/operations}}
-{{/apis}}
-{{/apiInfo}}
-{{#apiInfo}}
-{{#apis}}
-{{#operations}}
-{{#operation}}
+<%_ }); _%>
+<%_ allOperations.forEach((operation) => { _%>
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers/{{operationIdSnakeCase}}",
-  "name": "{{operationIdCamelCase}}",
+  "dir": "<%- metadata.srcDir %>/api/handlers/<%- operation.operationIdSnakeCase %>",
+  "name": "<%- operation.operationIdPascalCase %>",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers.{{operationIdSnakeCase}};
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis.0}}
-import {{modelPackage}}.*;
-{{/apis.0}}
-{{/apiInfo}}
-{{#apiInfo}}
-{{#apis.0}}
-import {{invokerPackage}}.JSON;
-import {{package}}.handlers.Interceptor;
-import {{package}}.handlers.Handlers;
-import {{package}}.handlers.*;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers.<%- operation.operationIdSnakeCase %>;
+
+import <%- metadata.packageName %>.model.*;
+import <%- metadata.packageName %>.JSON;
+import <%- metadata.packageName %>.api.handlers.Interceptor;
+import <%- metadata.packageName %>.api.handlers.Handlers;
+import <%- metadata.packageName %>.api.handlers.*;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -1223,50 +1086,50 @@ import org.crac.Resource;
 
 
 /**
- * Lambda handler wrapper for the {{nickname}} operation
+ * Lambda handler wrapper for the <%- operation.name %> operation
  */
-public abstract class {{operationIdCamelCase}} implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent>, Resource {
+public abstract class <%- operation.operationIdPascalCase %> implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent>, Resource {
     {
         Core.getGlobalContext().register(this);
     }
 
     /**
-     * Handle the request for the {{nickname}} operation
+     * Handle the request for the <%- operation.name %> operation
      */
-    public abstract {{operationIdCamelCase}}Response handle(final {{operationIdCamelCase}}RequestInput request);
+    public abstract <%- operation.operationIdPascalCase %>Response handle(final <%- operation.operationIdPascalCase %>RequestInput request);
 
     /**
      * Interceptors that the handler class has been decorated with
      */
-    private List<Interceptor<{{operationIdCamelCase}}Input>> annotationInterceptors = Handlers.getAnnotationInterceptors({{operationIdCamelCase}}.class);
+    private List<Interceptor<<%- operation.operationIdPascalCase %>Input>> annotationInterceptors = Handlers.getAnnotationInterceptors(<%- operation.operationIdPascalCase %>.class);
 
     /**
      * For more complex interceptors that require instantiation with parameters, you may override this method to
      * return a list of instantiated interceptors. For simple interceptors with no need for constructor arguments,
      * prefer the @Interceptors annotation.
      */
-    public List<Interceptor<{{operationIdCamelCase}}Input>> getInterceptors() {
+    public List<Interceptor<<%- operation.operationIdPascalCase %>Input>> getInterceptors() {
         return Collections.emptyList();
     }
 
-    private List<Interceptor<{{operationIdCamelCase}}Input>> getHandlerInterceptors() {
-        List<Interceptor<{{operationIdCamelCase}}Input>> interceptors = new ArrayList<>();
+    private List<Interceptor<<%- operation.operationIdPascalCase %>Input>> getHandlerInterceptors() {
+        List<Interceptor<<%- operation.operationIdPascalCase %>Input>> interceptors = new ArrayList<>();
         interceptors.addAll(annotationInterceptors);
         interceptors.addAll(this.getInterceptors());
         return interceptors;
     }
 
-    private HandlerChain<{{operationIdCamelCase}}Input> buildChain(List<Interceptor<{{operationIdCamelCase}}Input>> interceptors) {
-        return Handlers.buildHandlerChain(interceptors, new HandlerChain<{{operationIdCamelCase}}Input>() {
+    private HandlerChain<<%- operation.operationIdPascalCase %>Input> buildChain(List<Interceptor<<%- operation.operationIdPascalCase %>Input>> interceptors) {
+        return Handlers.buildHandlerChain(interceptors, new HandlerChain<<%- operation.operationIdPascalCase %>Input>() {
             @Override
-            public Response next(ChainedRequestInput<{{operationIdCamelCase}}Input> input) {
-                return handle(new {{operationIdCamelCase}}RequestInput(input.getEvent(), input.getContext(), input.getInterceptorContext(), input.getInput()));
+            public Response next(ChainedRequestInput<<%- operation.operationIdPascalCase %>Input> input) {
+                return handle(new <%- operation.operationIdPascalCase %>RequestInput(input.getEvent(), input.getContext(), input.getInterceptorContext(), input.getInput()));
             }
         });
     }
 
-    private ChainedRequestInput<{{operationIdCamelCase}}Input> buildChainedRequestInput(final APIGatewayProxyRequestEvent event, final Context context, final {{operationIdCamelCase}}Input input, final Map<String, Object> interceptorContext) {
-        return new ChainedRequestInput<{{operationIdCamelCase}}Input>() {
+    private ChainedRequestInput<<%- operation.operationIdPascalCase %>Input> buildChainedRequestInput(final APIGatewayProxyRequestEvent event, final Context context, final <%- operation.operationIdPascalCase %>Input input, final Map<String, Object> interceptorContext) {
+        return new ChainedRequestInput<<%- operation.operationIdPascalCase %>Input>() {
             @Override
             public HandlerChain getChain() {
                 // The chain's next method ignores the chain given as input, and is pre-built to follow the remaining
@@ -1285,7 +1148,7 @@ public abstract class {{operationIdCamelCase}} implements RequestHandler<APIGate
             }
 
             @Override
-            public {{operationIdCamelCase}}Input getInput() {
+            public <%- operation.operationIdPascalCase %>Input getInput() {
                 return input;
             }
 
@@ -1309,7 +1172,7 @@ public abstract class {{operationIdCamelCase}} implements RequestHandler<APIGate
         try {
             // Prime input validation - this will likely fail for the fake event but ensures the code path is optimised
             // ready for a real invocation
-            new {{operationIdCamelCase}}Input(new APIGatewayProxyRequestEvent()
+            new <%- operation.operationIdPascalCase %>Input(new APIGatewayProxyRequestEvent()
                     .withBody("{}")
                     .withPathParameters(new HashMap<>())
                     .withQueryStringParameters(new HashMap<>())
@@ -1343,30 +1206,30 @@ public abstract class {{operationIdCamelCase}} implements RequestHandler<APIGate
 
     private Map<String, String> getErrorResponseHeaders(final int statusCode) {
         Map<String, String> headers = new HashMap<>();
-        {{#responses}}
-        {{^is2xx}}
-        if (statusCode == {{code}} && "{{dataType}}".endsWith("ResponseContent")) {
-            headers.put("x-amzn-errortype", "{{dataType}}".substring(0, "{{dataType}}".length() - "ResponseContent".length()));
+        <%_ operation.responses.forEach((response) => { _%>
+        <%_ if (response.code < 200 || response.code >= 300) { _%>
+        if (statusCode == <%- response.code %> && "<%- response.javaType %>".endsWith("ResponseContent")) {
+            headers.put("x-amzn-errortype", "<%- response.javaType %>".substring(0, "<%- response.javaType %>".length() - "ResponseContent".length()));
         }
-        {{/is2xx}}
-        {{/responses}}
+        <%_ } _%>
+        <%_ }); _%>
         return headers;
     }
 
-    public APIGatewayProxyResponseEvent handleRequestWithAdditionalInterceptors(final APIGatewayProxyRequestEvent event, final Context context, final List<Interceptor<{{operationIdCamelCase}}Input>> additionalInterceptors) {
+    public APIGatewayProxyResponseEvent handleRequestWithAdditionalInterceptors(final APIGatewayProxyRequestEvent event, final Context context, final List<Interceptor<<%- operation.operationIdPascalCase %>Input>> additionalInterceptors) {
         final Map<String, Object> interceptorContext = new HashMap<>();
-        interceptorContext.put("operationId", "{{nickname}}");
+        interceptorContext.put("operationId", "<%- operation.name %>");
 
-        List<Interceptor<{{operationIdCamelCase}}Input>> interceptors = new ArrayList<>();
+        List<Interceptor<<%- operation.operationIdPascalCase %>Input>> interceptors = new ArrayList<>();
         interceptors.addAll(additionalInterceptors);
         interceptors.addAll(this.getHandlerInterceptors());
 
         final HandlerChain chain = this.buildChain(interceptors);
 
-        {{operationIdCamelCase}}Input input;
+        <%- operation.operationIdPascalCase %>Input input;
 
         try {
-            input = new {{operationIdCamelCase}}Input(event);
+            input = new <%- operation.operationIdPascalCase %>Input(event);
         } catch (RuntimeException e) {
             Map<String, String> headers = new HashMap<>();
             headers.putAll(Handlers.extractResponseHeadersFromInterceptors(interceptors));
@@ -1390,39 +1253,23 @@ public abstract class {{operationIdCamelCase}} implements RequestHandler<APIGate
                 .withBody(response.getBody());
     }
 }
-{{/operation}}
-{{/operations}}
-{{/apis}}
-{{/apiInfo}}
+<%_ }); _%>
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/handlers",
+  "dir": "<%- metadata.srcDir %>/api/handlers",
   "name": "HandlerRouter",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.handlers;
-{{/apis.0}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis}}
-{{#operations}}
-{{#operation}}
-import {{package}}.handlers.{{operationIdSnakeCase}}.*;
-{{/operation}}
-{{/operations}}
-{{/apis}}
-{{/apiInfo}}
-
-{{#apiInfo}}
-{{#apis.0}}
-import {{package}}.handlers.Handlers;
-import {{package}}.handlers.*;
-{{/apis.0}}
-{{/apiInfo}}
+###/TSAPI_WRITE_FILE###
+package <%- metadata.packageName %>.api.handlers;
+
+<%_ allOperations.forEach((operation) => { _%>
+import <%- metadata.packageName %>.api.handlers.<%- operation.operationIdSnakeCase %>.*;
+<%_ }); _%>
+
+import <%- metadata.packageName %>.api.handlers.Handlers;
+import <%- metadata.packageName %>.api.handlers.*;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
@@ -1437,49 +1284,25 @@ import java.util.Collections;
 
 
 public abstract class HandlerRouter implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
-    {{#apiInfo}}
-    {{#apis}}
-    {{#operations}}
-    {{#operation}}
-    private static final String {{nickname}}MethodAndPath = Handlers.concatMethodAndPath("{{httpMethod}}", "{{path}}");
-    {{/operation}}
-    {{/operations}}
-    {{/apis}}
-    {{/apiInfo}}
-
-    {{#apiInfo}}
-    {{#apis}}
-    {{#operations}}
-    {{#operation}}
-    private final {{operationIdCamelCase}} constructed{{operationIdCamelCase}};
-    {{/operation}}
-    {{/operations}}
-    {{/apis}}
-    {{/apiInfo}}
-
-    {{#apiInfo}}
-    {{#apis}}
-    {{#operations}}
-    {{#operation}}
+    <%_ allOperations.forEach((operation) => { _%>
+    private static final String <%- operation.name %>MethodAndPath = Handlers.concatMethodAndPath("<%- operation.method %>", "<%- operation.path %>");
+    <%_ }); _%>
+
+    <%_ allOperations.forEach((operation) => { _%>
+    private final <%- operation.operationIdPascalCase %> constructed<%- operation.operationIdPascalCase %>;
+    <%_ }); _%>
+
+    <%_ allOperations.forEach((operation) => { _%>
     /**
-     * This method must return your implementation of the {{operationIdCamelCase}} operation
+     * This method must return your implementation of the <%- operation.operationIdPascalCase %> operation
      */
-    public abstract {{operationIdCamelCase}} {{nickname}}();
-    {{/operation}}
-    {{/operations}}
-    {{/apis}}
-    {{/apiInfo}}
+    public abstract <%- operation.operationIdPascalCase %> <%- operation.name %>();
+    <%_ }); _%>
 
     private static enum Route {
-        {{#apiInfo}}
-        {{#apis}}
-        {{#operations}}
-        {{#operation}}
-        {{nickname}}Route,
-        {{/operation}}
-        {{/operations}}
-        {{/apis}}
-        {{/apiInfo}}
+        <%_ allOperations.forEach((operation) => { _%>
+        <%- operation.name %>Route,
+        <%_ }); _%>
     }
 
     /**
@@ -1488,27 +1311,15 @@ public abstract class HandlerRouter implements RequestHandler<APIGatewayProxyReq
     private final Map<String, Route> routes = new HashMap<>();
 
     public HandlerRouter() {
-        {{#apiInfo}}
-        {{#apis}}
-        {{#operations}}
-        {{#operation}}
-        this.routes.put({{nickname}}MethodAndPath, Route.{{nickname}}Route);
-        {{/operation}}
-        {{/operations}}
-        {{/apis}}
-        {{/apiInfo}}
+        <%_ allOperations.forEach((operation) => { _%>
+        this.routes.put(<%- operation.name %>MethodAndPath, Route.<%- operation.name %>Route);
+        <%_ }); _%>
         // Handlers are all constructed in the router's constructor such that lambda behaviour remains consistent;
         // ie resources created in the constructor remain in memory between invocations.
         // https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
-        {{#apiInfo}}
-        {{#apis}}
-        {{#operations}}
-        {{#operation}}
-        this.constructed{{operationIdCamelCase}} = this.{{nickname}}();
-        {{/operation}}
-        {{/operations}}
-        {{/apis}}
-        {{/apiInfo}}
+        <%_ allOperations.forEach((operation) => { _%>
+        this.constructed<%- operation.operationIdPascalCase %> = this.<%- operation.name %>();
+        <%_ }); _%>
     }
 
     /**
@@ -1528,18 +1339,12 @@ public abstract class HandlerRouter implements RequestHandler<APIGatewayProxyReq
         Route route = this.routes.get(methodAndPath);
 
         switch (route) {
-            {{#apiInfo}}
-            {{#apis}}
-            {{#operations}}
-            {{#operation}}
-            case {{nickname}}Route:
-                List<Interceptor<{{operationIdCamelCase}}Input>> {{nickname}}Interceptors = Handlers.getAnnotationInterceptors(this.getClass());
-                {{nickname}}Interceptors.addAll(this.getInterceptors());
-                return this.constructed{{operationIdCamelCase}}.handleRequestWithAdditionalInterceptors(event, context, {{nickname}}Interceptors);
-            {{/operation}}
-            {{/operations}}
-            {{/apis}}
-            {{/apiInfo}}
+            <%_ allOperations.forEach((operation) => { _%>
+            case <%- operation.name %>Route:
+                List<Interceptor<<%- operation.operationIdPascalCase %>Input>> <%- operation.name %>Interceptors = Handlers.getAnnotationInterceptors(this.getClass());
+                <%- operation.name %>Interceptors.addAll(this.getInterceptors());
+                return this.constructed<%- operation.operationIdPascalCase %>.handleRequestWithAdditionalInterceptors(event, context, <%- operation.name %>Interceptors);
+            <%_ }); _%>
             default:
                 throw new RuntimeException(String.format("No registered handler for method {} and path {}", method, path));
         }
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/interceptors.mustache b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/interceptors.ejs
similarity index 77%
rename from packages/type-safe-api/scripts/type-safe-api/generators/java/templates/interceptors.mustache
rename to packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/interceptors.ejs
index cc07be105..4fdb12988 100644
--- a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/interceptors.mustache
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/interceptors.ejs
@@ -1,18 +1,17 @@
-###TSAPI_SPLIT_FILE###
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/interceptors",
+  "dir": "<%- metadata.srcDir %>/api/interceptors",
   "name": "TryCatchInterceptor",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}{{#apis.0}}package {{package}}.interceptors;{{/apis.0}}{{/apiInfo}}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>.api.interceptors;
 
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.ApiResponse;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.ChainedRequestInput;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Response;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Interceptor;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.InterceptorWithWarmup;
+import <%- metadata.packageName %>.api.handlers.ApiResponse;
+import <%- metadata.packageName %>.api.handlers.ChainedRequestInput;
+import <%- metadata.packageName %>.api.handlers.Response;
+import <%- metadata.packageName %>.api.handlers.Interceptor;
+import <%- metadata.packageName %>.api.handlers.InterceptorWithWarmup;
 import org.apache.logging.log4j.Logger;
 
 /**
@@ -57,17 +56,17 @@ public class TryCatchInterceptor<Input> extends InterceptorWithWarmup<Input> {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/interceptors",
+  "dir": "<%- metadata.srcDir %>/api/interceptors",
   "name": "ResponseHeadersInterceptor",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}{{#apis.0}}package {{package}}.interceptors;{{/apis.0}}{{/apiInfo}}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>.api.interceptors;
 
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.ChainedRequestInput;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Response;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Interceptor;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.InterceptorWithWarmup;
+import <%- metadata.packageName %>.api.handlers.ChainedRequestInput;
+import <%- metadata.packageName %>.api.handlers.Response;
+import <%- metadata.packageName %>.api.handlers.Interceptor;
+import <%- metadata.packageName %>.api.handlers.InterceptorWithWarmup;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -101,18 +100,18 @@ public class ResponseHeadersInterceptor<Input> extends InterceptorWithWarmup<Inp
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/interceptors/powertools",
+  "dir": "<%- metadata.srcDir %>/api/interceptors/powertools",
   "name": "LoggingInterceptor",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}{{#apis.0}}package {{package}}.interceptors.powertools;{{/apis.0}}{{/apiInfo}}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>.api.interceptors.powertools;
 
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.ChainedRequestInput;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.RequestInput;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Response;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Interceptor;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.InterceptorWithWarmup;
+import <%- metadata.packageName %>.api.handlers.ChainedRequestInput;
+import <%- metadata.packageName %>.api.handlers.RequestInput;
+import <%- metadata.packageName %>.api.handlers.Response;
+import <%- metadata.packageName %>.api.handlers.Interceptor;
+import <%- metadata.packageName %>.api.handlers.InterceptorWithWarmup;
 import com.amazonaws.services.lambda.runtime.Context;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -186,17 +185,17 @@ public class LoggingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/interceptors/powertools",
+  "dir": "<%- metadata.srcDir %>/api/interceptors/powertools",
   "name": "TracingInterceptor",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}{{#apis.0}}package {{package}}.interceptors.powertools;{{/apis.0}}{{/apiInfo}}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>.api.interceptors.powertools;
 
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.ChainedRequestInput;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Response;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Interceptor;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.InterceptorWithWarmup;
+import <%- metadata.packageName %>.api.handlers.ChainedRequestInput;
+import <%- metadata.packageName %>.api.handlers.Response;
+import <%- metadata.packageName %>.api.handlers.Interceptor;
+import <%- metadata.packageName %>.api.handlers.InterceptorWithWarmup;
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.AWSXRayRecorderBuilder;
 import com.amazonaws.xray.entities.Subsegment;
@@ -290,18 +289,18 @@ public class TracingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/interceptors/powertools",
+  "dir": "<%- metadata.srcDir %>/api/interceptors/powertools",
   "name": "MetricsInterceptor",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}{{#apis.0}}package {{package}}.interceptors.powertools;{{/apis.0}}{{/apiInfo}}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>.api.interceptors.powertools;
 
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.ChainedRequestInput;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.RequestInput;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Response;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Interceptor;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.InterceptorWithWarmup;
+import <%- metadata.packageName %>.api.handlers.ChainedRequestInput;
+import <%- metadata.packageName %>.api.handlers.RequestInput;
+import <%- metadata.packageName %>.api.handlers.Response;
+import <%- metadata.packageName %>.api.handlers.Interceptor;
+import <%- metadata.packageName %>.api.handlers.InterceptorWithWarmup;
 import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
 import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
 import software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor;
@@ -351,17 +350,17 @@ public class MetricsInterceptor<Input> extends InterceptorWithWarmup<Input> {
 }
 ###TSAPI_WRITE_FILE###
 {
-  "dir": "api/interceptors",
+  "dir": "<%- metadata.srcDir %>/api/interceptors",
   "name": "DefaultInterceptors",
   "ext": ".java",
   "overwrite": true
 }
-###/TSAPI_WRITE_FILE###{{#apiInfo}}{{#apis.0}}package {{package}}.interceptors;{{/apis.0}}{{/apiInfo}}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>.api.interceptors;
 
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.interceptors.powertools.LoggingInterceptor;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.interceptors.powertools.MetricsInterceptor;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.interceptors.powertools.TracingInterceptor;
-import {{#apiInfo}}{{#apis.0}}{{package}}{{/apis.0}}{{/apiInfo}}.handlers.Interceptor;
+import <%- metadata.packageName %>.api.interceptors.powertools.LoggingInterceptor;
+import <%- metadata.packageName %>.api.interceptors.powertools.MetricsInterceptor;
+import <%- metadata.packageName %>.api.interceptors.powertools.TracingInterceptor;
+import <%- metadata.packageName %>.api.handlers.Interceptor;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/operationConfig.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/operationConfig.ejs
new file mode 100644
index 000000000..4ec3762dd
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/operationConfig.ejs
@@ -0,0 +1,30 @@
+
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>/api/operation_config",
+  "name": "OperationConfig",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>.api.operation_config;
+
+import <%- metadata.packageName %>.model.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+// Generic type for object "keyed" by operation names
+@lombok.Builder @lombok.Getter
+public class OperationConfig<T> {
+    <%_ allOperations.forEach((operation) => { _%>
+    private T <%- operation.name %>;
+    <%_ }); _%>
+
+    public Map<String, T> asMap() {
+        Map<String, T> map = new HashMap<>();
+        <%_ allOperations.forEach((operation) => { _%>
+        map.put("<%- operation.name %>", this.<%- operation.name %>);
+        <%_ }); _%>
+        return map;
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/operationLookup.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/operationLookup.ejs
new file mode 100644
index 000000000..af306fe70
--- /dev/null
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/operationLookup.ejs
@@ -0,0 +1,43 @@
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>/api/operation_config",
+  "name": "OperationLookup",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>.api.operation_config;
+
+import <%- metadata.packageName %>.model.*;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+import java.util.Arrays;
+
+
+// Look up path and http method for a given operation name
+public class OperationLookup {
+    @lombok.Builder @lombok.Getter
+    public static class OperationLookupEntry {
+        private String method;
+        private String path;
+        private List<String> contentTypes;
+    }
+
+    /**
+     * Returns the operation lookup information for the TypeSafeRestApi construct
+     */
+    public static Map<String, OperationLookupEntry> getOperationLookup() {
+        final Map<String, OperationLookupEntry> config = new HashMap<>();
+
+        <%_ allOperations.forEach((operation) => { _%>
+        config.put("<%- operation.name %>", OperationLookupEntry.builder()
+            .path("<%- operation.path %>")
+            .method("<%- operation.method %>")
+            .contentTypes(Arrays.asList(<%- operation.parametersBody ? operation.parametersBody.mediaTypes.map(m => `"${m}"`).join(',') : '"application/json"' %>))
+            .build());
+        <%_ }); _%>
+
+        return config;
+    }
+}
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/operations.mustache b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/operations.ejs
similarity index 53%
rename from packages/type-safe-api/scripts/type-safe-api/generators/java/templates/operations.mustache
rename to packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/operations.ejs
index e3b908a14..f8498fe59 100644
--- a/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/operations.mustache
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/java/templates/server/operations.ejs
@@ -1,10 +1,12 @@
-{{#apiInfo}}
-{{#apis.0}}
-package {{package}}.operation_config;
-{{/apis.0}}
-{{/apiInfo}}
+###TSAPI_WRITE_FILE###
+{
+  "dir": "<%- metadata.srcDir %>/api/operation_config",
+  "name": "Operations",
+  "ext": ".java",
+  "overwrite": true
+}
+###/TSAPI_WRITE_FILE###package <%- metadata.packageName %>.api.operation_config;
 
-{{>generatedAnnotation}}
 public class Operations {
     /**
      * Returns an OperationConfig Builder with all values populated with the given value.
@@ -13,15 +15,9 @@ public class Operations {
      */
     public static <T> OperationConfig.OperationConfigBuilder<T> all(final T value) {
         return OperationConfig.<T>builder()
-                {{#apiInfo}}
-                {{#apis}}
-                {{#operations}}
-                {{#operation}}
-                .{{nickname}}(value)
-                {{/operation}}
-                {{/operations}}
-                {{/apis}}
-                {{/apiInfo}}
+                <%_ allOperations.forEach((operation) => { _%>
+                .<%- operation.name %>(value)
+                <%_ }); _%>
                 ;
     }
 }
diff --git a/packages/type-safe-api/scripts/type-safe-api/generators/python/templates/types/pydanticType.partial.ejs b/packages/type-safe-api/scripts/type-safe-api/generators/python/templates/types/pydanticType.partial.ejs
index 3855e3d91..5b67b6a04 100644
--- a/packages/type-safe-api/scripts/type-safe-api/generators/python/templates/types/pydanticType.partial.ejs
+++ b/packages/type-safe-api/scripts/type-safe-api/generators/python/templates/types/pydanticType.partial.ejs
@@ -60,12 +60,12 @@ const toPythonPydanticType = (property) => {
     case "reference":
       return toPythonPydanticPrimitive(property);
     case "array": {
-      const type = `List[${property.link ? toPythonPydanticType(property.link) : property.type}]`;
+      const type = `List[${property.link && property.link.export !== "enum" ? toPythonPydanticType(property.link) : property.type}]`;
       const constraints = getPythonPydanticConstraints(property);
       return constraints ? renderPydanticConstraintsType(type, constraints) : type;
     }
     case "dictionary":
-      return `Dict[str, ${property.link ? toPythonPydanticType(property.link) : property.type}]`;
+      return `Dict[str, ${property.link && property.link.export !== "enum" ? toPythonPydanticType(property.link) : property.type}]`;
     default:
       // "any" has export = interface
       if (property.isPrimitive) {
diff --git a/packages/type-safe-api/src/project/codegen/runtime/generated-java-async-runtime-project.ts b/packages/type-safe-api/src/project/codegen/runtime/generated-java-async-runtime-project.ts
index 72e98e07f..046eb514f 100644
--- a/packages/type-safe-api/src/project/codegen/runtime/generated-java-async-runtime-project.ts
+++ b/packages/type-safe-api/src/project/codegen/runtime/generated-java-async-runtime-project.ts
@@ -5,7 +5,8 @@ import {
   GeneratedJavaRuntimeBaseProject,
   GeneratedJavaRuntimeBaseProjectOptions,
 } from "./generated-java-runtime-base-project";
-import { GenerationOptions, OtherGenerators } from "../components/utils";
+import { Language } from "../../languages";
+import { CodegenOptions } from "../components/utils";
 
 /**
  * Configuration for the generated java runtime project
@@ -21,32 +22,25 @@ export class GeneratedJavaAsyncRuntimeProject extends GeneratedJavaRuntimeBasePr
     super(options);
   }
 
-  protected buildOpenApiGeneratorOptions(): GenerationOptions {
+  protected buildCodegenOptions(): CodegenOptions {
     return {
-      generator: "java",
       specPath: this.options.specPath,
-      generatorDirectory: OtherGenerators.JAVA_ASYNC_RUNTIME,
-      additionalProperties: {
-        useSingleRequestParameter: "true",
+      templateDirs: [
+        // TODO: when implemented, swap to OtherGenerators.JAVA_ASYNC_RUNTIME and "java/templates/client/models"
+        Language.JAVA,
+      ],
+      metadata: {
         groupId: this.pom.groupId,
         artifactId: this.pom.artifactId,
         artifactVersion: this.pom.version,
-        invokerPackage: this.packageName,
-        apiPackage: `${this.packageName}.api`,
-        modelPackage: `${this.packageName}.model`,
-        hideGenerationTimestamp: "true",
-        additionalModelTypeAnnotations: [
-          "@lombok.AllArgsConstructor",
-          // Regular lombok builder is not used since an abstract base schema class is also annotated
-          "@lombok.experimental.SuperBuilder",
-        ].join("\\ "),
+        packageName: this.packageName,
+        srcDir: path.join(
+          "src",
+          "main",
+          "java",
+          ...this.packageName.split(".")
+        ),
       },
-      srcDir: path.join("src", "main", "java", ...this.packageName.split(".")),
-      normalizers: {
-        KEEP_ONLY_FIRST_TAG_IN_OPERATION: true,
-      },
-      // Do not generate map/list types. Generator will use built in HashMap, ArrayList instead
-      generateAliasAsModel: false,
     };
   }
 }
diff --git a/packages/type-safe-api/src/project/codegen/runtime/generated-java-runtime-base-project.ts b/packages/type-safe-api/src/project/codegen/runtime/generated-java-runtime-base-project.ts
index 3f263dba2..fa86f5768 100644
--- a/packages/type-safe-api/src/project/codegen/runtime/generated-java-runtime-base-project.ts
+++ b/packages/type-safe-api/src/project/codegen/runtime/generated-java-runtime-base-project.ts
@@ -6,14 +6,11 @@ import {
   CodeGenerationSourceOptions,
   GeneratedJavaRuntimeOptions,
 } from "../../types";
-import { OpenApiGeneratorIgnoreFile } from "../components/open-api-generator-ignore-file";
-import { OpenApiToolsJsonFile } from "../components/open-api-tools-json-file";
 import { TypeSafeApiCommandEnvironment } from "../components/type-safe-api-command-environment";
 import {
-  buildCleanOpenApiGeneratedCodeCommand,
-  buildInvokeOpenApiGeneratorCommandArgs,
+  buildCodegenCommandArgs,
   buildTypeSafeApiExecCommand,
-  GenerationOptions,
+  CodegenOptions,
   TypeSafeApiScript,
 } from "../components/utils";
 
@@ -59,26 +56,6 @@ const TEST_DEPENDENCIES: string[] = [
  * Java project containing types generated using OpenAPI Generator CLI
  */
 export abstract class GeneratedJavaRuntimeBaseProject extends JavaProject {
-  /**
-   * Patterns that are excluded from code generation
-   */
-  public static openApiIgnorePatterns: string[] = [
-    "pom.xml",
-    "gradle",
-    "gradle/**/*",
-    "gradlew",
-    "gradle.properties",
-    "gradlew.bat",
-    "build.gradle",
-    "settings.gradle",
-    "build.sbt",
-    ".travis.yml",
-    "git_push.sh",
-    "src/test",
-    "src/test/**/*",
-    "src/main/AndroidManifest.xml",
-  ];
-
   /**
    * The package name, for use in imports
    */
@@ -89,8 +66,6 @@ export abstract class GeneratedJavaRuntimeBaseProject extends JavaProject {
    */
   protected readonly options: GeneratedJavaRuntimeBaseProjectOptions;
 
-  protected readonly openapiGeneratorIgnore: OpenApiGeneratorIgnoreFile;
-
   constructor(options: GeneratedJavaRuntimeBaseProjectOptions) {
     super({
       ...(options as any),
@@ -100,17 +75,6 @@ export abstract class GeneratedJavaRuntimeBaseProject extends JavaProject {
     TypeSafeApiCommandEnvironment.ensure(this);
     this.options = options;
 
-    // Ignore files that we will control via projen
-    this.openapiGeneratorIgnore = new OpenApiGeneratorIgnoreFile(this);
-    this.openapiGeneratorIgnore.addPatterns(
-      ...GeneratedJavaRuntimeBaseProject.openApiIgnorePatterns
-    );
-
-    // Add OpenAPI Generator cli configuration
-    OpenApiToolsJsonFile.ensure(this).addOpenApiGeneratorCliConfig(
-      options.openApiGeneratorCliConfig
-    );
-
     // Add dependencies
     DEPENDENCIES.forEach((dep) => this.addDependency(dep));
     TEST_DEPENDENCIES.forEach((dep) => this.addTestDependency(dep));
@@ -126,10 +90,9 @@ export abstract class GeneratedJavaRuntimeBaseProject extends JavaProject {
 
     // Generate the java code
     const generateTask = this.addTask("generate");
-    generateTask.exec(buildCleanOpenApiGeneratedCodeCommand());
     generateTask.exec(
       buildTypeSafeApiExecCommand(
-        TypeSafeApiScript.GENERATE,
+        TypeSafeApiScript.GENERATE_NEXT,
         this.buildGenerateCommandArgs()
       )
     );
@@ -138,23 +101,14 @@ export abstract class GeneratedJavaRuntimeBaseProject extends JavaProject {
 
     if (!options.commitGeneratedCode) {
       // Ignore all the generated code
-      this.gitignore.addPatterns(
-        "src",
-        "docs",
-        "api",
-        "README.md",
-        ".openapi-generator"
-      );
-    } else {
-      this.gitignore.addPatterns(".openapi-generator");
+      this.gitignore.addPatterns("src", "docs", "api", "README.md");
     }
+    this.gitignore.addPatterns(".openapi-generator", ".tsapi-manifest");
   }
 
   public buildGenerateCommandArgs = () => {
-    return buildInvokeOpenApiGeneratorCommandArgs(
-      this.buildOpenApiGeneratorOptions()
-    );
+    return buildCodegenCommandArgs(this.buildCodegenOptions());
   };
 
-  protected abstract buildOpenApiGeneratorOptions(): GenerationOptions;
+  protected abstract buildCodegenOptions(): CodegenOptions;
 }
diff --git a/packages/type-safe-api/src/project/codegen/runtime/generated-java-runtime-project.ts b/packages/type-safe-api/src/project/codegen/runtime/generated-java-runtime-project.ts
index 6c6655b18..ff79c5636 100644
--- a/packages/type-safe-api/src/project/codegen/runtime/generated-java-runtime-project.ts
+++ b/packages/type-safe-api/src/project/codegen/runtime/generated-java-runtime-project.ts
@@ -6,7 +6,7 @@ import {
   GeneratedJavaRuntimeBaseProjectOptions,
 } from "./generated-java-runtime-base-project";
 import { Language } from "../../languages";
-import { GenerationOptions } from "../components/utils";
+import { CodegenOptions } from "../components/utils";
 
 /**
  * Configuration for the generated java runtime project
@@ -22,32 +22,25 @@ export class GeneratedJavaRuntimeProject extends GeneratedJavaRuntimeBaseProject
     super(options);
   }
 
-  protected buildOpenApiGeneratorOptions(): GenerationOptions {
+  protected buildCodegenOptions(): CodegenOptions {
     return {
-      generator: "java",
       specPath: this.options.specPath,
-      generatorDirectory: Language.JAVA,
-      additionalProperties: {
-        useSingleRequestParameter: "true",
+      templateDirs: [
+        // TODO: when implemented, swap to OtherGenerators.JAVA_ASYNC_RUNTIME and "java/templates/client/models"
+        Language.JAVA,
+      ],
+      metadata: {
         groupId: this.pom.groupId,
         artifactId: this.pom.artifactId,
         artifactVersion: this.pom.version,
-        invokerPackage: this.packageName,
-        apiPackage: `${this.packageName}.api`,
-        modelPackage: `${this.packageName}.model`,
-        hideGenerationTimestamp: "true",
-        additionalModelTypeAnnotations: [
-          "@lombok.AllArgsConstructor",
-          // Regular lombok builder is not used since an abstract base schema class is also annotated
-          "@lombok.experimental.SuperBuilder",
-        ].join("\\ "),
+        packageName: this.packageName,
+        srcDir: path.join(
+          "src",
+          "main",
+          "java",
+          ...this.packageName.split(".")
+        ),
       },
-      srcDir: path.join("src", "main", "java", ...this.packageName.split(".")),
-      normalizers: {
-        KEEP_ONLY_FIRST_TAG_IN_OPERATION: true,
-      },
-      // Do not generate map/list types. Generator will use built in HashMap, ArrayList instead
-      generateAliasAsModel: false,
     };
   }
 }
diff --git a/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap b/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap
index d97bd9951..c4a3e8d7c 100644
--- a/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap
+++ b/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap
@@ -1,24 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Type Safe Api Project Unit Tests Custom OpenAPI Generator CLI Configuration 1`] = `undefined`;
-
-exports[`Type Safe Api Project Unit Tests Custom OpenAPI Generator CLI Configuration 2`] = `
-{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-  "generator-cli": {
-    "repository": {
-      "downloadUrl": "https://my.custom.maven.repo/maven2/\${groupId}/\${artifactId}/\${versionName}/\${artifactId}-\${versionName}.jar",
-    },
-    "storageDir": "~/.my-storage-dir",
-    "useDocker": true,
-    "version": "6.2.0",
-  },
-  "spaces": 2,
-}
-`;
-
-exports[`Type Safe Api Project Unit Tests Custom OpenAPI Generator CLI Configuration 3`] = `
+exports[`Type Safe Api Project Unit Tests Custom OpenAPI Generator CLI Configuration 1`] = `
 {
   "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
@@ -1126,8 +1108,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -1145,41 +1125,13 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 ",
-  "generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -1389,8 +1341,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -1433,14 +1383,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -1455,13 +1397,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/openapijavajavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=openapi-java-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.openapijavajavaruntime.runtime,apiPackage=com.generated.api.openapijavajavaruntime.runtime.api,modelPackage=com.generated.api.openapijavajavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"openapi-java-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.openapijavajavaruntime.runtime","srcDir":"src/main/java/com/generated/api/openapijavajavaruntime/runtime"}'",
           },
         ],
       },
@@ -6425,8 +6361,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -6446,43 +6380,15 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 !/project.json
 !/LICENSE
 ",
-  "packages/api/generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "packages/api/generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "packages/api/generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -6692,8 +6598,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -6738,14 +6642,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -6754,13 +6650,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/openapijavajavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=openapi-java-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.openapijavajavaruntime.runtime,apiPackage=com.generated.api.openapijavajavaruntime.runtime.api,modelPackage=com.generated.api.openapijavajavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"openapi-java-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.openapijavajavaruntime.runtime","srcDir":"src/main/java/com/generated/api/openapijavajavaruntime/runtime"}'",
           },
         ],
       },
@@ -7236,13 +7126,6 @@ src/main/AndroidManifest.xml
           "cwd": "packages/api/generated/runtime/java",
         },
       },
-      "create-openapitools.json": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "npx projen create-openapitools.json",
-          "cwd": "packages/api/generated/runtime/java",
-        },
-      },
       "default": {
         "executor": "nx:run-commands",
         "options": {
@@ -10274,8 +10157,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -10293,41 +10174,13 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 ",
-  "generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -10537,8 +10390,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -10581,14 +10432,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -10603,13 +10446,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/openapipythonjavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=openapi-python-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.openapipythonjavaruntime.runtime,apiPackage=com.generated.api.openapipythonjavaruntime.runtime.api,modelPackage=com.generated.api.openapipythonjavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"openapi-python-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.openapipythonjavaruntime.runtime","srcDir":"src/main/java/com/generated/api/openapipythonjavaruntime/runtime"}'",
           },
         ],
       },
@@ -15506,8 +15343,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -15527,43 +15362,15 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 !/project.json
 !/LICENSE
 ",
-  "packages/api/generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "packages/api/generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "packages/api/generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -15773,8 +15580,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -15819,14 +15624,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -15835,13 +15632,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/openapipythonjavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=openapi-python-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.openapipythonjavaruntime.runtime,apiPackage=com.generated.api.openapipythonjavaruntime.runtime.api,modelPackage=com.generated.api.openapipythonjavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"openapi-python-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.openapipythonjavaruntime.runtime","srcDir":"src/main/java/com/generated/api/openapipythonjavaruntime/runtime"}'",
           },
         ],
       },
@@ -16317,13 +16108,6 @@ src/main/AndroidManifest.xml
           "cwd": "packages/api/generated/runtime/java",
         },
       },
-      "create-openapitools.json": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "npx projen create-openapitools.json",
-          "cwd": "packages/api/generated/runtime/java",
-        },
-      },
       "default": {
         "executor": "nx:run-commands",
         "options": {
@@ -19650,8 +19434,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -19669,41 +19451,13 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 ",
-  "generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -19913,8 +19667,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -19957,14 +19709,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -19979,13 +19723,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/openapitypescriptjavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=openapi-typescript-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.openapitypescriptjavaruntime.runtime,apiPackage=com.generated.api.openapitypescriptjavaruntime.runtime.api,modelPackage=com.generated.api.openapitypescriptjavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"openapi-typescript-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.openapitypescriptjavaruntime.runtime","srcDir":"src/main/java/com/generated/api/openapitypescriptjavaruntime/runtime"}'",
           },
         ],
       },
@@ -24940,8 +24678,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -24961,43 +24697,15 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 !/project.json
 !/LICENSE
 ",
-  "packages/api/generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "packages/api/generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "packages/api/generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -25207,8 +24915,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -25253,14 +24959,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -25269,13 +24967,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/openapitypescriptjavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=openapi-typescript-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.openapitypescriptjavaruntime.runtime,apiPackage=com.generated.api.openapitypescriptjavaruntime.runtime.api,modelPackage=com.generated.api.openapitypescriptjavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"openapi-typescript-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.openapitypescriptjavaruntime.runtime","srcDir":"src/main/java/com/generated/api/openapitypescriptjavaruntime/runtime"}'",
           },
         ],
       },
@@ -25751,13 +25443,6 @@ src/main/AndroidManifest.xml
           "cwd": "packages/api/generated/runtime/java",
         },
       },
-      "create-openapitools.json": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "npx projen create-openapitools.json",
-          "cwd": "packages/api/generated/runtime/java",
-        },
-      },
       "default": {
         "executor": "nx:run-commands",
         "options": {
@@ -28608,8 +28293,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -28627,41 +28310,13 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 ",
-  "generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -28871,8 +28526,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -28915,14 +28568,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -28937,13 +28582,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/smithyhandlersjavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=smithy-handlers-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.smithyhandlersjavaruntime.runtime,apiPackage=com.generated.api.smithyhandlersjavaruntime.runtime.api,modelPackage=com.generated.api.smithyhandlersjavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"smithy-handlers-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.smithyhandlersjavaruntime.runtime","srcDir":"src/main/java/com/generated/api/smithyhandlersjavaruntime/runtime"}'",
           },
         ],
       },
@@ -35880,8 +35519,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -35899,41 +35536,13 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 ",
-  "generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -36143,8 +35752,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -36187,14 +35794,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -36209,13 +35808,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/smithyjavajavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=smithy-java-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.smithyjavajavaruntime.runtime,apiPackage=com.generated.api.smithyjavajavaruntime.runtime.api,modelPackage=com.generated.api.smithyjavajavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"smithy-java-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.smithyjavajavaruntime.runtime","srcDir":"src/main/java/com/generated/api/smithyjavajavaruntime/runtime"}'",
           },
         ],
       },
@@ -41273,8 +40866,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -41294,43 +40885,15 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 !/project.json
 !/LICENSE
 ",
-  "packages/api/generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "packages/api/generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "packages/api/generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -41540,8 +41103,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -41586,14 +41147,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -41602,13 +41155,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/smithyjavajavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=smithy-java-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.smithyjavajavaruntime.runtime,apiPackage=com.generated.api.smithyjavajavaruntime.runtime.api,modelPackage=com.generated.api.smithyjavajavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"smithy-java-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.smithyjavajavaruntime.runtime","srcDir":"src/main/java/com/generated/api/smithyjavajavaruntime/runtime"}'",
           },
         ],
       },
@@ -42084,13 +41631,6 @@ src/main/AndroidManifest.xml
           "cwd": "packages/api/generated/runtime/java",
         },
       },
-      "create-openapitools.json": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "npx projen create-openapitools.json",
-          "cwd": "packages/api/generated/runtime/java",
-        },
-      },
       "default": {
         "executor": "nx:run-commands",
         "options": {
@@ -59679,8 +59219,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -59698,41 +59236,13 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 ",
-  "generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -59942,8 +59452,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -59986,14 +59494,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -60008,13 +59508,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/smithypythonjavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=smithy-python-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.smithypythonjavaruntime.runtime,apiPackage=com.generated.api.smithypythonjavaruntime.runtime.api,modelPackage=com.generated.api.smithypythonjavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"smithy-python-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.smithypythonjavaruntime.runtime","srcDir":"src/main/java/com/generated/api/smithypythonjavaruntime/runtime"}'",
           },
         ],
       },
@@ -65005,8 +64499,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -65026,43 +64518,15 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 !/project.json
 !/LICENSE
 ",
-  "packages/api/generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "packages/api/generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "packages/api/generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -65272,8 +64736,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -65318,14 +64780,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -65334,13 +64788,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/smithypythonjavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=smithy-python-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.smithypythonjavaruntime.runtime,apiPackage=com.generated.api.smithypythonjavaruntime.runtime.api,modelPackage=com.generated.api.smithypythonjavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"smithy-python-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.smithypythonjavaruntime.runtime","srcDir":"src/main/java/com/generated/api/smithypythonjavaruntime/runtime"}'",
           },
         ],
       },
@@ -65816,13 +65264,6 @@ src/main/AndroidManifest.xml
           "cwd": "packages/api/generated/runtime/java",
         },
       },
-      "create-openapitools.json": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "npx projen create-openapitools.json",
-          "cwd": "packages/api/generated/runtime/java",
-        },
-      },
       "default": {
         "executor": "nx:run-commands",
         "options": {
@@ -69243,8 +68684,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -69262,41 +68701,13 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 ",
-  "generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -69506,8 +68917,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -69550,14 +68959,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -69572,13 +68973,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/smithytypescriptjavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=smithy-typescript-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.smithytypescriptjavaruntime.runtime,apiPackage=com.generated.api.smithytypescriptjavaruntime.runtime.api,modelPackage=com.generated.api.smithytypescriptjavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"smithy-typescript-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.smithytypescriptjavaruntime.runtime","srcDir":"src/main/java/com/generated/api/smithytypescriptjavaruntime/runtime"}'",
           },
         ],
       },
@@ -74627,8 +74022,6 @@ Each runtime project includes types from your API model, as well as type-safe cl
 
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -74648,43 +74041,15 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 !/project.json
 !/LICENSE
 ",
-  "packages/api/generated/runtime/java/.openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  "packages/api/generated/runtime/java/.pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   "packages/api/generated/runtime/java/.projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".",
     "dependencies": [
@@ -74894,8 +74259,6 @@ src/main/AndroidManifest.xml
     "files": [
       ".gitattributes",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -74940,14 +74303,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -74956,13 +74311,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path ../../../model/.api.json --output-path . --generator-dir java --src-dir src/main/java/com/generated/api/smithytypescriptjavaruntime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=com.generated.api,artifactId=smithy-typescript-java-runtime,artifactVersion=0.0.0,invokerPackage=com.generated.api.smithytypescriptjavaruntime.runtime,apiPackage=com.generated.api.smithytypescriptjavaruntime.runtime.api,modelPackage=com.generated.api.smithytypescriptjavaruntime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath ../../../model/.api.json --outputPath . --templateDirs "java" --metadata '{"groupId":"com.generated.api","artifactId":"smithy-typescript-java-runtime","artifactVersion":"0.0.0","packageName":"com.generated.api.smithytypescriptjavaruntime.runtime","srcDir":"src/main/java/com/generated/api/smithytypescriptjavaruntime/runtime"}'",
           },
         ],
       },
@@ -75438,13 +74787,6 @@ src/main/AndroidManifest.xml
           "cwd": "packages/api/generated/runtime/java",
         },
       },
-      "create-openapitools.json": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "npx projen create-openapitools.json",
-          "cwd": "packages/api/generated/runtime/java",
-        },
-      },
       "default": {
         "executor": "nx:run-commands",
         "options": {
diff --git a/packages/type-safe-api/test/project/codegen/types/__snapshots__/generated-java-async-runtime-project.test.ts.snap b/packages/type-safe-api/test/project/codegen/types/__snapshots__/generated-java-async-runtime-project.test.ts.snap
index 30fb81213..fa60252f3 100644
--- a/packages/type-safe-api/test/project/codegen/types/__snapshots__/generated-java-async-runtime-project.test.ts.snap
+++ b/packages/type-safe-api/test/project/codegen/types/__snapshots__/generated-java-async-runtime-project.test.ts.snap
@@ -7,8 +7,6 @@ exports[`Generated Java Async Runtime Unit Tests Synth 1`] = `
 /.gitattributes linguist-generated
 /.github/workflows/pull-request-lint.yml linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -56,42 +54,14 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 !/src/test/java/projenrc.java
 ",
-  ".openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  ".pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   ".projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run "npx projen".",
     "dependencies": [
@@ -312,8 +282,6 @@ src/main/AndroidManifest.xml
       ".gitattributes",
       ".github/workflows/pull-request-lint.yml",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -391,14 +359,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -427,13 +387,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path my-spec.json --output-path . --generator-dir java-async-runtime --src-dir src/main/java/test/test-java-runtime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=test,artifactId=com.aws.pdk.test,artifactVersion=1.0.0,invokerPackage=test.test-java-runtime.runtime,apiPackage=test.test-java-runtime.runtime.api,modelPackage=test.test-java-runtime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath my-spec.json --outputPath . --templateDirs "java" --metadata '{"groupId":"test","artifactId":"com.aws.pdk.test","artifactVersion":"1.0.0","packageName":"test.test-java-runtime.runtime","srcDir":"src/main/java/test/test-java-runtime/runtime"}'",
           },
         ],
       },
diff --git a/packages/type-safe-api/test/project/codegen/types/__snapshots__/generated-java-runtime-project.test.ts.snap b/packages/type-safe-api/test/project/codegen/types/__snapshots__/generated-java-runtime-project.test.ts.snap
index 41bbd1bd0..7e9e03036 100644
--- a/packages/type-safe-api/test/project/codegen/types/__snapshots__/generated-java-runtime-project.test.ts.snap
+++ b/packages/type-safe-api/test/project/codegen/types/__snapshots__/generated-java-runtime-project.test.ts.snap
@@ -7,8 +7,6 @@ exports[`Generated Java Runtime Unit Tests Synth 1`] = `
 /.gitattributes linguist-generated
 /.github/workflows/pull-request-lint.yml linguist-generated
 /.gitignore linguist-generated
-/.openapi-generator-ignore linguist-generated
-/.pdk/dynamic-files/openapitools.json linguist-generated
 /.projen/** linguist-generated
 /.projen/deps.json linguist-generated
 /.projen/files.json linguist-generated
@@ -56,42 +54,14 @@ node_modules/
 .settings
 target
 dist/java
-!/.openapi-generator-ignore
-!/.pdk/dynamic-files/openapitools.json
-/openapitools.json
 src
 docs
 api
 README.md
 .openapi-generator
+.tsapi-manifest
 !/src/test/java/projenrc.java
 ",
-  ".openapi-generator-ignore": "# ~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run "npx projen".
-.gitignore
-pom.xml
-gradle
-gradle/**/*
-gradlew
-gradle.properties
-gradlew.bat
-build.gradle
-settings.gradle
-build.sbt
-.travis.yml
-git_push.sh
-src/test
-src/test/**/*
-src/main/AndroidManifest.xml
-",
-  ".pdk/dynamic-files/openapitools.json": {
-    "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-    "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run "npx projen".",
-    "generator-cli": {
-      "storageDir": "~/.open-api-generator-cli",
-      "version": "6.3.0",
-    },
-    "spaces": 2,
-  },
   ".projen/deps.json": {
     "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run "npx projen".",
     "dependencies": [
@@ -312,8 +282,6 @@ src/main/AndroidManifest.xml
       ".gitattributes",
       ".github/workflows/pull-request-lint.yml",
       ".gitignore",
-      ".openapi-generator-ignore",
-      ".pdk/dynamic-files/openapitools.json",
       ".projen/deps.json",
       ".projen/files.json",
       ".projen/tasks.json",
@@ -391,14 +359,6 @@ src/main/AndroidManifest.xml
           },
         ],
       },
-      "create-openapitools.json": {
-        "name": "create-openapitools.json",
-        "steps": [
-          {
-            "exec": "cp -f .pdk/dynamic-files/openapitools.json openapitools.json",
-          },
-        ],
-      },
       "default": {
         "description": "Synthesize project files",
         "name": "default",
@@ -427,13 +387,7 @@ src/main/AndroidManifest.xml
         "name": "generate",
         "steps": [
           {
-            "spawn": "create-openapitools.json",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.clean-openapi-generated-code --code-path .",
-          },
-          {
-            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.generate --generator java --spec-path my-spec.json --output-path . --generator-dir java --src-dir src/main/java/test/test-java-runtime/runtime --tst-dir test --additional-properties "useSingleRequestParameter=true,groupId=test,artifactId=com.aws.pdk.test,artifactVersion=1.0.0,invokerPackage=test.test-java-runtime.runtime,apiPackage=test.test-java-runtime.runtime.api,modelPackage=test.test-java-runtime.runtime.model,hideGenerationTimestamp=true,additionalModelTypeAnnotations=@lombok.AllArgsConstructor\\ @lombok.experimental.SuperBuilder" --openapi-normalizer "KEEP_ONLY_FIRST_TAG_IN_OPERATION=true"",
+            "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api generate --specPath my-spec.json --outputPath . --templateDirs "java" --metadata '{"groupId":"test","artifactId":"com.aws.pdk.test","artifactVersion":"1.0.0","packageName":"test.test-java-runtime.runtime","srcDir":"src/main/java/test/test-java-runtime/runtime"}'",
           },
         ],
       },
diff --git a/packages/type-safe-api/test/project/type-safe-api-project.test.ts b/packages/type-safe-api/test/project/type-safe-api-project.test.ts
index beaf75009..b9577a430 100644
--- a/packages/type-safe-api/test/project/type-safe-api-project.test.ts
+++ b/packages/type-safe-api/test/project/type-safe-api-project.test.ts
@@ -6,8 +6,6 @@ import { NodePackageManager } from "projen/lib/javascript";
 import { synthProject, synthSmithyProject } from "./snapshot-utils";
 import {
   DocumentationFormat,
-  GeneratedJavaInfrastructureOptions,
-  GeneratedJavaRuntimeOptions,
   Language,
   Library,
   ModelLanguage,
@@ -382,19 +380,9 @@ describe("Type Safe Api Project Unit Tests", () => {
       ),
       infrastructure: {
         language: Language.JAVA,
-        options: {
-          java: {
-            openApiGeneratorCliConfig,
-          } satisfies Partial<GeneratedJavaInfrastructureOptions> as any,
-        },
       },
       runtime: {
         languages: [Language.JAVA],
-        options: {
-          java: {
-            openApiGeneratorCliConfig,
-          } satisfies Partial<GeneratedJavaRuntimeOptions> as any,
-        },
       },
       model: {
         language: ModelLanguage.SMITHY,
@@ -427,22 +415,6 @@ describe("Type Safe Api Project Unit Tests", () => {
 
     const snapshot = synthSmithyProject(project);
 
-    expect(
-      snapshot[
-        `${path.relative(
-          project.outdir,
-          project.infrastructure.java!.outdir
-        )}/.pdk/dynamic-files/openapitools.json`
-      ]
-    ).toMatchSnapshot();
-    expect(
-      snapshot[
-        `${path.relative(
-          project.outdir,
-          project.runtime.java!.outdir
-        )}/.pdk/dynamic-files/openapitools.json`
-      ]
-    ).toMatchSnapshot();
     expect(
       snapshot[
         `${path.relative(
diff --git a/packages/type-safe-api/test/resources/specs/edge-cases.yaml b/packages/type-safe-api/test/resources/specs/edge-cases.yaml
index e5bb865c1..49ce1f1db 100644
--- a/packages/type-safe-api/test/resources/specs/edge-cases.yaml
+++ b/packages/type-safe-api/test/resources/specs/edge-cases.yaml
@@ -78,6 +78,10 @@ paths:
             items:
               type: number
               format: double
+        - in: query
+          name: my-enum-request-param
+          schema:
+            $ref: "#/components/schemas/MyEnum"
       responses:
         200:
           description: ok
diff --git a/packages/type-safe-api/test/scripts/generators/__snapshots__/docs.test.ts.snap b/packages/type-safe-api/test/scripts/generators/__snapshots__/docs.test.ts.snap
index 906f54fda..2c7160dcf 100644
--- a/packages/type-safe-api/test/scripts/generators/__snapshots__/docs.test.ts.snap
+++ b/packages/type-safe-api/test/scripts/generators/__snapshots__/docs.test.ts.snap
@@ -5359,17 +5359,17 @@ Models/TestResponseMessagesInner.md",
 
 <a name="anyRequestResponse"></a>
 # **anyRequestResponse**
-> any anyRequestResponse(body)
+> Object anyRequestResponse(body)
 
 
 ### Parameters
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
-| **body** | **any**|  | [optional] |
+| **body** | **Object**|  | [optional] |
 
 ### Return type
 
-**any**
+**Object**
 
 ### HTTP request headers
 
@@ -5457,13 +5457,13 @@ This endpoint does not need any parameters.
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
 | **param1** | **String**| This is parameter 1 | |
-| **param2** | **List<string>**| This is parameter 2 | |
+| **param2** | **List<String>**| This is parameter 2 | |
 | **param3** | **BigDecimal**|  | |
 | **pathParam** | **String**|  | |
 | **x-header-param** | **String**| This is a header parameter | |
 | **body** | [**TestRequest**](../Models/TestRequest.md)|  | |
 | **param4** | **String**|  | [optional] |
-| **x-multi-value-header-param** | **List<string>**|  | [optional] |
+| **x-multi-value-header-param** | **List<String>**|  | [optional] |
 
 ### Return type
 
diff --git a/packages/type-safe-api/test/scripts/generators/__snapshots__/java.test.ts.snap b/packages/type-safe-api/test/scripts/generators/__snapshots__/java.test.ts.snap
index 366cf9f75..1887efba3 100644
--- a/packages/type-safe-api/test/scripts/generators/__snapshots__/java.test.ts.snap
+++ b/packages/type-safe-api/test/scripts/generators/__snapshots__/java.test.ts.snap
@@ -2,136 +2,7 @@
 
 exports[`Java Client Code Generation Script Unit Tests Generates With allof-model.yaml 1`] = `
 {
-  ".github/workflows/maven.yml": "# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-#
-# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  build:
-    name: Build My API
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8' ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: \${{ matrix.java }}
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
-",
-  ".gitignore": "*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
-",
-  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
-",
-  ".openapi-generator/FILES": ".github/workflows/maven.yml
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/DefaultApi.md
-docs/Template.md
-docs/TemplateBase.md
-docs/TemplateBody.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
-src/main/java/test/test/runtime/ApiCallback.java
-src/main/java/test/test/runtime/ApiClient.java
-src/main/java/test/test/runtime/ApiException.java
-src/main/java/test/test/runtime/ApiResponse.java
-src/main/java/test/test/runtime/Configuration.java
-src/main/java/test/test/runtime/GzipRequestInterceptor.java
-src/main/java/test/test/runtime/JSON.java
-src/main/java/test/test/runtime/Pair.java
-src/main/java/test/test/runtime/ProgressRequestBody.java
-src/main/java/test/test/runtime/ProgressResponseBody.java
-src/main/java/test/test/runtime/ServerConfiguration.java
-src/main/java/test/test/runtime/ServerVariable.java
-src/main/java/test/test/runtime/StringUtil.java
-src/main/java/test/test/runtime/__handlers.java
-src/main/java/test/test/runtime/__interceptors.java
-src/main/java/test/test/runtime/api/DefaultApi.java
-src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
-src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
-src/main/java/test/test/runtime/api/operation_config/Operations.java
-src/main/java/test/test/runtime/auth/ApiKeyAuth.java
-src/main/java/test/test/runtime/auth/Authentication.java
-src/main/java/test/test/runtime/auth/HttpBasicAuth.java
-src/main/java/test/test/runtime/auth/HttpBearerAuth.java
-src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
-src/main/java/test/test/runtime/model/Template.java
-src/main/java/test/test/runtime/model/TemplateBase.java
-src/main/java/test/test/runtime/model/TemplateBody.java
-src/test/java/test/test/runtime/api/DefaultApiTest.java
-src/test/java/test/test/runtime/model/TemplateBaseTest.java
-src/test/java/test/test/runtime/model/TemplateBodyTest.java
-src/test/java/test/test/runtime/model/TemplateTest.java
-src/main/java/test/test/runtime/api/handlers/Handlers.java
+  ".tsapi-manifest": "src/main/java/test/test/runtime/api/handlers/Handlers.java
 src/main/java/test/test/runtime/api/handlers/Response.java
 src/main/java/test/test/runtime/api/handlers/ApiResponse.java
 src/main/java/test/test/runtime/api/handlers/Interceptor.java
@@ -153,357 +24,40 @@ src/main/java/test/test/runtime/api/interceptors/ResponseHeadersInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/LoggingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/TracingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/MetricsInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java",
-  ".openapi-generator/VERSION": "6.3.0",
-  ".pdk/dynamic-files/openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
-  "README.md": "# com.aws.pdk.test
-
-My API
-- API version: 1.0.0
-
-See https://github.com/aws/aws-pdk/issues/841
-
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
-
-## Requirements
-
-Building the API client library requires:
-1. Java 1.8+
-2. Maven (3.8.3+)/Gradle (7.2+)
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-\`\`\`shell
-mvn clean install
-\`\`\`
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-\`\`\`shell
-mvn clean deploy
-\`\`\`
-
-Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-\`\`\`xml
-<dependency>
-  <groupId>test</groupId>
-  <artifactId>com.aws.pdk.test</artifactId>
-  <version>1.0.0</version>
-  <scope>compile</scope>
-</dependency>
-\`\`\`
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-\`\`\`groovy
-  repositories {
-    mavenCentral()     // Needed if the 'com.aws.pdk.test' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'com.aws.pdk.test' jar has been published to the local maven repo.
-  }
-
-  dependencies {
-     implementation "test:com.aws.pdk.test:1.0.0"
-  }
-\`\`\`
-
-### Others
-
-At first generate the JAR by executing:
-
-\`\`\`shell
-mvn clean package
-\`\`\`
-
-Then manually install the following JARs:
-
-* \`target/com.aws.pdk.test-1.0.0.jar\`
-* \`target/lib/*.jar\`
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following Java code:
-
-\`\`\`java
-
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      Template result = apiInstance.sayHello()
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#sayHello");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-
-\`\`\`
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://localhost*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*DefaultApi* | [**sayHello**](docs/DefaultApi.md#sayHello) | **GET** /hello | 
-
-
-## Documentation for Models
-
- - [Template](docs/Template.md)
- - [TemplateBase](docs/TemplateBase.md)
- - [TemplateBody](docs/TemplateBody.md)
-
-
-## Documentation for Authorization
-
-All endpoints do not require authorization.
-Authentication schemes defined for the API:
-
-## Recommendation
-
-It's recommended to create an instance of \`ApiClient\` per thread in a multithreaded environment to avoid any potential issues.
-
-## Author
-
-
-
-",
-  "api/openapi.yaml": "openapi: 3.0.3
-info:
-  description: See https://github.com/aws/aws-pdk/issues/841
-  title: My API
-  version: 1.0.0
-servers:
-- url: /
-paths:
-  /hello:
-    get:
-      operationId: sayHello
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Template'
-          description: Successful response
-      x-accepts: application/json
-components:
-  schemas:
-    Template:
-      allOf:
-      - $ref: '#/components/schemas/TemplateBase'
-      - $ref: '#/components/schemas/TemplateBody'
-      - description: |
-          Represents a complete template in the system.
-        title: Template
-    TemplateBase:
-      additionalProperties: false
-      description: |
-        Represents the base properties of a template.
-      properties:
-        id:
-          description: The unique identifier for a template.
-          format: uuid
-          maxLength: 36
-          title: TemplateID
-          type: string
-      required:
-      - id
-      title: TemplateBase
-      type: object
-    TemplateBody:
-      additionalProperties: false
-      description: |
-        Represents the body of a template.
-      properties:
-        parent_id:
-          description: The unique identifier for a template.
-          format: uuid
-          maxLength: 36
-          title: TemplateID
-          type: string
-        boolean:
-          description: A boolean value.
-          type: boolean
-      title: TemplateBody
-      type: object
-    TemplateID:
-      description: The unique identifier for a template.
-      format: uuid
-      maxLength: 36
-      title: TemplateID
-      type: string
-
-",
-  "docs/DefaultApi.md": "# DefaultApi
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**sayHello**](DefaultApi.md#sayHello) | **GET** /hello |  |
-
-
-<a name="sayHello"></a>
-# **sayHello**
-> Template sayHello().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      Template result = apiInstance.sayHello()
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#sayHello");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**Template**](Template.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Successful response |  -  |
-
-",
-  "docs/Template.md": "
-
-# Template
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**id** | **UUID** | The unique identifier for a template. |  |
-|**parentId** | **UUID** | The unique identifier for a template. |  [optional] |
-|**_boolean** | **Boolean** | A boolean value. |  [optional] |
-
-
-
-",
-  "docs/TemplateBase.md": "
-
-# TemplateBase
-
-Represents the base properties of a template. 
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**id** | **UUID** | The unique identifier for a template. |  |
-
-
-
-",
-  "docs/TemplateBody.md": "
-
-# TemplateBody
-
-Represents the body of a template. 
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**parentId** | **UUID** | The unique identifier for a template. |  [optional] |
-|**_boolean** | **Boolean** | A boolean value. |  [optional] |
-
-
-
-",
-  "openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
+src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java
+src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
+src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
+src/main/java/test/test/runtime/api/operation_config/Operations.java
+src/main/java/test/test/runtime/api/DefaultApi.java
+src/main/java/test/test/runtime/auth/ApiKeyAuth.java
+src/main/java/test/test/runtime/auth/Authentication.java
+src/main/java/test/test/runtime/auth/HttpBasicAuth.java
+src/main/java/test/test/runtime/auth/HttpBearerAuth.java
+src/main/java/test/test/runtime/ApiCallback.java
+src/main/java/test/test/runtime/ApiClient.java
+src/main/java/test/test/runtime/ApiException.java
+src/main/java/test/test/runtime/ApiResponse.java
+src/main/java/test/test/runtime/Configuration.java
+src/main/java/test/test/runtime/GzipRequestInterceptor.java
+src/main/java/test/test/runtime/JSON.java
+src/main/java/test/test/runtime/Pair.java
+src/main/java/test/test/runtime/ProgressRequestBody.java
+src/main/java/test/test/runtime/ProgressResponseBody.java
+src/main/java/test/test/runtime/ServerConfiguration.java
+src/main/java/test/test/runtime/ServerVariable.java
+src/main/java/test/test/runtime/StringUtil.java
+src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
+src/main/java/test/test/runtime/model/Template.java
+src/main/java/test/test/runtime/model/TemplateBase.java
+src/main/java/test/test/runtime/model/TemplateBody.java",
   "src/main/java/test/test/runtime/ApiCallback.java": "/*
  * My API
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -563,10 +117,9 @@ public interface ApiCallback<T> {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -698,7 +251,7 @@ public class ApiClient {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/1.0.0/java");
+        setUserAgent("OpenAPI-Generator/0.0.0/java");
 
         authentications = new HashMap<String, Authentication>();
     }
@@ -1950,10 +1503,10 @@ public class ApiClient {
     /**
      * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
      *
-     * @param mpBuilder MultipartBody.Builder 
+     * @param mpBuilder MultipartBody.Builder
      * @param key The key of the Header element
      * @param file The file to add to the Header
-     */ 
+     */
     private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
         Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\\"" + key + "\\"; filename=\\"" + file.getName() + "\\"");
         MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
@@ -2110,10 +1663,9 @@ public class ApiClient {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -2129,12 +1681,11 @@ import javax.ws.rs.core.GenericType;
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
- 
+
     /**
      * <p>Constructor for ApiException.</p>
      */
@@ -2277,10 +1828,9 @@ public class ApiException extends Exception {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -2333,7 +1883,7 @@ public class ApiResponse<T> {
     /**
      * <p>Get the <code>headers</code>.</p>
      *
-     * @return a {@link java.util.Map} of headers 
+     * @return a {@link java.util.Map} of headers
      */
     public Map<String, List<String>> getHeaders() {
         return headers;
@@ -2354,17 +1904,15 @@ public class ApiResponse<T> {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
@@ -2394,10 +1942,9 @@ public class Configuration {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -2480,10 +2027,9 @@ class GzipRequestInterceptor implements Interceptor {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -2884,17 +2430,15 @@ public class JSON {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
@@ -2942,10 +2486,9 @@ public class Pair {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -3016,10 +2559,9 @@ public class ProgressRequestBody extends RequestBody {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -3170,10 +2712,9 @@ public class ServerVariable {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -3183,7 +2724,6 @@ package test.test.runtime;
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -3254,10 +2794,9 @@ public class StringUtil {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -3278,6 +2817,8 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 
+import java.math.BigDecimal;
+import java.io.File;
 import test.test.runtime.model.Template;
 
 import java.lang.reflect.Type;
@@ -3368,19 +2909,20 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call sayHelloValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return sayHelloCall(_callback);
 
     }
 
-
     private ApiResponse<Template> sayHelloWithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = sayHelloValidateBeforeCall(null);
         Type localVarReturnType = new TypeToken<Template>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call sayHelloAsync(final ApiCallback<Template> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = sayHelloValidateBeforeCall(_callback);
@@ -3464,10 +3006,12 @@ public class DefaultApi {
         <tr><td> 200 </td><td> Successful response </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIsayHelloRequest sayHello() {
         return new APIsayHelloRequest();
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/handlers/ApiResponse.java": "
 package test.test.runtime.api.handlers;
@@ -3617,11 +3161,8 @@ import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-import test.test.runtime.model.Template;
-
 import test.test.runtime.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Handlers {
 
     static {
@@ -4613,8 +4154,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the SayHello operation
  */
@@ -4993,13 +4537,10 @@ public class TracingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.Template;
-
 import java.util.HashMap;
 import java.util.Map;
 
 // Generic type for object "keyed" by operation names
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @lombok.Builder @lombok.Getter
 public class OperationConfig<T> {
     private T sayHello;
@@ -5015,8 +4556,6 @@ public class OperationConfig<T> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.Template;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
@@ -5024,7 +4563,6 @@ import java.util.Arrays;
 
 
 // Look up path and http method for a given operation name
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OperationLookup {
     @lombok.Builder @lombok.Getter
     public static class OperationLookupEntry {
@@ -5051,7 +4589,6 @@ public class OperationLookup {
 ",
   "src/main/java/test/test/runtime/api/operation_config/Operations.java": "package test.test.runtime.api.operation_config;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Operations {
     /**
      * Returns an OperationConfig Builder with all values populated with the given value.
@@ -5070,10 +4607,9 @@ public class Operations {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -5087,7 +4623,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -5151,10 +4686,9 @@ public class ApiKeyAuth implements Authentication {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -5188,10 +4722,9 @@ public interface Authentication {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -5246,10 +4779,9 @@ public class HttpBasicAuth implements Authentication {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -5263,7 +4795,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
@@ -5310,10 +4841,9 @@ public class HttpBearerAuth implements Authentication {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -5332,7 +4862,6 @@ import javax.ws.rs.core.GenericType;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -5461,10 +4990,9 @@ public abstract class AbstractOpenApiSchema {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -5479,26 +5007,47 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -5506,7 +5055,6 @@ import test.test.runtime.JSON;
  * Template
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Template {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
@@ -5524,7 +5072,7 @@ public class Template {
   }
 
   public Template id(UUID id) {
-    
+
     this.id = id;
     return this;
   }
@@ -5534,7 +5082,6 @@ public class Template {
    * @return id
   **/
   @javax.annotation.Nonnull
-
   public UUID getId() {
     return id;
   }
@@ -5544,9 +5091,8 @@ public class Template {
     this.id = id;
   }
 
-
   public Template parentId(UUID parentId) {
-    
+
     this.parentId = parentId;
     return this;
   }
@@ -5556,7 +5102,6 @@ public class Template {
    * @return parentId
   **/
   @javax.annotation.Nullable
-
   public UUID getParentId() {
     return parentId;
   }
@@ -5566,9 +5111,8 @@ public class Template {
     this.parentId = parentId;
   }
 
-
   public Template _boolean(Boolean _boolean) {
-    
+
     this._boolean = _boolean;
     return this;
   }
@@ -5578,7 +5122,6 @@ public class Template {
    * @return _boolean
   **/
   @javax.annotation.Nullable
-
   public Boolean getBoolean() {
     return _boolean;
   }
@@ -5589,7 +5132,6 @@ public class Template {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -5602,6 +5144,7 @@ public class Template {
     return Objects.equals(this.id, template.id) &&
         Objects.equals(this.parentId, template.parentId) &&
         Objects.equals(this._boolean, template._boolean);
+        
   }
 
   @Override
@@ -5731,17 +5274,15 @@ public class Template {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/TemplateBase.java": "/*
  * My API
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -5756,34 +5297,55 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
 /**
- * Represents the base properties of a template. 
+ * Represents the base properties of a template.
+
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TemplateBase {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
@@ -5793,7 +5355,7 @@ public class TemplateBase {
   }
 
   public TemplateBase id(UUID id) {
-    
+
     this.id = id;
     return this;
   }
@@ -5803,7 +5365,6 @@ public class TemplateBase {
    * @return id
   **/
   @javax.annotation.Nonnull
-
   public UUID getId() {
     return id;
   }
@@ -5814,7 +5375,6 @@ public class TemplateBase {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -5825,6 +5385,7 @@ public class TemplateBase {
     }
     TemplateBase templateBase = (TemplateBase) o;
     return Objects.equals(this.id, templateBase.id);
+        
   }
 
   @Override
@@ -5947,17 +5508,15 @@ public class TemplateBase {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/TemplateBody.java": "/*
  * My API
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -5972,34 +5531,55 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
 /**
- * Represents the body of a template. 
+ * Represents the body of a template.
+
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TemplateBody {
   public static final String SERIALIZED_NAME_PARENT_ID = "parent_id";
   @SerializedName(SERIALIZED_NAME_PARENT_ID)
@@ -6013,7 +5593,7 @@ public class TemplateBody {
   }
 
   public TemplateBody parentId(UUID parentId) {
-    
+
     this.parentId = parentId;
     return this;
   }
@@ -6023,7 +5603,6 @@ public class TemplateBody {
    * @return parentId
   **/
   @javax.annotation.Nullable
-
   public UUID getParentId() {
     return parentId;
   }
@@ -6033,9 +5612,8 @@ public class TemplateBody {
     this.parentId = parentId;
   }
 
-
   public TemplateBody _boolean(Boolean _boolean) {
-    
+
     this._boolean = _boolean;
     return this;
   }
@@ -6045,7 +5623,6 @@ public class TemplateBody {
    * @return _boolean
   **/
   @javax.annotation.Nullable
-
   public Boolean getBoolean() {
     return _boolean;
   }
@@ -6056,7 +5633,6 @@ public class TemplateBody {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -6068,6 +5644,7 @@ public class TemplateBody {
     TemplateBody templateBody = (TemplateBody) o;
     return Objects.equals(this.parentId, templateBody.parentId) &&
         Objects.equals(this._boolean, templateBody._boolean);
+        
   }
 
   @Override
@@ -6184,127 +5761,43 @@ public class TemplateBody {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
 }
 `;
 
 exports[`Java Client Code Generation Script Unit Tests Generates With composite-models.yaml 1`] = `
 {
-  ".github/workflows/maven.yml": "# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-#
-# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  build:
-    name: Build composite models
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8' ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: \${{ matrix.java }}
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
-",
-  ".gitignore": "*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
-",
-  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
-",
-  ".openapi-generator/FILES": ".github/workflows/maven.yml
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/A.md
-docs/AllOfInlineAndRefs.md
-docs/AllOfInlineAndRefsAllOf.md
-docs/AllOfInlineAndRefsAllOf1.md
-docs/AllOfRefs.md
-docs/AnyOfInlineAndRefs.md
-docs/AnyOfPrimitives.md
-docs/AnyOfPrimitivesAndRefs.md
-docs/AnyOfRefs.md
-docs/B.md
-docs/C.md
-docs/DefaultApi.md
-docs/OneOfInlineAndRefs.md
-docs/OneOfPrimitives.md
-docs/OneOfPrimitivesAndRefs.md
-docs/OneOfRefs.md
-docs/Wrapper.md
-docs/WrapperAllOf.md
-docs/WrapperAnyOf.md
-docs/WrapperOneOf.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
+  ".tsapi-manifest": "src/main/java/test/test/runtime/api/handlers/Handlers.java
+src/main/java/test/test/runtime/api/handlers/Response.java
+src/main/java/test/test/runtime/api/handlers/ApiResponse.java
+src/main/java/test/test/runtime/api/handlers/Interceptor.java
+src/main/java/test/test/runtime/api/handlers/Interceptors.java
+src/main/java/test/test/runtime/api/handlers/HandlerChain.java
+src/main/java/test/test/runtime/api/handlers/RequestInput.java
+src/main/java/test/test/runtime/api/handlers/ChainedRequestInput.java
+src/main/java/test/test/runtime/api/handlers/InterceptorWarmupChainedRequestInput.java
+src/main/java/test/test/runtime/api/handlers/InterceptorWithWarmup.java
+src/main/java/test/test/runtime/api/handlers/op_get/OpGetResponse.java
+src/main/java/test/test/runtime/api/handlers/op_get/OpGet200Response.java
+src/main/java/test/test/runtime/api/handlers/op_get/OpGetRequestParameters.java
+src/main/java/test/test/runtime/api/handlers/op_get/OpGetInput.java
+src/main/java/test/test/runtime/api/handlers/op_get/OpGetRequestInput.java
+src/main/java/test/test/runtime/api/handlers/op_get/OpGet.java
+src/main/java/test/test/runtime/api/handlers/HandlerRouter.java
+src/main/java/test/test/runtime/api/interceptors/TryCatchInterceptor.java
+src/main/java/test/test/runtime/api/interceptors/ResponseHeadersInterceptor.java
+src/main/java/test/test/runtime/api/interceptors/powertools/LoggingInterceptor.java
+src/main/java/test/test/runtime/api/interceptors/powertools/TracingInterceptor.java
+src/main/java/test/test/runtime/api/interceptors/powertools/MetricsInterceptor.java
+src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java
+src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
+src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
+src/main/java/test/test/runtime/api/operation_config/Operations.java
+src/main/java/test/test/runtime/api/DefaultApi.java
+src/main/java/test/test/runtime/auth/ApiKeyAuth.java
+src/main/java/test/test/runtime/auth/Authentication.java
+src/main/java/test/test/runtime/auth/HttpBasicAuth.java
+src/main/java/test/test/runtime/auth/HttpBearerAuth.java
 src/main/java/test/test/runtime/ApiCallback.java
 src/main/java/test/test/runtime/ApiClient.java
 src/main/java/test/test/runtime/ApiException.java
@@ -6318,768 +5811,36 @@ src/main/java/test/test/runtime/ProgressResponseBody.java
 src/main/java/test/test/runtime/ServerConfiguration.java
 src/main/java/test/test/runtime/ServerVariable.java
 src/main/java/test/test/runtime/StringUtil.java
-src/main/java/test/test/runtime/__handlers.java
-src/main/java/test/test/runtime/__interceptors.java
-src/main/java/test/test/runtime/api/DefaultApi.java
-src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
-src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
-src/main/java/test/test/runtime/api/operation_config/Operations.java
-src/main/java/test/test/runtime/auth/ApiKeyAuth.java
-src/main/java/test/test/runtime/auth/Authentication.java
-src/main/java/test/test/runtime/auth/HttpBasicAuth.java
-src/main/java/test/test/runtime/auth/HttpBearerAuth.java
-src/main/java/test/test/runtime/model/A.java
 src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
+src/main/java/test/test/runtime/model/A.java
 src/main/java/test/test/runtime/model/AllOfInlineAndRefs.java
-src/main/java/test/test/runtime/model/AllOfInlineAndRefsAllOf.java
-src/main/java/test/test/runtime/model/AllOfInlineAndRefsAllOf1.java
 src/main/java/test/test/runtime/model/AllOfRefs.java
 src/main/java/test/test/runtime/model/AnyOfInlineAndRefs.java
+src/main/java/test/test/runtime/model/AnyOfInlineAndRefsAnyOf.java
+src/main/java/test/test/runtime/model/AnyOfInlineAndRefsAnyOf1.java
 src/main/java/test/test/runtime/model/AnyOfPrimitives.java
 src/main/java/test/test/runtime/model/AnyOfPrimitivesAndRefs.java
 src/main/java/test/test/runtime/model/AnyOfRefs.java
 src/main/java/test/test/runtime/model/B.java
 src/main/java/test/test/runtime/model/C.java
 src/main/java/test/test/runtime/model/OneOfInlineAndRefs.java
+src/main/java/test/test/runtime/model/OneOfInlineAndRefsOneOf.java
+src/main/java/test/test/runtime/model/OneOfInlineAndRefsOneOf1.java
 src/main/java/test/test/runtime/model/OneOfPrimitives.java
 src/main/java/test/test/runtime/model/OneOfPrimitivesAndRefs.java
 src/main/java/test/test/runtime/model/OneOfRefs.java
 src/main/java/test/test/runtime/model/Wrapper.java
 src/main/java/test/test/runtime/model/WrapperAllOf.java
 src/main/java/test/test/runtime/model/WrapperAnyOf.java
-src/main/java/test/test/runtime/model/WrapperOneOf.java
-src/test/java/test/test/runtime/api/DefaultApiTest.java
-src/test/java/test/test/runtime/model/ATest.java
-src/test/java/test/test/runtime/model/AllOfInlineAndRefsAllOf1Test.java
-src/test/java/test/test/runtime/model/AllOfInlineAndRefsAllOfTest.java
-src/test/java/test/test/runtime/model/AllOfInlineAndRefsTest.java
-src/test/java/test/test/runtime/model/AllOfRefsTest.java
-src/test/java/test/test/runtime/model/AnyOfInlineAndRefsTest.java
-src/test/java/test/test/runtime/model/AnyOfPrimitivesAndRefsTest.java
-src/test/java/test/test/runtime/model/AnyOfPrimitivesTest.java
-src/test/java/test/test/runtime/model/AnyOfRefsTest.java
-src/test/java/test/test/runtime/model/BTest.java
-src/test/java/test/test/runtime/model/CTest.java
-src/test/java/test/test/runtime/model/OneOfInlineAndRefsTest.java
-src/test/java/test/test/runtime/model/OneOfPrimitivesAndRefsTest.java
-src/test/java/test/test/runtime/model/OneOfPrimitivesTest.java
-src/test/java/test/test/runtime/model/OneOfRefsTest.java
-src/test/java/test/test/runtime/model/WrapperAllOfTest.java
-src/test/java/test/test/runtime/model/WrapperAnyOfTest.java
-src/test/java/test/test/runtime/model/WrapperOneOfTest.java
-src/test/java/test/test/runtime/model/WrapperTest.java
-src/main/java/test/test/runtime/api/handlers/Handlers.java
-src/main/java/test/test/runtime/api/handlers/Response.java
-src/main/java/test/test/runtime/api/handlers/ApiResponse.java
-src/main/java/test/test/runtime/api/handlers/Interceptor.java
-src/main/java/test/test/runtime/api/handlers/Interceptors.java
-src/main/java/test/test/runtime/api/handlers/HandlerChain.java
-src/main/java/test/test/runtime/api/handlers/RequestInput.java
-src/main/java/test/test/runtime/api/handlers/ChainedRequestInput.java
-src/main/java/test/test/runtime/api/handlers/InterceptorWarmupChainedRequestInput.java
-src/main/java/test/test/runtime/api/handlers/InterceptorWithWarmup.java
-src/main/java/test/test/runtime/api/handlers/op_get/OpGetResponse.java
-src/main/java/test/test/runtime/api/handlers/op_get/OpGet200Response.java
-src/main/java/test/test/runtime/api/handlers/op_get/OpGetRequestParameters.java
-src/main/java/test/test/runtime/api/handlers/op_get/OpGetInput.java
-src/main/java/test/test/runtime/api/handlers/op_get/OpGetRequestInput.java
-src/main/java/test/test/runtime/api/handlers/op_get/OpGet.java
-src/main/java/test/test/runtime/api/handlers/HandlerRouter.java
-src/main/java/test/test/runtime/api/interceptors/TryCatchInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/ResponseHeadersInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/powertools/LoggingInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/powertools/TracingInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/powertools/MetricsInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java",
-  ".openapi-generator/VERSION": "6.3.0",
-  ".pdk/dynamic-files/openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
-  "README.md": "# com.aws.pdk.test
-
-composite models
-- API version: 1.0.0
-
-No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
-
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
-
-## Requirements
-
-Building the API client library requires:
-1. Java 1.8+
-2. Maven (3.8.3+)/Gradle (7.2+)
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-\`\`\`shell
-mvn clean install
-\`\`\`
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-\`\`\`shell
-mvn clean deploy
-\`\`\`
-
-Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-\`\`\`xml
-<dependency>
-  <groupId>test</groupId>
-  <artifactId>com.aws.pdk.test</artifactId>
-  <version>1.0.0</version>
-  <scope>compile</scope>
-</dependency>
-\`\`\`
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-\`\`\`groovy
-  repositories {
-    mavenCentral()     // Needed if the 'com.aws.pdk.test' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'com.aws.pdk.test' jar has been published to the local maven repo.
-  }
-
-  dependencies {
-     implementation "test:com.aws.pdk.test:1.0.0"
-  }
-\`\`\`
-
-### Others
-
-At first generate the JAR by executing:
-
-\`\`\`shell
-mvn clean package
-\`\`\`
-
-Then manually install the following JARs:
-
-* \`target/com.aws.pdk.test-1.0.0.jar\`
-* \`target/lib/*.jar\`
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following Java code:
-
-\`\`\`java
-
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      Wrapper result = apiInstance.opGet()
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#opGet");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-
-\`\`\`
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://localhost*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*DefaultApi* | [**opGet**](docs/DefaultApi.md#opGet) | **GET** /op | 
-
-
-## Documentation for Models
-
- - [A](docs/A.md)
- - [AllOfInlineAndRefs](docs/AllOfInlineAndRefs.md)
- - [AllOfInlineAndRefsAllOf](docs/AllOfInlineAndRefsAllOf.md)
- - [AllOfInlineAndRefsAllOf1](docs/AllOfInlineAndRefsAllOf1.md)
- - [AllOfRefs](docs/AllOfRefs.md)
- - [AnyOfInlineAndRefs](docs/AnyOfInlineAndRefs.md)
- - [AnyOfPrimitives](docs/AnyOfPrimitives.md)
- - [AnyOfPrimitivesAndRefs](docs/AnyOfPrimitivesAndRefs.md)
- - [AnyOfRefs](docs/AnyOfRefs.md)
- - [B](docs/B.md)
- - [C](docs/C.md)
- - [OneOfInlineAndRefs](docs/OneOfInlineAndRefs.md)
- - [OneOfPrimitives](docs/OneOfPrimitives.md)
- - [OneOfPrimitivesAndRefs](docs/OneOfPrimitivesAndRefs.md)
- - [OneOfRefs](docs/OneOfRefs.md)
- - [Wrapper](docs/Wrapper.md)
- - [WrapperAllOf](docs/WrapperAllOf.md)
- - [WrapperAnyOf](docs/WrapperAnyOf.md)
- - [WrapperOneOf](docs/WrapperOneOf.md)
-
-
-## Documentation for Authorization
-
-All endpoints do not require authorization.
-Authentication schemes defined for the API:
-
-## Recommendation
-
-It's recommended to create an instance of \`ApiClient\` per thread in a multithreaded environment to avoid any potential issues.
-
-## Author
-
-
-
-",
-  "api/openapi.yaml": "openapi: 3.0.3
-info:
-  title: composite models
-  version: 1.0.0
-servers:
-- url: /
-paths:
-  /op:
-    get:
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Wrapper'
-          description: Successful response
-      x-accepts: application/json
-components:
-  schemas:
-    A:
-      properties:
-        a:
-          type: string
-      required:
-      - a
-      type: object
-    B:
-      properties:
-        b:
-          type: string
-      required:
-      - b
-      type: object
-    C:
-      properties:
-        c:
-          type: string
-      required:
-      - c
-      type: object
-    AllOfInlineAndRefs:
-      allOf:
-      - $ref: '#/components/schemas/AllOfInlineAndRefs_allOf'
-      - $ref: '#/components/schemas/A'
-      - $ref: '#/components/schemas/B'
-      - $ref: '#/components/schemas/C'
-      - $ref: '#/components/schemas/AllOfInlineAndRefs_allOf_1'
-    AllOfRefs:
-      allOf:
-      - $ref: '#/components/schemas/A'
-      - $ref: '#/components/schemas/B'
-      - $ref: '#/components/schemas/C'
-    AnyOfPrimitives:
-      anyOf:
-      - type: string
-      - type: integer
-    AnyOfPrimitivesAndRefs:
-      anyOf:
-      - type: string
-      - $ref: '#/components/schemas/A'
-    AnyOfRefs:
-      anyOf:
-      - $ref: '#/components/schemas/A'
-      - $ref: '#/components/schemas/B'
-      - $ref: '#/components/schemas/C'
-    AnyOfInlineAndRefs:
-      anyOf:
-      - $ref: '#/components/schemas/AllOfInlineAndRefs_allOf'
-      - $ref: '#/components/schemas/A'
-      - $ref: '#/components/schemas/B'
-      - $ref: '#/components/schemas/C'
-      - $ref: '#/components/schemas/AllOfInlineAndRefs_allOf_1'
-    OneOfPrimitives:
-      oneOf:
-      - type: string
-      - type: integer
-    OneOfPrimitivesAndRefs:
-      oneOf:
-      - type: string
-      - $ref: '#/components/schemas/A'
-    OneOfRefs:
-      oneOf:
-      - $ref: '#/components/schemas/A'
-      - $ref: '#/components/schemas/B'
-      - $ref: '#/components/schemas/C'
-    OneOfInlineAndRefs:
-      oneOf:
-      - $ref: '#/components/schemas/AllOfInlineAndRefs_allOf'
-      - $ref: '#/components/schemas/A'
-      - $ref: '#/components/schemas/B'
-      - $ref: '#/components/schemas/C'
-      - $ref: '#/components/schemas/AllOfInlineAndRefs_allOf_1'
-    Wrapper:
-      properties:
-        allOf:
-          $ref: '#/components/schemas/Wrapper_allOf'
-        anyOf:
-          $ref: '#/components/schemas/Wrapper_anyOf'
-        oneOf:
-          $ref: '#/components/schemas/Wrapper_oneOf'
-      type: object
-    AllOfInlineAndRefs_allOf:
-      properties:
-        d:
-          type: string
-      required:
-      - d
-      type: object
-      example: null
-    AllOfInlineAndRefs_allOf_1:
-      properties:
-        e:
-          type: string
-      type: object
-      example: null
-    Wrapper_allOf:
-      properties:
-        refs:
-          $ref: '#/components/schemas/AllOfRefs'
-        inlineAndRefs:
-          $ref: '#/components/schemas/AllOfInlineAndRefs'
-      type: object
-    Wrapper_anyOf:
-      properties:
-        refs:
-          $ref: '#/components/schemas/AnyOfRefs'
-        inlineAndRefs:
-          $ref: '#/components/schemas/AnyOfInlineAndRefs'
-        primitives:
-          $ref: '#/components/schemas/AnyOfPrimitives'
-        primitivesAndRefs:
-          $ref: '#/components/schemas/AnyOfPrimitivesAndRefs'
-      type: object
-    Wrapper_oneOf:
-      properties:
-        refs:
-          $ref: '#/components/schemas/OneOfRefs'
-        inlineAndRefs:
-          $ref: '#/components/schemas/OneOfInlineAndRefs'
-        primitives:
-          $ref: '#/components/schemas/OneOfPrimitives'
-        primitivesAndRefs:
-          $ref: '#/components/schemas/OneOfPrimitivesAndRefs'
-      type: object
-
-",
-  "docs/A.md": "
-
-# A
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**a** | **String** |  |  |
-
-
-
-",
-  "docs/AllOfInlineAndRefs.md": "
-
-# AllOfInlineAndRefs
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**d** | **String** |  |  |
-|**a** | **String** |  |  |
-|**b** | **String** |  |  |
-|**c** | **String** |  |  |
-|**e** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/AllOfInlineAndRefsAllOf.md": "
-
-# AllOfInlineAndRefsAllOf
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**d** | **String** |  |  |
-
-
-
-",
-  "docs/AllOfInlineAndRefsAllOf1.md": "
-
-# AllOfInlineAndRefsAllOf1
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**e** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/AllOfRefs.md": "
-
-# AllOfRefs
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**a** | **String** |  |  |
-|**b** | **String** |  |  |
-|**c** | **String** |  |  |
-
-
-
-",
-  "docs/AnyOfInlineAndRefs.md": "
-
-# AnyOfInlineAndRefs
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**d** | **String** |  |  |
-|**a** | **String** |  |  |
-|**b** | **String** |  |  |
-|**c** | **String** |  |  |
-|**e** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/AnyOfPrimitives.md": "
-
-# AnyOfPrimitives
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-
-
-
-",
-  "docs/AnyOfPrimitivesAndRefs.md": "
-
-# AnyOfPrimitivesAndRefs
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**a** | **String** |  |  |
-
-
-
-",
-  "docs/AnyOfRefs.md": "
-
-# AnyOfRefs
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**a** | **String** |  |  |
-|**b** | **String** |  |  |
-|**c** | **String** |  |  |
-
-
-
-",
-  "docs/B.md": "
-
-# B
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**b** | **String** |  |  |
-
-
-
-",
-  "docs/C.md": "
-
-# C
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**c** | **String** |  |  |
-
-
-
-",
-  "docs/DefaultApi.md": "# DefaultApi
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**opGet**](DefaultApi.md#opGet) | **GET** /op |  |
-
-
-<a name="opGet"></a>
-# **opGet**
-> Wrapper opGet().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      Wrapper result = apiInstance.opGet()
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#opGet");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**Wrapper**](Wrapper.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Successful response |  -  |
-
-",
-  "docs/OneOfInlineAndRefs.md": "
-
-# OneOfInlineAndRefs
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**d** | **String** |  |  |
-|**a** | **String** |  |  |
-|**b** | **String** |  |  |
-|**c** | **String** |  |  |
-|**e** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/OneOfPrimitives.md": "
-
-# OneOfPrimitives
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-
-
-
-",
-  "docs/OneOfPrimitivesAndRefs.md": "
-
-# OneOfPrimitivesAndRefs
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**a** | **String** |  |  |
-
-
-
-",
-  "docs/OneOfRefs.md": "
-
-# OneOfRefs
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**a** | **String** |  |  |
-|**b** | **String** |  |  |
-|**c** | **String** |  |  |
-
-
-
-",
-  "docs/Wrapper.md": "
-
-# Wrapper
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**allOf** | [**WrapperAllOf**](WrapperAllOf.md) |  |  [optional] |
-|**anyOf** | [**WrapperAnyOf**](WrapperAnyOf.md) |  |  [optional] |
-|**oneOf** | [**WrapperOneOf**](WrapperOneOf.md) |  |  [optional] |
-
-
-
-",
-  "docs/WrapperAllOf.md": "
-
-# WrapperAllOf
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**refs** | [**AllOfRefs**](AllOfRefs.md) |  |  [optional] |
-|**inlineAndRefs** | [**AllOfInlineAndRefs**](AllOfInlineAndRefs.md) |  |  [optional] |
-
-
-
-",
-  "docs/WrapperAnyOf.md": "
-
-# WrapperAnyOf
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**refs** | [**AnyOfRefs**](AnyOfRefs.md) |  |  [optional] |
-|**inlineAndRefs** | [**AnyOfInlineAndRefs**](AnyOfInlineAndRefs.md) |  |  [optional] |
-|**primitives** | [**AnyOfPrimitives**](AnyOfPrimitives.md) |  |  [optional] |
-|**primitivesAndRefs** | [**AnyOfPrimitivesAndRefs**](AnyOfPrimitivesAndRefs.md) |  |  [optional] |
-
-
-
-",
-  "docs/WrapperOneOf.md": "
-
-# WrapperOneOf
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**refs** | [**OneOfRefs**](OneOfRefs.md) |  |  [optional] |
-|**inlineAndRefs** | [**OneOfInlineAndRefs**](OneOfInlineAndRefs.md) |  |  [optional] |
-|**primitives** | [**OneOfPrimitives**](OneOfPrimitives.md) |  |  [optional] |
-|**primitivesAndRefs** | [**OneOfPrimitivesAndRefs**](OneOfPrimitivesAndRefs.md) |  |  [optional] |
-
-
-
-",
-  "openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
+src/main/java/test/test/runtime/model/WrapperOneOf.java",
   "src/main/java/test/test/runtime/ApiCallback.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -7136,13 +5897,12 @@ public interface ApiCallback<T> {
 ",
   "src/main/java/test/test/runtime/ApiClient.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -7274,7 +6034,7 @@ public class ApiClient {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/1.0.0/java");
+        setUserAgent("OpenAPI-Generator/0.0.0/java");
 
         authentications = new HashMap<String, Authentication>();
     }
@@ -8526,10 +7286,10 @@ public class ApiClient {
     /**
      * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
      *
-     * @param mpBuilder MultipartBody.Builder 
+     * @param mpBuilder MultipartBody.Builder
      * @param key The key of the Header element
      * @param file The file to add to the Header
-     */ 
+     */
     private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
         Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\\"" + key + "\\"; filename=\\"" + file.getName() + "\\"");
         MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
@@ -8683,13 +7443,12 @@ public class ApiClient {
 ",
   "src/main/java/test/test/runtime/ApiException.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -8705,12 +7464,11 @@ import javax.ws.rs.core.GenericType;
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
- 
+
     /**
      * <p>Constructor for ApiException.</p>
      */
@@ -8850,13 +7608,12 @@ public class ApiException extends Exception {
 ",
   "src/main/java/test/test/runtime/ApiResponse.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -8909,7 +7666,7 @@ public class ApiResponse<T> {
     /**
      * <p>Get the <code>headers</code>.</p>
      *
-     * @return a {@link java.util.Map} of headers 
+     * @return a {@link java.util.Map} of headers
      */
     public Map<String, List<String>> getHeaders() {
         return headers;
@@ -8927,20 +7684,18 @@ public class ApiResponse<T> {
 ",
   "src/main/java/test/test/runtime/Configuration.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
@@ -8967,13 +7722,12 @@ public class Configuration {
 ",
   "src/main/java/test/test/runtime/GzipRequestInterceptor.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9053,13 +7807,12 @@ class GzipRequestInterceptor implements Interceptor {
 ",
   "src/main/java/test/test/runtime/JSON.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9152,12 +7905,16 @@ public class JSON {
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.AllOfInlineAndRefsAllOf1.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.AllOfRefs.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.AnyOfInlineAndRefs.CustomTypeAdapterFactory());
+        gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.AnyOfInlineAndRefsAnyOf.CustomTypeAdapterFactory());
+        gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.AnyOfInlineAndRefsAnyOf1.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.AnyOfPrimitives.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.AnyOfPrimitivesAndRefs.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.AnyOfRefs.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.B.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.C.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.OneOfInlineAndRefs.CustomTypeAdapterFactory());
+        gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.OneOfInlineAndRefsOneOf.CustomTypeAdapterFactory());
+        gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.OneOfInlineAndRefsOneOf1.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.OneOfPrimitives.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.OneOfPrimitivesAndRefs.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new test.test.runtime.model.OneOfRefs.CustomTypeAdapterFactory());
@@ -9473,20 +8230,18 @@ public class JSON {
 ",
   "src/main/java/test/test/runtime/Pair.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
@@ -9531,13 +8286,12 @@ public class Pair {
 ",
   "src/main/java/test/test/runtime/ProgressRequestBody.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9605,13 +8359,12 @@ public class ProgressRequestBody extends RequestBody {
 ",
   "src/main/java/test/test/runtime/ProgressResponseBody.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9759,13 +8512,12 @@ public class ServerVariable {
 ",
   "src/main/java/test/test/runtime/StringUtil.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9775,7 +8527,6 @@ package test.test.runtime;
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -9843,13 +8594,12 @@ public class StringUtil {
 ",
   "src/main/java/test/test/runtime/api/DefaultApi.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9870,6 +8620,8 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 
+import java.math.BigDecimal;
+import java.io.File;
 import test.test.runtime.model.Wrapper;
 
 import java.lang.reflect.Type;
@@ -9960,19 +8712,20 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call opGetValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return opGetCall(_callback);
 
     }
 
-
     private ApiResponse<Wrapper> opGetWithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = opGetValidateBeforeCall(null);
         Type localVarReturnType = new TypeToken<Wrapper>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call opGetAsync(final ApiCallback<Wrapper> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = opGetValidateBeforeCall(_callback);
@@ -10056,10 +8809,12 @@ public class DefaultApi {
         <tr><td> 200 </td><td> Successful response </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIopGetRequest opGet() {
         return new APIopGetRequest();
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/handlers/ApiResponse.java": "
 package test.test.runtime.api.handlers;
@@ -10209,11 +8964,8 @@ import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-import test.test.runtime.model.Wrapper;
-
 import test.test.runtime.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Handlers {
 
     static {
@@ -11205,8 +9957,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the OpGet operation
  */
@@ -11585,13 +10340,10 @@ public class TracingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.Wrapper;
-
 import java.util.HashMap;
 import java.util.Map;
 
 // Generic type for object "keyed" by operation names
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @lombok.Builder @lombok.Getter
 public class OperationConfig<T> {
     private T opGet;
@@ -11607,8 +10359,6 @@ public class OperationConfig<T> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.Wrapper;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
@@ -11616,7 +10366,6 @@ import java.util.Arrays;
 
 
 // Look up path and http method for a given operation name
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OperationLookup {
     @lombok.Builder @lombok.Getter
     public static class OperationLookupEntry {
@@ -11643,7 +10392,6 @@ public class OperationLookup {
 ",
   "src/main/java/test/test/runtime/api/operation_config/Operations.java": "package test.test.runtime.api.operation_config;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Operations {
     /**
      * Returns an OperationConfig Builder with all values populated with the given value.
@@ -11659,13 +10407,12 @@ public class Operations {
 ",
   "src/main/java/test/test/runtime/auth/ApiKeyAuth.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -11679,7 +10426,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -11740,13 +10486,12 @@ public class ApiKeyAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/Authentication.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -11777,13 +10522,12 @@ public interface Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBasicAuth.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -11835,13 +10579,12 @@ public class HttpBasicAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBearerAuth.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -11855,7 +10598,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
@@ -11899,13 +10641,12 @@ public class HttpBearerAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/model/A.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -11921,24 +10662,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -11946,7 +10709,6 @@ import test.test.runtime.JSON;
  * A
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class A {
   public static final String SERIALIZED_NAME_A = "a";
   @SerializedName(SERIALIZED_NAME_A)
@@ -11956,7 +10718,7 @@ public class A {
   }
 
   public A a(String a) {
-    
+
     this.a = a;
     return this;
   }
@@ -11966,7 +10728,6 @@ public class A {
    * @return a
   **/
   @javax.annotation.Nonnull
-
   public String getA() {
     return a;
   }
@@ -11977,7 +10738,6 @@ public class A {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -11986,8 +10746,9 @@ public class A {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    A A = (A) o;
-    return Objects.equals(this.a, A.a);
+    A a = (A) o;
+    return Objects.equals(this.a, a.a);
+        
   }
 
   @Override
@@ -12110,17 +10871,15 @@ public class A {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -12139,7 +10898,6 @@ import javax.ws.rs.core.GenericType;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -12265,13 +11023,12 @@ public abstract class AbstractOpenApiSchema {
 ",
   "src/main/java/test/test/runtime/model/AllOfInlineAndRefs.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -12287,24 +11044,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -12312,7 +11091,6 @@ import test.test.runtime.JSON;
  * AllOfInlineAndRefs
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AllOfInlineAndRefs {
   public static final String SERIALIZED_NAME_D = "d";
   @SerializedName(SERIALIZED_NAME_D)
@@ -12338,7 +11116,7 @@ public class AllOfInlineAndRefs {
   }
 
   public AllOfInlineAndRefs d(String d) {
-    
+
     this.d = d;
     return this;
   }
@@ -12348,7 +11126,6 @@ public class AllOfInlineAndRefs {
    * @return d
   **/
   @javax.annotation.Nonnull
-
   public String getD() {
     return d;
   }
@@ -12358,9 +11135,8 @@ public class AllOfInlineAndRefs {
     this.d = d;
   }
 
-
   public AllOfInlineAndRefs a(String a) {
-    
+
     this.a = a;
     return this;
   }
@@ -12370,7 +11146,6 @@ public class AllOfInlineAndRefs {
    * @return a
   **/
   @javax.annotation.Nonnull
-
   public String getA() {
     return a;
   }
@@ -12380,9 +11155,8 @@ public class AllOfInlineAndRefs {
     this.a = a;
   }
 
-
   public AllOfInlineAndRefs b(String b) {
-    
+
     this.b = b;
     return this;
   }
@@ -12392,7 +11166,6 @@ public class AllOfInlineAndRefs {
    * @return b
   **/
   @javax.annotation.Nonnull
-
   public String getB() {
     return b;
   }
@@ -12402,9 +11175,8 @@ public class AllOfInlineAndRefs {
     this.b = b;
   }
 
-
   public AllOfInlineAndRefs c(String c) {
-    
+
     this.c = c;
     return this;
   }
@@ -12414,7 +11186,6 @@ public class AllOfInlineAndRefs {
    * @return c
   **/
   @javax.annotation.Nonnull
-
   public String getC() {
     return c;
   }
@@ -12424,9 +11195,8 @@ public class AllOfInlineAndRefs {
     this.c = c;
   }
 
-
   public AllOfInlineAndRefs e(String e) {
-    
+
     this.e = e;
     return this;
   }
@@ -12436,7 +11206,6 @@ public class AllOfInlineAndRefs {
    * @return e
   **/
   @javax.annotation.Nullable
-
   public String getE() {
     return e;
   }
@@ -12447,7 +11216,6 @@ public class AllOfInlineAndRefs {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -12462,6 +11230,7 @@ public class AllOfInlineAndRefs {
         Objects.equals(this.b, allOfInlineAndRefs.b) &&
         Objects.equals(this.c, allOfInlineAndRefs.c) &&
         Objects.equals(this.e, allOfInlineAndRefs.e);
+        
   }
 
   @Override
@@ -12607,17 +11376,15 @@ public class AllOfInlineAndRefs {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
-  "src/main/java/test/test/runtime/model/AllOfInlineAndRefsAllOf.java": "/*
+  "src/main/java/test/test/runtime/model/AllOfRefs.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -12633,61 +11400,128 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
 /**
- * AllOfInlineAndRefsAllOf
+ * AllOfRefs
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AllOfInlineAndRefsAllOf {
-  public static final String SERIALIZED_NAME_D = "d";
-  @SerializedName(SERIALIZED_NAME_D)
-  private String d;
+public class AllOfRefs {
+  public static final String SERIALIZED_NAME_A = "a";
+  @SerializedName(SERIALIZED_NAME_A)
+  private String a;
+
+  public static final String SERIALIZED_NAME_B = "b";
+  @SerializedName(SERIALIZED_NAME_B)
+  private String b;
+
+  public static final String SERIALIZED_NAME_C = "c";
+  @SerializedName(SERIALIZED_NAME_C)
+  private String c;
 
-  public AllOfInlineAndRefsAllOf() {
+  public AllOfRefs() {
   }
 
-  public AllOfInlineAndRefsAllOf d(String d) {
-    
-    this.d = d;
+  public AllOfRefs a(String a) {
+
+    this.a = a;
     return this;
   }
 
    /**
-   * Get d
-   * @return d
+   * Get a
+   * @return a
   **/
   @javax.annotation.Nonnull
+  public String getA() {
+    return a;
+  }
 
-  public String getD() {
-    return d;
+
+  public void setA(String a) {
+    this.a = a;
   }
 
+  public AllOfRefs b(String b) {
 
-  public void setD(String d) {
-    this.d = d;
+    this.b = b;
+    return this;
+  }
+
+   /**
+   * Get b
+   * @return b
+  **/
+  @javax.annotation.Nonnull
+  public String getB() {
+    return b;
+  }
+
+
+  public void setB(String b) {
+    this.b = b;
   }
 
+  public AllOfRefs c(String c) {
+
+    this.c = c;
+    return this;
+  }
+
+   /**
+   * Get c
+   * @return c
+  **/
+  @javax.annotation.Nonnull
+  public String getC() {
+    return c;
+  }
+
+
+  public void setC(String c) {
+    this.c = c;
+  }
 
 
   @Override
@@ -12698,498 +11532,25 @@ public class AllOfInlineAndRefsAllOf {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    AllOfInlineAndRefsAllOf allOfInlineAndRefsAllOf = (AllOfInlineAndRefsAllOf) o;
-    return Objects.equals(this.d, allOfInlineAndRefsAllOf.d);
+    AllOfRefs allOfRefs = (AllOfRefs) o;
+    return Objects.equals(this.a, allOfRefs.a) &&
+        Objects.equals(this.b, allOfRefs.b) &&
+        Objects.equals(this.c, allOfRefs.c);
+        
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(d);
+    return Objects.hash(a, b, c);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class AllOfInlineAndRefsAllOf {\\n");
-    sb.append("    d: ").append(toIndentedString(d)).append("\\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\\n", "\\n    ");
-  }
-
-
-  public static HashSet<String> openapiFields;
-  public static HashSet<String> openapiRequiredFields;
-
-  static {
-    // a set of all properties/fields (JSON key names)
-    openapiFields = new HashSet<String>();
-    openapiFields.add("d");
-
-    // a set of required properties/fields (JSON key names)
-    openapiRequiredFields = new HashSet<String>();
-    openapiRequiredFields.add("d");
-  }
-
- /**
-  * Validates the JSON Object and throws an exception if issues found
-  *
-  * @param jsonObj JSON Object
-  * @throws IOException if the JSON Object is invalid with respect to AllOfInlineAndRefsAllOf
-  */
-  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
-      if (jsonObj == null) {
-        if (!AllOfInlineAndRefsAllOf.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
-          throw new IllegalArgumentException(String.format("The required field(s) %s in AllOfInlineAndRefsAllOf is not found in the empty JSON string", AllOfInlineAndRefsAllOf.openapiRequiredFields.toString()));
-        }
-      }
-
-      Set<Entry<String, JsonElement>> entries = jsonObj.entrySet();
-      // check to see if the JSON string contains additional fields
-      for (Entry<String, JsonElement> entry : entries) {
-        if (!AllOfInlineAndRefsAllOf.openapiFields.contains(entry.getKey())) {
-          throw new IllegalArgumentException(String.format("The field \`%s\` in the JSON string is not defined in the \`AllOfInlineAndRefsAllOf\` properties. JSON: %s", entry.getKey(), jsonObj.toString()));
-        }
-      }
-
-      // check to make sure all required properties/fields are present in the JSON string
-      for (String requiredField : AllOfInlineAndRefsAllOf.openapiRequiredFields) {
-        if (jsonObj.get(requiredField) == null) {
-          throw new IllegalArgumentException(String.format("The required field \`%s\` is not found in the JSON string: %s", requiredField, jsonObj.toString()));
-        }
-      }
-      if (!jsonObj.get("d").isJsonPrimitive()) {
-        throw new IllegalArgumentException(String.format("Expected the field \`d\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("d").toString()));
-      }
-  }
-
-  public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
-       if (!AllOfInlineAndRefsAllOf.class.isAssignableFrom(type.getRawType())) {
-         return null; // this class only serializes 'AllOfInlineAndRefsAllOf' and its subtypes
-       }
-       final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-       final TypeAdapter<AllOfInlineAndRefsAllOf> thisAdapter
-                        = gson.getDelegateAdapter(this, TypeToken.get(AllOfInlineAndRefsAllOf.class));
-
-       return (TypeAdapter<T>) new TypeAdapter<AllOfInlineAndRefsAllOf>() {
-           @Override
-           public void write(JsonWriter out, AllOfInlineAndRefsAllOf value) throws IOException {
-             JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
-             elementAdapter.write(out, obj);
-           }
-
-           @Override
-           public AllOfInlineAndRefsAllOf read(JsonReader in) throws IOException {
-             JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
-             validateJsonObject(jsonObj);
-             return thisAdapter.fromJsonTree(jsonObj);
-           }
-
-       }.nullSafe();
-    }
-  }
-
- /**
-  * Create an instance of AllOfInlineAndRefsAllOf given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AllOfInlineAndRefsAllOf
-  * @throws IOException if the JSON string is invalid with respect to AllOfInlineAndRefsAllOf
-  */
-  public static AllOfInlineAndRefsAllOf fromJson(String jsonString) throws IOException {
-    return JSON.getGson().fromJson(jsonString, AllOfInlineAndRefsAllOf.class);
-  }
-
- /**
-  * Convert an instance of AllOfInlineAndRefsAllOf to an JSON string
-  *
-  * @return JSON string
-  */
-  public String toJson() {
-    return JSON.getGson().toJson(this);
-  }
-}
-
-",
-  "src/main/java/test/test/runtime/model/AllOfInlineAndRefsAllOf1.java": "/*
- * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package test.test.runtime.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import test.test.runtime.JSON;
-
-/**
- * AllOfInlineAndRefsAllOf1
- */
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AllOfInlineAndRefsAllOf1 {
-  public static final String SERIALIZED_NAME_E = "e";
-  @SerializedName(SERIALIZED_NAME_E)
-  private String e;
-
-  public AllOfInlineAndRefsAllOf1() {
-  }
-
-  public AllOfInlineAndRefsAllOf1 e(String e) {
-    
-    this.e = e;
-    return this;
-  }
-
-   /**
-   * Get e
-   * @return e
-  **/
-  @javax.annotation.Nullable
-
-  public String getE() {
-    return e;
-  }
-
-
-  public void setE(String e) {
-    this.e = e;
-  }
-
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AllOfInlineAndRefsAllOf1 allOfInlineAndRefsAllOf1 = (AllOfInlineAndRefsAllOf1) o;
-    return Objects.equals(this.e, allOfInlineAndRefsAllOf1.e);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(e);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AllOfInlineAndRefsAllOf1 {\\n");
-    sb.append("    e: ").append(toIndentedString(e)).append("\\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\\n", "\\n    ");
-  }
-
-
-  public static HashSet<String> openapiFields;
-  public static HashSet<String> openapiRequiredFields;
-
-  static {
-    // a set of all properties/fields (JSON key names)
-    openapiFields = new HashSet<String>();
-    openapiFields.add("e");
-
-    // a set of required properties/fields (JSON key names)
-    openapiRequiredFields = new HashSet<String>();
-  }
-
- /**
-  * Validates the JSON Object and throws an exception if issues found
-  *
-  * @param jsonObj JSON Object
-  * @throws IOException if the JSON Object is invalid with respect to AllOfInlineAndRefsAllOf1
-  */
-  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
-      if (jsonObj == null) {
-        if (!AllOfInlineAndRefsAllOf1.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
-          throw new IllegalArgumentException(String.format("The required field(s) %s in AllOfInlineAndRefsAllOf1 is not found in the empty JSON string", AllOfInlineAndRefsAllOf1.openapiRequiredFields.toString()));
-        }
-      }
-
-      Set<Entry<String, JsonElement>> entries = jsonObj.entrySet();
-      // check to see if the JSON string contains additional fields
-      for (Entry<String, JsonElement> entry : entries) {
-        if (!AllOfInlineAndRefsAllOf1.openapiFields.contains(entry.getKey())) {
-          throw new IllegalArgumentException(String.format("The field \`%s\` in the JSON string is not defined in the \`AllOfInlineAndRefsAllOf1\` properties. JSON: %s", entry.getKey(), jsonObj.toString()));
-        }
-      }
-      if ((jsonObj.get("e") != null && !jsonObj.get("e").isJsonNull()) && !jsonObj.get("e").isJsonPrimitive()) {
-        throw new IllegalArgumentException(String.format("Expected the field \`e\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("e").toString()));
-      }
-  }
-
-  public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
-       if (!AllOfInlineAndRefsAllOf1.class.isAssignableFrom(type.getRawType())) {
-         return null; // this class only serializes 'AllOfInlineAndRefsAllOf1' and its subtypes
-       }
-       final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-       final TypeAdapter<AllOfInlineAndRefsAllOf1> thisAdapter
-                        = gson.getDelegateAdapter(this, TypeToken.get(AllOfInlineAndRefsAllOf1.class));
-
-       return (TypeAdapter<T>) new TypeAdapter<AllOfInlineAndRefsAllOf1>() {
-           @Override
-           public void write(JsonWriter out, AllOfInlineAndRefsAllOf1 value) throws IOException {
-             JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
-             elementAdapter.write(out, obj);
-           }
-
-           @Override
-           public AllOfInlineAndRefsAllOf1 read(JsonReader in) throws IOException {
-             JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
-             validateJsonObject(jsonObj);
-             return thisAdapter.fromJsonTree(jsonObj);
-           }
-
-       }.nullSafe();
-    }
-  }
-
- /**
-  * Create an instance of AllOfInlineAndRefsAllOf1 given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AllOfInlineAndRefsAllOf1
-  * @throws IOException if the JSON string is invalid with respect to AllOfInlineAndRefsAllOf1
-  */
-  public static AllOfInlineAndRefsAllOf1 fromJson(String jsonString) throws IOException {
-    return JSON.getGson().fromJson(jsonString, AllOfInlineAndRefsAllOf1.class);
-  }
-
- /**
-  * Convert an instance of AllOfInlineAndRefsAllOf1 to an JSON string
-  *
-  * @return JSON string
-  */
-  public String toJson() {
-    return JSON.getGson().toJson(this);
-  }
-}
-
-",
-  "src/main/java/test/test/runtime/model/AllOfRefs.java": "/*
- * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package test.test.runtime.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import test.test.runtime.JSON;
-
-/**
- * AllOfRefs
- */
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AllOfRefs {
-  public static final String SERIALIZED_NAME_A = "a";
-  @SerializedName(SERIALIZED_NAME_A)
-  private String a;
-
-  public static final String SERIALIZED_NAME_B = "b";
-  @SerializedName(SERIALIZED_NAME_B)
-  private String b;
-
-  public static final String SERIALIZED_NAME_C = "c";
-  @SerializedName(SERIALIZED_NAME_C)
-  private String c;
-
-  public AllOfRefs() {
-  }
-
-  public AllOfRefs a(String a) {
-    
-    this.a = a;
-    return this;
-  }
-
-   /**
-   * Get a
-   * @return a
-  **/
-  @javax.annotation.Nonnull
-
-  public String getA() {
-    return a;
-  }
-
-
-  public void setA(String a) {
-    this.a = a;
-  }
-
-
-  public AllOfRefs b(String b) {
-    
-    this.b = b;
-    return this;
-  }
-
-   /**
-   * Get b
-   * @return b
-  **/
-  @javax.annotation.Nonnull
-
-  public String getB() {
-    return b;
-  }
-
-
-  public void setB(String b) {
-    this.b = b;
-  }
-
-
-  public AllOfRefs c(String c) {
-    
-    this.c = c;
-    return this;
-  }
-
-   /**
-   * Get c
-   * @return c
-  **/
-  @javax.annotation.Nonnull
-
-  public String getC() {
-    return c;
-  }
-
-
-  public void setC(String c) {
-    this.c = c;
-  }
-
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AllOfRefs allOfRefs = (AllOfRefs) o;
-    return Objects.equals(this.a, allOfRefs.a) &&
-        Objects.equals(this.b, allOfRefs.b) &&
-        Objects.equals(this.c, allOfRefs.c);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(a, b, c);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AllOfRefs {\\n");
-    sb.append("    a: ").append(toIndentedString(a)).append("\\n");
-    sb.append("    b: ").append(toIndentedString(b)).append("\\n");
-    sb.append("    c: ").append(toIndentedString(c)).append("\\n");
+    sb.append("class AllOfRefs {\\n");
+    sb.append("    a: ").append(toIndentedString(a)).append("\\n");
+    sb.append("    b: ").append(toIndentedString(b)).append("\\n");
+    sb.append("    c: ").append(toIndentedString(c)).append("\\n");
     sb.append("}");
     return sb.toString();
   }
@@ -13310,17 +11671,15 @@ public class AllOfRefs {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/AnyOfInlineAndRefs.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -13329,21 +11688,27 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.A;
+import test.test.runtime.model.AnyOfInlineAndRefsAnyOf;
+import test.test.runtime.model.AnyOfInlineAndRefsAnyOf1;
+import test.test.runtime.model.B;
+import test.test.runtime.model.C;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.A;
-import test.test.runtime.model.AllOfInlineAndRefsAllOf;
-import test.test.runtime.model.AllOfInlineAndRefsAllOf1;
-import test.test.runtime.model.B;
-import test.test.runtime.model.C;
 
 import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -13352,9 +11717,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -13374,8 +11743,7 @@ import com.google.gson.JsonParseException;
 
 import test.test.runtime.JSON;
 
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@lombok.experimental.SuperBuilder
 public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(AnyOfInlineAndRefs.class.getName());
 
@@ -13387,11 +11755,11 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
                 return null; // this class only serializes 'AnyOfInlineAndRefs' and its subtypes
             }
             final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
+            final TypeAdapter<AnyOfInlineAndRefsAnyOf> adapterAnyOfInlineAndRefsAnyOf = gson.getDelegateAdapter(this, TypeToken.get(AnyOfInlineAndRefsAnyOf.class));
             final TypeAdapter<A> adapterA = gson.getDelegateAdapter(this, TypeToken.get(A.class));
-            final TypeAdapter<AllOfInlineAndRefsAllOf> adapterAllOfInlineAndRefsAllOf = gson.getDelegateAdapter(this, TypeToken.get(AllOfInlineAndRefsAllOf.class));
-            final TypeAdapter<AllOfInlineAndRefsAllOf1> adapterAllOfInlineAndRefsAllOf1 = gson.getDelegateAdapter(this, TypeToken.get(AllOfInlineAndRefsAllOf1.class));
             final TypeAdapter<B> adapterB = gson.getDelegateAdapter(this, TypeToken.get(B.class));
             final TypeAdapter<C> adapterC = gson.getDelegateAdapter(this, TypeToken.get(C.class));
+            final TypeAdapter<AnyOfInlineAndRefsAnyOf1> adapterAnyOfInlineAndRefsAnyOf1 = gson.getDelegateAdapter(this, TypeToken.get(AnyOfInlineAndRefsAnyOf1.class));
 
             return (TypeAdapter<T>) new TypeAdapter<AnyOfInlineAndRefs>() {
                 @Override
@@ -13401,23 +11769,16 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    // check if the actual instance is of the type \`A\`
-                    if (value.getActualInstance() instanceof A) {
-                        JsonObject obj = adapterA.toJsonTree((A)value.getActualInstance()).getAsJsonObject();
-                        elementAdapter.write(out, obj);
-                        return;
-                    }
-
-                    // check if the actual instance is of the type \`AllOfInlineAndRefsAllOf\`
-                    if (value.getActualInstance() instanceof AllOfInlineAndRefsAllOf) {
-                        JsonObject obj = adapterAllOfInlineAndRefsAllOf.toJsonTree((AllOfInlineAndRefsAllOf)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`AnyOfInlineAndRefsAnyOf\`
+                    if (value.getActualInstance() instanceof AnyOfInlineAndRefsAnyOf) {
+                        JsonObject obj = adapterAnyOfInlineAndRefsAnyOf.toJsonTree((AnyOfInlineAndRefsAnyOf)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    // check if the actual instance is of the type \`AllOfInlineAndRefsAllOf1\`
-                    if (value.getActualInstance() instanceof AllOfInlineAndRefsAllOf1) {
-                        JsonObject obj = adapterAllOfInlineAndRefsAllOf1.toJsonTree((AllOfInlineAndRefsAllOf1)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`A\`
+                    if (value.getActualInstance() instanceof A) {
+                        JsonObject obj = adapterA.toJsonTree((A)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
@@ -13436,7 +11797,14 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    throw new IOException("Failed to serialize as the type doesn't match anyOf schemas: A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C");
+                    // check if the actual instance is of the type \`AnyOfInlineAndRefsAnyOf1\`
+                    if (value.getActualInstance() instanceof AnyOfInlineAndRefsAnyOf1) {
+                        JsonObject obj = adapterAnyOfInlineAndRefsAnyOf1.toJsonTree((AnyOfInlineAndRefsAnyOf1)value.getActualInstance()).getAsJsonObject();
+                        elementAdapter.write(out, obj);
+                        return;
+                    }
+
+                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: AnyOfInlineAndRefsAnyOf, A, B, C, AnyOfInlineAndRefsAnyOf1");
                 }
 
                 @Override
@@ -13444,43 +11812,31 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
                     Object deserialized = null;
                     JsonObject jsonObject = elementAdapter.read(in).getAsJsonObject();
 
-                    // deserialize A
-                    try {
-                        // validate the JSON object to see if any exception is thrown
-                        A.validateJsonObject(jsonObject);
-                        log.log(Level.FINER, "Input data matches schema 'A'");
-                        AnyOfInlineAndRefs ret = new AnyOfInlineAndRefs();
-                        ret.setActualInstance(adapterA.fromJsonTree(jsonObject));
-                        return ret;
-                    } catch (Exception e) {
-                        // deserialization failed, continue
-                        log.log(Level.FINER, "Input data does not match schema 'A'", e);
-                    }
 
-                    // deserialize AllOfInlineAndRefsAllOf
+                    // deserialize AnyOfInlineAndRefsAnyOf
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        AllOfInlineAndRefsAllOf.validateJsonObject(jsonObject);
-                        log.log(Level.FINER, "Input data matches schema 'AllOfInlineAndRefsAllOf'");
+                        AnyOfInlineAndRefsAnyOf.validateJsonObject(jsonObject);
+                        log.log(Level.FINER, "Input data matches schema 'AnyOfInlineAndRefsAnyOf'");
                         AnyOfInlineAndRefs ret = new AnyOfInlineAndRefs();
-                        ret.setActualInstance(adapterAllOfInlineAndRefsAllOf.fromJsonTree(jsonObject));
+                        ret.setActualInstance(adapterAnyOfInlineAndRefsAnyOf.fromJsonTree(jsonObject));
                         return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        log.log(Level.FINER, "Input data does not match schema 'AllOfInlineAndRefsAllOf'", e);
+                        log.log(Level.FINER, "Input data does not match schema 'AnyOfInlineAndRefsAnyOf'", e);
                     }
 
-                    // deserialize AllOfInlineAndRefsAllOf1
+                    // deserialize A
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        AllOfInlineAndRefsAllOf1.validateJsonObject(jsonObject);
-                        log.log(Level.FINER, "Input data matches schema 'AllOfInlineAndRefsAllOf1'");
+                        A.validateJsonObject(jsonObject);
+                        log.log(Level.FINER, "Input data matches schema 'A'");
                         AnyOfInlineAndRefs ret = new AnyOfInlineAndRefs();
-                        ret.setActualInstance(adapterAllOfInlineAndRefsAllOf1.fromJsonTree(jsonObject));
+                        ret.setActualInstance(adapterA.fromJsonTree(jsonObject));
                         return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        log.log(Level.FINER, "Input data does not match schema 'AllOfInlineAndRefsAllOf1'", e);
+                        log.log(Level.FINER, "Input data does not match schema 'A'", e);
                     }
 
                     // deserialize B
@@ -13509,6 +11865,19 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
                         log.log(Level.FINER, "Input data does not match schema 'C'", e);
                     }
 
+                    // deserialize AnyOfInlineAndRefsAnyOf1
+                    try {
+                        // validate the JSON object to see if any exception is thrown
+                        AnyOfInlineAndRefsAnyOf1.validateJsonObject(jsonObject);
+                        log.log(Level.FINER, "Input data matches schema 'AnyOfInlineAndRefsAnyOf1'");
+                        AnyOfInlineAndRefs ret = new AnyOfInlineAndRefs();
+                        ret.setActualInstance(adapterAnyOfInlineAndRefsAnyOf1.fromJsonTree(jsonObject));
+                        return ret;
+                    } catch (Exception e) {
+                        // deserialization failed, continue
+                        log.log(Level.FINER, "Input data does not match schema 'AnyOfInlineAndRefsAnyOf1'", e);
+                    }
+
 
                     throw new IOException(String.format("Failed deserialization for AnyOfInlineAndRefs: no class matched. JSON: %s", jsonObject.toString()));
                 }
@@ -13523,42 +11892,42 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
         super("anyOf", Boolean.FALSE);
     }
 
-    public AnyOfInlineAndRefs(A o) {
+    public AnyOfInlineAndRefs(AnyOfInlineAndRefsAnyOf o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
-    public AnyOfInlineAndRefs(AllOfInlineAndRefsAllOf o) {
+    public AnyOfInlineAndRefs(A o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
-    public AnyOfInlineAndRefs(AllOfInlineAndRefsAllOf1 o) {
+    public AnyOfInlineAndRefs(B o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
-    public AnyOfInlineAndRefs(B o) {
+    public AnyOfInlineAndRefs(C o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
-    public AnyOfInlineAndRefs(C o) {
+    public AnyOfInlineAndRefs(AnyOfInlineAndRefsAnyOf1 o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
     static {
-        schemas.put("A", new GenericType<A>() {
-        });
-        schemas.put("AllOfInlineAndRefsAllOf", new GenericType<AllOfInlineAndRefsAllOf>() {
+        schemas.put("AnyOfInlineAndRefsAnyOf", new GenericType<AnyOfInlineAndRefsAnyOf>() {
         });
-        schemas.put("AllOfInlineAndRefsAllOf1", new GenericType<AllOfInlineAndRefsAllOf1>() {
+        schemas.put("A", new GenericType<A>() {
         });
         schemas.put("B", new GenericType<B>() {
         });
         schemas.put("C", new GenericType<C>() {
         });
+        schemas.put("AnyOfInlineAndRefsAnyOf1", new GenericType<AnyOfInlineAndRefsAnyOf1>() {
+        });
     }
 
     @Override
@@ -13569,52 +11938,63 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
     /**
      * Set the instance that matches the anyOf child schema, check
      * the instance parameter is valid against the anyOf child schemas:
-     * A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C
+     * AnyOfInlineAndRefsAnyOf, A, B, C, AnyOfInlineAndRefsAnyOf1
      *
      * It could be an instance of the 'anyOf' schemas.
-     * The anyOf child schemas may themselves be a composed schema (allOf, anyOf, anyOf).
+     * The anyOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
      */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof A) {
+        if (instance instanceof AnyOfInlineAndRefsAnyOf) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof AllOfInlineAndRefsAllOf) {
+        if (instance instanceof A) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof AllOfInlineAndRefsAllOf1) {
+        if (instance instanceof B) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof B) {
+        if (instance instanceof C) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof C) {
+        if (instance instanceof AnyOfInlineAndRefsAnyOf1) {
             super.setActualInstance(instance);
             return;
         }
 
-        throw new RuntimeException("Invalid instance type. Must be A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C");
+        throw new RuntimeException("Invalid instance type. Must be AnyOfInlineAndRefsAnyOf, A, B, C, AnyOfInlineAndRefsAnyOf1");
     }
 
     /**
      * Get the actual instance, which can be the following:
-     * A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C
+     * AnyOfInlineAndRefsAnyOf, A, B, C, AnyOfInlineAndRefsAnyOf1
      *
-     * @return The actual instance (A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C)
+     * @return The actual instance (AnyOfInlineAndRefsAnyOf, A, B, C, AnyOfInlineAndRefsAnyOf1)
      */
     @Override
     public Object getActualInstance() {
         return super.getActualInstance();
     }
 
+    /**
+     * Get the actual instance of \`AnyOfInlineAndRefsAnyOf\`. If the actual instance is not \`AnyOfInlineAndRefsAnyOf\`,
+     * the ClassCastException will be thrown.
+     *
+     * @return The actual instance of \`AnyOfInlineAndRefsAnyOf\`
+     * @throws ClassCastException if the instance is not \`AnyOfInlineAndRefsAnyOf\`
+     */
+    public AnyOfInlineAndRefsAnyOf getAnyOfInlineAndRefsAnyOf() throws ClassCastException {
+        return (AnyOfInlineAndRefsAnyOf)super.getActualInstance();
+    }
+
     /**
      * Get the actual instance of \`A\`. If the actual instance is not \`A\`,
      * the ClassCastException will be thrown.
@@ -13627,33 +12007,11 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
     }
 
     /**
-     * Get the actual instance of \`AllOfInlineAndRefsAllOf\`. If the actual instance is not \`AllOfInlineAndRefsAllOf\`,
+     * Get the actual instance of \`B\`. If the actual instance is not \`B\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`AllOfInlineAndRefsAllOf\`
-     * @throws ClassCastException if the instance is not \`AllOfInlineAndRefsAllOf\`
-     */
-    public AllOfInlineAndRefsAllOf getAllOfInlineAndRefsAllOf() throws ClassCastException {
-        return (AllOfInlineAndRefsAllOf)super.getActualInstance();
-    }
-
-    /**
-     * Get the actual instance of \`AllOfInlineAndRefsAllOf1\`. If the actual instance is not \`AllOfInlineAndRefsAllOf1\`,
-     * the ClassCastException will be thrown.
-     *
-     * @return The actual instance of \`AllOfInlineAndRefsAllOf1\`
-     * @throws ClassCastException if the instance is not \`AllOfInlineAndRefsAllOf1\`
-     */
-    public AllOfInlineAndRefsAllOf1 getAllOfInlineAndRefsAllOf1() throws ClassCastException {
-        return (AllOfInlineAndRefsAllOf1)super.getActualInstance();
-    }
-
-    /**
-     * Get the actual instance of \`B\`. If the actual instance is not \`B\`,
-     * the ClassCastException will be thrown.
-     *
-     * @return The actual instance of \`B\`
-     * @throws ClassCastException if the instance is not \`B\`
+     * @return The actual instance of \`B\`
+     * @throws ClassCastException if the instance is not \`B\`
      */
     public B getB() throws ClassCastException {
         return (B)super.getActualInstance();
@@ -13670,6 +12028,17 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
         return (C)super.getActualInstance();
     }
 
+    /**
+     * Get the actual instance of \`AnyOfInlineAndRefsAnyOf1\`. If the actual instance is not \`AnyOfInlineAndRefsAnyOf1\`,
+     * the ClassCastException will be thrown.
+     *
+     * @return The actual instance of \`AnyOfInlineAndRefsAnyOf1\`
+     * @throws ClassCastException if the instance is not \`AnyOfInlineAndRefsAnyOf1\`
+     */
+    public AnyOfInlineAndRefsAnyOf1 getAnyOfInlineAndRefsAnyOf1() throws ClassCastException {
+        return (AnyOfInlineAndRefsAnyOf1)super.getActualInstance();
+    }
+
 
  /**
   * Validates the JSON Object and throws an exception if issues found
@@ -13680,48 +12049,48 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
     // validate anyOf schemas one by one
     int validCount = 0;
-    // validate the json string with A
+    // validate the json string with AnyOfInlineAndRefsAnyOf
     try {
-      A.validateJsonObject(jsonObj);
+      AnyOfInlineAndRefsAnyOf.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
-    // validate the json string with AllOfInlineAndRefsAllOf
+    // validate the json string with A
     try {
-      AllOfInlineAndRefsAllOf.validateJsonObject(jsonObj);
+      A.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
-    // validate the json string with AllOfInlineAndRefsAllOf1
+    // validate the json string with B
     try {
-      AllOfInlineAndRefsAllOf1.validateJsonObject(jsonObj);
+      B.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
-    // validate the json string with B
+    // validate the json string with C
     try {
-      B.validateJsonObject(jsonObj);
+      C.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
-    // validate the json string with C
+    // validate the json string with AnyOfInlineAndRefsAnyOf1
     try {
-      C.validateJsonObject(jsonObj);
+      AnyOfInlineAndRefsAnyOf1.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
     if (validCount == 0) {
-      throw new IOException(String.format("The JSON string is invalid for AnyOfInlineAndRefs with anyOf schemas: A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C. JSON: %s", jsonObj.toString()));
+      throw new IOException(String.format("The JSON string is invalid for AnyOfInlineAndRefs with anyOf schemas: AnyOfInlineAndRefsAnyOf, A, B, C, AnyOfInlineAndRefsAnyOf1. JSON: %s", jsonObj.toString()));
     }
   }
 
@@ -13744,18 +12113,250 @@ public class AnyOfInlineAndRefs extends AbstractOpenApiSchema {
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
-}
 
+}
 ",
-  "src/main/java/test/test/runtime/model/AnyOfPrimitives.java": "/*
+  "src/main/java/test/test/runtime/model/AnyOfInlineAndRefsAnyOf.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated.
+ * Do not edit the class manually.
+ */
+
+
+package test.test.runtime.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
+import test.test.runtime.JSON;
+
+/**
+ * AnyOfInlineAndRefsAnyOf
+ */
+@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
+public class AnyOfInlineAndRefsAnyOf {
+  public static final String SERIALIZED_NAME_D = "d";
+  @SerializedName(SERIALIZED_NAME_D)
+  private String d;
+
+  public AnyOfInlineAndRefsAnyOf() {
+  }
+
+  public AnyOfInlineAndRefsAnyOf d(String d) {
+
+    this.d = d;
+    return this;
+  }
+
+   /**
+   * Get d
+   * @return d
+  **/
+  @javax.annotation.Nonnull
+  public String getD() {
+    return d;
+  }
+
+
+  public void setD(String d) {
+    this.d = d;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AnyOfInlineAndRefsAnyOf anyOfInlineAndRefsAnyOf = (AnyOfInlineAndRefsAnyOf) o;
+    return Objects.equals(this.d, anyOfInlineAndRefsAnyOf.d);
+        
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(d);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AnyOfInlineAndRefsAnyOf {\\n");
+    sb.append("    d: ").append(toIndentedString(d)).append("\\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\\n", "\\n    ");
+  }
+
+
+  public static HashSet<String> openapiFields;
+  public static HashSet<String> openapiRequiredFields;
+
+  static {
+    // a set of all properties/fields (JSON key names)
+    openapiFields = new HashSet<String>();
+    openapiFields.add("d");
+
+    // a set of required properties/fields (JSON key names)
+    openapiRequiredFields = new HashSet<String>();
+    openapiRequiredFields.add("d");
+  }
+
+ /**
+  * Validates the JSON Object and throws an exception if issues found
+  *
+  * @param jsonObj JSON Object
+  * @throws IOException if the JSON Object is invalid with respect to AnyOfInlineAndRefsAnyOf
+  */
+  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
+      if (jsonObj == null) {
+        if (!AnyOfInlineAndRefsAnyOf.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
+          throw new IllegalArgumentException(String.format("The required field(s) %s in AnyOfInlineAndRefsAnyOf is not found in the empty JSON string", AnyOfInlineAndRefsAnyOf.openapiRequiredFields.toString()));
+        }
+      }
+
+      Set<Entry<String, JsonElement>> entries = jsonObj.entrySet();
+      // check to see if the JSON string contains additional fields
+      for (Entry<String, JsonElement> entry : entries) {
+        if (!AnyOfInlineAndRefsAnyOf.openapiFields.contains(entry.getKey())) {
+          throw new IllegalArgumentException(String.format("The field \`%s\` in the JSON string is not defined in the \`AnyOfInlineAndRefsAnyOf\` properties. JSON: %s", entry.getKey(), jsonObj.toString()));
+        }
+      }
+
+      // check to make sure all required properties/fields are present in the JSON string
+      for (String requiredField : AnyOfInlineAndRefsAnyOf.openapiRequiredFields) {
+        if (jsonObj.get(requiredField) == null) {
+          throw new IllegalArgumentException(String.format("The required field \`%s\` is not found in the JSON string: %s", requiredField, jsonObj.toString()));
+        }
+      }
+      if (!jsonObj.get("d").isJsonPrimitive()) {
+        throw new IllegalArgumentException(String.format("Expected the field \`d\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("d").toString()));
+      }
+  }
+
+  public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+       if (!AnyOfInlineAndRefsAnyOf.class.isAssignableFrom(type.getRawType())) {
+         return null; // this class only serializes 'AnyOfInlineAndRefsAnyOf' and its subtypes
+       }
+       final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
+       final TypeAdapter<AnyOfInlineAndRefsAnyOf> thisAdapter
+                        = gson.getDelegateAdapter(this, TypeToken.get(AnyOfInlineAndRefsAnyOf.class));
+
+       return (TypeAdapter<T>) new TypeAdapter<AnyOfInlineAndRefsAnyOf>() {
+           @Override
+           public void write(JsonWriter out, AnyOfInlineAndRefsAnyOf value) throws IOException {
+             JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
+             elementAdapter.write(out, obj);
+           }
+
+           @Override
+           public AnyOfInlineAndRefsAnyOf read(JsonReader in) throws IOException {
+             JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
+             validateJsonObject(jsonObj);
+             return thisAdapter.fromJsonTree(jsonObj);
+           }
+
+       }.nullSafe();
+    }
+  }
+
+ /**
+  * Create an instance of AnyOfInlineAndRefsAnyOf given an JSON string
+  *
+  * @param jsonString JSON string
+  * @return An instance of AnyOfInlineAndRefsAnyOf
+  * @throws IOException if the JSON string is invalid with respect to AnyOfInlineAndRefsAnyOf
+  */
+  public static AnyOfInlineAndRefsAnyOf fromJson(String jsonString) throws IOException {
+    return JSON.getGson().fromJson(jsonString, AnyOfInlineAndRefsAnyOf.class);
+  }
+
+ /**
+  * Convert an instance of AnyOfInlineAndRefsAnyOf to an JSON string
+  *
+  * @return JSON string
+  */
+  public String toJson() {
+    return JSON.getGson().toJson(this);
+  }
+}
+",
+  "src/main/java/test/test/runtime/model/AnyOfInlineAndRefsAnyOf1.java": "/*
+ * composite models
  * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -13764,10 +12365,22 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -13776,9 +12389,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -13798,8 +12415,232 @@ import com.google.gson.JsonParseException;
 
 import test.test.runtime.JSON;
 
+/**
+ * AnyOfInlineAndRefsAnyOf1
+ */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AnyOfInlineAndRefsAnyOf1 {
+  public static final String SERIALIZED_NAME_E = "e";
+  @SerializedName(SERIALIZED_NAME_E)
+  private String e;
+
+  public AnyOfInlineAndRefsAnyOf1() {
+  }
+
+  public AnyOfInlineAndRefsAnyOf1 e(String e) {
+
+    this.e = e;
+    return this;
+  }
+
+   /**
+   * Get e
+   * @return e
+  **/
+  @javax.annotation.Nullable
+  public String getE() {
+    return e;
+  }
+
+
+  public void setE(String e) {
+    this.e = e;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AnyOfInlineAndRefsAnyOf1 anyOfInlineAndRefsAnyOf1 = (AnyOfInlineAndRefsAnyOf1) o;
+    return Objects.equals(this.e, anyOfInlineAndRefsAnyOf1.e);
+        
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(e);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AnyOfInlineAndRefsAnyOf1 {\\n");
+    sb.append("    e: ").append(toIndentedString(e)).append("\\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\\n", "\\n    ");
+  }
+
+
+  public static HashSet<String> openapiFields;
+  public static HashSet<String> openapiRequiredFields;
+
+  static {
+    // a set of all properties/fields (JSON key names)
+    openapiFields = new HashSet<String>();
+    openapiFields.add("e");
+
+    // a set of required properties/fields (JSON key names)
+    openapiRequiredFields = new HashSet<String>();
+  }
+
+ /**
+  * Validates the JSON Object and throws an exception if issues found
+  *
+  * @param jsonObj JSON Object
+  * @throws IOException if the JSON Object is invalid with respect to AnyOfInlineAndRefsAnyOf1
+  */
+  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
+      if (jsonObj == null) {
+        if (!AnyOfInlineAndRefsAnyOf1.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
+          throw new IllegalArgumentException(String.format("The required field(s) %s in AnyOfInlineAndRefsAnyOf1 is not found in the empty JSON string", AnyOfInlineAndRefsAnyOf1.openapiRequiredFields.toString()));
+        }
+      }
+
+      Set<Entry<String, JsonElement>> entries = jsonObj.entrySet();
+      // check to see if the JSON string contains additional fields
+      for (Entry<String, JsonElement> entry : entries) {
+        if (!AnyOfInlineAndRefsAnyOf1.openapiFields.contains(entry.getKey())) {
+          throw new IllegalArgumentException(String.format("The field \`%s\` in the JSON string is not defined in the \`AnyOfInlineAndRefsAnyOf1\` properties. JSON: %s", entry.getKey(), jsonObj.toString()));
+        }
+      }
+      if ((jsonObj.get("e") != null && !jsonObj.get("e").isJsonNull()) && !jsonObj.get("e").isJsonPrimitive()) {
+        throw new IllegalArgumentException(String.format("Expected the field \`e\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("e").toString()));
+      }
+  }
+
+  public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+       if (!AnyOfInlineAndRefsAnyOf1.class.isAssignableFrom(type.getRawType())) {
+         return null; // this class only serializes 'AnyOfInlineAndRefsAnyOf1' and its subtypes
+       }
+       final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
+       final TypeAdapter<AnyOfInlineAndRefsAnyOf1> thisAdapter
+                        = gson.getDelegateAdapter(this, TypeToken.get(AnyOfInlineAndRefsAnyOf1.class));
+
+       return (TypeAdapter<T>) new TypeAdapter<AnyOfInlineAndRefsAnyOf1>() {
+           @Override
+           public void write(JsonWriter out, AnyOfInlineAndRefsAnyOf1 value) throws IOException {
+             JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
+             elementAdapter.write(out, obj);
+           }
+
+           @Override
+           public AnyOfInlineAndRefsAnyOf1 read(JsonReader in) throws IOException {
+             JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
+             validateJsonObject(jsonObj);
+             return thisAdapter.fromJsonTree(jsonObj);
+           }
+
+       }.nullSafe();
+    }
+  }
+
+ /**
+  * Create an instance of AnyOfInlineAndRefsAnyOf1 given an JSON string
+  *
+  * @param jsonString JSON string
+  * @return An instance of AnyOfInlineAndRefsAnyOf1
+  * @throws IOException if the JSON string is invalid with respect to AnyOfInlineAndRefsAnyOf1
+  */
+  public static AnyOfInlineAndRefsAnyOf1 fromJson(String jsonString) throws IOException {
+    return JSON.getGson().fromJson(jsonString, AnyOfInlineAndRefsAnyOf1.class);
+  }
+
+ /**
+  * Convert an instance of AnyOfInlineAndRefsAnyOf1 to an JSON string
+  *
+  * @return JSON string
+  */
+  public String toJson() {
+    return JSON.getGson().toJson(this);
+  }
+}
+",
+  "src/main/java/test/test/runtime/model/AnyOfPrimitives.java": "/*
+ * composite models
+ * 
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated.
+ * Do not edit the class manually.
+ */
+
+
+package test.test.runtime.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
+import test.test.runtime.JSON;
+
+@lombok.experimental.SuperBuilder
 public class AnyOfPrimitives extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(AnyOfPrimitives.class.getName());
 
@@ -13811,8 +12652,8 @@ public class AnyOfPrimitives extends AbstractOpenApiSchema {
                 return null; // this class only serializes 'AnyOfPrimitives' and its subtypes
             }
             final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-            final TypeAdapter<Integer> adapterInteger = gson.getDelegateAdapter(this, TypeToken.get(Integer.class));
             final TypeAdapter<String> adapterString = gson.getDelegateAdapter(this, TypeToken.get(String.class));
+            final TypeAdapter<Integer> adapterInteger = gson.getDelegateAdapter(this, TypeToken.get(Integer.class));
 
             return (TypeAdapter<T>) new TypeAdapter<AnyOfPrimitives>() {
                 @Override
@@ -13822,21 +12663,21 @@ public class AnyOfPrimitives extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    // check if the actual instance is of the type \`Integer\`
-                    if (value.getActualInstance() instanceof Integer) {
-                        JsonObject obj = adapterInteger.toJsonTree((Integer)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`String\`
+                    if (value.getActualInstance() instanceof String) {
+                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    // check if the actual instance is of the type \`String\`
-                    if (value.getActualInstance() instanceof String) {
-                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`Integer\`
+                    if (value.getActualInstance() instanceof Integer) {
+                        JsonObject obj = adapterInteger.toJsonTree((Integer)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    throw new IOException("Failed to serialize as the type doesn't match anyOf schemas: Integer, String");
+                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: String, Integer");
                 }
 
                 @Override
@@ -13844,30 +12685,31 @@ public class AnyOfPrimitives extends AbstractOpenApiSchema {
                     Object deserialized = null;
                     JsonObject jsonObject = elementAdapter.read(in).getAsJsonObject();
 
-                    // deserialize Integer
+
+                    // deserialize String
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        Integer.validateJsonObject(jsonObject);
-                        log.log(Level.FINER, "Input data matches schema 'Integer'");
+                        String.validateJsonObject(jsonObject);
+                        log.log(Level.FINER, "Input data matches schema 'String'");
                         AnyOfPrimitives ret = new AnyOfPrimitives();
-                        ret.setActualInstance(adapterInteger.fromJsonTree(jsonObject));
+                        ret.setActualInstance(adapterString.fromJsonTree(jsonObject));
                         return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        log.log(Level.FINER, "Input data does not match schema 'Integer'", e);
+                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
                     }
 
-                    // deserialize String
+                    // deserialize Integer
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        String.validateJsonObject(jsonObject);
-                        log.log(Level.FINER, "Input data matches schema 'String'");
+                        Integer.validateJsonObject(jsonObject);
+                        log.log(Level.FINER, "Input data matches schema 'Integer'");
                         AnyOfPrimitives ret = new AnyOfPrimitives();
-                        ret.setActualInstance(adapterString.fromJsonTree(jsonObject));
+                        ret.setActualInstance(adapterInteger.fromJsonTree(jsonObject));
                         return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
+                        log.log(Level.FINER, "Input data does not match schema 'Integer'", e);
                     }
 
 
@@ -13884,21 +12726,21 @@ public class AnyOfPrimitives extends AbstractOpenApiSchema {
         super("anyOf", Boolean.FALSE);
     }
 
-    public AnyOfPrimitives(Integer o) {
+    public AnyOfPrimitives(String o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
-    public AnyOfPrimitives(String o) {
+    public AnyOfPrimitives(Integer o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
     static {
-        schemas.put("Integer", new GenericType<Integer>() {
-        });
         schemas.put("String", new GenericType<String>() {
         });
+        schemas.put("Integer", new GenericType<Integer>() {
+        });
     }
 
     @Override
@@ -13909,31 +12751,31 @@ public class AnyOfPrimitives extends AbstractOpenApiSchema {
     /**
      * Set the instance that matches the anyOf child schema, check
      * the instance parameter is valid against the anyOf child schemas:
-     * Integer, String
+     * String, Integer
      *
      * It could be an instance of the 'anyOf' schemas.
-     * The anyOf child schemas may themselves be a composed schema (allOf, anyOf, anyOf).
+     * The anyOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
      */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof Integer) {
+        if (instance instanceof String) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof String) {
+        if (instance instanceof Integer) {
             super.setActualInstance(instance);
             return;
         }
 
-        throw new RuntimeException("Invalid instance type. Must be Integer, String");
+        throw new RuntimeException("Invalid instance type. Must be String, Integer");
     }
 
     /**
      * Get the actual instance, which can be the following:
-     * Integer, String
+     * String, Integer
      *
-     * @return The actual instance (Integer, String)
+     * @return The actual instance (String, Integer)
      */
     @Override
     public Object getActualInstance() {
@@ -13941,25 +12783,25 @@ public class AnyOfPrimitives extends AbstractOpenApiSchema {
     }
 
     /**
-     * Get the actual instance of \`Integer\`. If the actual instance is not \`Integer\`,
+     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`Integer\`
-     * @throws ClassCastException if the instance is not \`Integer\`
+     * @return The actual instance of \`String\`
+     * @throws ClassCastException if the instance is not \`String\`
      */
-    public Integer getInteger() throws ClassCastException {
-        return (Integer)super.getActualInstance();
+    public String getString() throws ClassCastException {
+        return (String)super.getActualInstance();
     }
 
     /**
-     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
+     * Get the actual instance of \`Integer\`. If the actual instance is not \`Integer\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`String\`
-     * @throws ClassCastException if the instance is not \`String\`
+     * @return The actual instance of \`Integer\`
+     * @throws ClassCastException if the instance is not \`Integer\`
      */
-    public String getString() throws ClassCastException {
-        return (String)super.getActualInstance();
+    public Integer getInteger() throws ClassCastException {
+        return (Integer)super.getActualInstance();
     }
 
 
@@ -13972,24 +12814,24 @@ public class AnyOfPrimitives extends AbstractOpenApiSchema {
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
     // validate anyOf schemas one by one
     int validCount = 0;
-    // validate the json string with Integer
+    // validate the json string with String
     try {
-      Integer.validateJsonObject(jsonObj);
+      String.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
-    // validate the json string with String
+    // validate the json string with Integer
     try {
-      String.validateJsonObject(jsonObj);
+      Integer.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
     if (validCount == 0) {
-      throw new IOException(String.format("The JSON string is invalid for AnyOfPrimitives with anyOf schemas: Integer, String. JSON: %s", jsonObj.toString()));
+      throw new IOException(String.format("The JSON string is invalid for AnyOfPrimitives with anyOf schemas: String, Integer. JSON: %s", jsonObj.toString()));
     }
   }
 
@@ -14012,18 +12854,17 @@ public class AnyOfPrimitives extends AbstractOpenApiSchema {
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
-}
 
+}
 ",
   "src/main/java/test/test/runtime/model/AnyOfPrimitivesAndRefs.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -14032,17 +12873,23 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.A;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.A;
 
 import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -14051,9 +12898,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -14073,8 +12924,7 @@ import com.google.gson.JsonParseException;
 
 import test.test.runtime.JSON;
 
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@lombok.experimental.SuperBuilder
 public class AnyOfPrimitivesAndRefs extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(AnyOfPrimitivesAndRefs.class.getName());
 
@@ -14086,8 +12936,8 @@ public class AnyOfPrimitivesAndRefs extends AbstractOpenApiSchema {
                 return null; // this class only serializes 'AnyOfPrimitivesAndRefs' and its subtypes
             }
             final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-            final TypeAdapter<A> adapterA = gson.getDelegateAdapter(this, TypeToken.get(A.class));
             final TypeAdapter<String> adapterString = gson.getDelegateAdapter(this, TypeToken.get(String.class));
+            final TypeAdapter<A> adapterA = gson.getDelegateAdapter(this, TypeToken.get(A.class));
 
             return (TypeAdapter<T>) new TypeAdapter<AnyOfPrimitivesAndRefs>() {
                 @Override
@@ -14097,21 +12947,21 @@ public class AnyOfPrimitivesAndRefs extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    // check if the actual instance is of the type \`A\`
-                    if (value.getActualInstance() instanceof A) {
-                        JsonObject obj = adapterA.toJsonTree((A)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`String\`
+                    if (value.getActualInstance() instanceof String) {
+                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    // check if the actual instance is of the type \`String\`
-                    if (value.getActualInstance() instanceof String) {
-                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`A\`
+                    if (value.getActualInstance() instanceof A) {
+                        JsonObject obj = adapterA.toJsonTree((A)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    throw new IOException("Failed to serialize as the type doesn't match anyOf schemas: A, String");
+                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: String, A");
                 }
 
                 @Override
@@ -14119,30 +12969,31 @@ public class AnyOfPrimitivesAndRefs extends AbstractOpenApiSchema {
                     Object deserialized = null;
                     JsonObject jsonObject = elementAdapter.read(in).getAsJsonObject();
 
-                    // deserialize A
+
+                    // deserialize String
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        A.validateJsonObject(jsonObject);
-                        log.log(Level.FINER, "Input data matches schema 'A'");
+                        String.validateJsonObject(jsonObject);
+                        log.log(Level.FINER, "Input data matches schema 'String'");
                         AnyOfPrimitivesAndRefs ret = new AnyOfPrimitivesAndRefs();
-                        ret.setActualInstance(adapterA.fromJsonTree(jsonObject));
+                        ret.setActualInstance(adapterString.fromJsonTree(jsonObject));
                         return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        log.log(Level.FINER, "Input data does not match schema 'A'", e);
+                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
                     }
 
-                    // deserialize String
+                    // deserialize A
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        String.validateJsonObject(jsonObject);
-                        log.log(Level.FINER, "Input data matches schema 'String'");
+                        A.validateJsonObject(jsonObject);
+                        log.log(Level.FINER, "Input data matches schema 'A'");
                         AnyOfPrimitivesAndRefs ret = new AnyOfPrimitivesAndRefs();
-                        ret.setActualInstance(adapterString.fromJsonTree(jsonObject));
+                        ret.setActualInstance(adapterA.fromJsonTree(jsonObject));
                         return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
+                        log.log(Level.FINER, "Input data does not match schema 'A'", e);
                     }
 
 
@@ -14159,21 +13010,21 @@ public class AnyOfPrimitivesAndRefs extends AbstractOpenApiSchema {
         super("anyOf", Boolean.FALSE);
     }
 
-    public AnyOfPrimitivesAndRefs(A o) {
+    public AnyOfPrimitivesAndRefs(String o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
-    public AnyOfPrimitivesAndRefs(String o) {
+    public AnyOfPrimitivesAndRefs(A o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
     static {
-        schemas.put("A", new GenericType<A>() {
-        });
         schemas.put("String", new GenericType<String>() {
         });
+        schemas.put("A", new GenericType<A>() {
+        });
     }
 
     @Override
@@ -14184,31 +13035,31 @@ public class AnyOfPrimitivesAndRefs extends AbstractOpenApiSchema {
     /**
      * Set the instance that matches the anyOf child schema, check
      * the instance parameter is valid against the anyOf child schemas:
-     * A, String
+     * String, A
      *
      * It could be an instance of the 'anyOf' schemas.
-     * The anyOf child schemas may themselves be a composed schema (allOf, anyOf, anyOf).
+     * The anyOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
      */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof A) {
+        if (instance instanceof String) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof String) {
+        if (instance instanceof A) {
             super.setActualInstance(instance);
             return;
         }
 
-        throw new RuntimeException("Invalid instance type. Must be A, String");
+        throw new RuntimeException("Invalid instance type. Must be String, A");
     }
 
     /**
      * Get the actual instance, which can be the following:
-     * A, String
+     * String, A
      *
-     * @return The actual instance (A, String)
+     * @return The actual instance (String, A)
      */
     @Override
     public Object getActualInstance() {
@@ -14216,25 +13067,25 @@ public class AnyOfPrimitivesAndRefs extends AbstractOpenApiSchema {
     }
 
     /**
-     * Get the actual instance of \`A\`. If the actual instance is not \`A\`,
+     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`A\`
-     * @throws ClassCastException if the instance is not \`A\`
+     * @return The actual instance of \`String\`
+     * @throws ClassCastException if the instance is not \`String\`
      */
-    public A getA() throws ClassCastException {
-        return (A)super.getActualInstance();
+    public String getString() throws ClassCastException {
+        return (String)super.getActualInstance();
     }
 
     /**
-     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
+     * Get the actual instance of \`A\`. If the actual instance is not \`A\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`String\`
-     * @throws ClassCastException if the instance is not \`String\`
+     * @return The actual instance of \`A\`
+     * @throws ClassCastException if the instance is not \`A\`
      */
-    public String getString() throws ClassCastException {
-        return (String)super.getActualInstance();
+    public A getA() throws ClassCastException {
+        return (A)super.getActualInstance();
     }
 
 
@@ -14247,24 +13098,24 @@ public class AnyOfPrimitivesAndRefs extends AbstractOpenApiSchema {
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
     // validate anyOf schemas one by one
     int validCount = 0;
-    // validate the json string with A
+    // validate the json string with String
     try {
-      A.validateJsonObject(jsonObj);
+      String.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
-    // validate the json string with String
+    // validate the json string with A
     try {
-      String.validateJsonObject(jsonObj);
+      A.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
     if (validCount == 0) {
-      throw new IOException(String.format("The JSON string is invalid for AnyOfPrimitivesAndRefs with anyOf schemas: A, String. JSON: %s", jsonObj.toString()));
+      throw new IOException(String.format("The JSON string is invalid for AnyOfPrimitivesAndRefs with anyOf schemas: String, A. JSON: %s", jsonObj.toString()));
     }
   }
 
@@ -14287,18 +13138,17 @@ public class AnyOfPrimitivesAndRefs extends AbstractOpenApiSchema {
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
-}
 
+}
 ",
   "src/main/java/test/test/runtime/model/AnyOfRefs.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -14307,19 +13157,25 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.A;
+import test.test.runtime.model.B;
+import test.test.runtime.model.C;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.A;
-import test.test.runtime.model.B;
-import test.test.runtime.model.C;
 
 import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -14328,9 +13184,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -14350,8 +13210,7 @@ import com.google.gson.JsonParseException;
 
 import test.test.runtime.JSON;
 
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@lombok.experimental.SuperBuilder
 public class AnyOfRefs extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(AnyOfRefs.class.getName());
 
@@ -14396,7 +13255,7 @@ public class AnyOfRefs extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    throw new IOException("Failed to serialize as the type doesn't match anyOf schemas: A, B, C");
+                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: A, B, C");
                 }
 
                 @Override
@@ -14404,6 +13263,7 @@ public class AnyOfRefs extends AbstractOpenApiSchema {
                     Object deserialized = null;
                     JsonObject jsonObject = elementAdapter.read(in).getAsJsonObject();
 
+
                     // deserialize A
                     try {
                         // validate the JSON object to see if any exception is thrown
@@ -14492,7 +13352,7 @@ public class AnyOfRefs extends AbstractOpenApiSchema {
      * A, B, C
      *
      * It could be an instance of the 'anyOf' schemas.
-     * The anyOf child schemas may themselves be a composed schema (allOf, anyOf, anyOf).
+     * The anyOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
      */
     @Override
     public void setActualInstance(Object instance) {
@@ -14616,18 +13476,17 @@ public class AnyOfRefs extends AbstractOpenApiSchema {
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
-}
 
+}
 ",
   "src/main/java/test/test/runtime/model/B.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -14643,24 +13502,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -14668,7 +13549,6 @@ import test.test.runtime.JSON;
  * B
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class B {
   public static final String SERIALIZED_NAME_B = "b";
   @SerializedName(SERIALIZED_NAME_B)
@@ -14678,7 +13558,7 @@ public class B {
   }
 
   public B b(String b) {
-    
+
     this.b = b;
     return this;
   }
@@ -14688,7 +13568,6 @@ public class B {
    * @return b
   **/
   @javax.annotation.Nonnull
-
   public String getB() {
     return b;
   }
@@ -14699,7 +13578,6 @@ public class B {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -14708,8 +13586,9 @@ public class B {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    B B = (B) o;
-    return Objects.equals(this.b, B.b);
+    B b = (B) o;
+    return Objects.equals(this.b, b.b);
+        
   }
 
   @Override
@@ -14832,17 +13711,15 @@ public class B {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/C.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -14856,26 +13733,48 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
+import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -14883,7 +13782,6 @@ import test.test.runtime.JSON;
  * C
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class C {
   public static final String SERIALIZED_NAME_C = "c";
   @SerializedName(SERIALIZED_NAME_C)
@@ -14893,7 +13791,7 @@ public class C {
   }
 
   public C c(String c) {
-    
+
     this.c = c;
     return this;
   }
@@ -14903,7 +13801,6 @@ public class C {
    * @return c
   **/
   @javax.annotation.Nonnull
-
   public String getC() {
     return c;
   }
@@ -14914,7 +13811,6 @@ public class C {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -14923,8 +13819,9 @@ public class C {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    C C = (C) o;
-    return Objects.equals(this.c, C.c);
+    C c = (C) o;
+    return Objects.equals(this.c, c.c);
+        
   }
 
   @Override
@@ -15047,17 +13944,15 @@ public class C {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/OneOfInlineAndRefs.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -15066,21 +13961,27 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.A;
+import test.test.runtime.model.B;
+import test.test.runtime.model.C;
+import test.test.runtime.model.OneOfInlineAndRefsOneOf;
+import test.test.runtime.model.OneOfInlineAndRefsOneOf1;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.A;
-import test.test.runtime.model.AllOfInlineAndRefsAllOf;
-import test.test.runtime.model.AllOfInlineAndRefsAllOf1;
-import test.test.runtime.model.B;
-import test.test.runtime.model.C;
 
 import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -15089,9 +13990,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -15111,8 +14016,7 @@ import com.google.gson.JsonParseException;
 
 import test.test.runtime.JSON;
 
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@lombok.experimental.SuperBuilder
 public class OneOfInlineAndRefs extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(OneOfInlineAndRefs.class.getName());
 
@@ -15124,11 +14028,11 @@ public class OneOfInlineAndRefs extends AbstractOpenApiSchema {
                 return null; // this class only serializes 'OneOfInlineAndRefs' and its subtypes
             }
             final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
+            final TypeAdapter<OneOfInlineAndRefsOneOf> adapterOneOfInlineAndRefsOneOf = gson.getDelegateAdapter(this, TypeToken.get(OneOfInlineAndRefsOneOf.class));
             final TypeAdapter<A> adapterA = gson.getDelegateAdapter(this, TypeToken.get(A.class));
-            final TypeAdapter<AllOfInlineAndRefsAllOf> adapterAllOfInlineAndRefsAllOf = gson.getDelegateAdapter(this, TypeToken.get(AllOfInlineAndRefsAllOf.class));
-            final TypeAdapter<AllOfInlineAndRefsAllOf1> adapterAllOfInlineAndRefsAllOf1 = gson.getDelegateAdapter(this, TypeToken.get(AllOfInlineAndRefsAllOf1.class));
             final TypeAdapter<B> adapterB = gson.getDelegateAdapter(this, TypeToken.get(B.class));
             final TypeAdapter<C> adapterC = gson.getDelegateAdapter(this, TypeToken.get(C.class));
+            final TypeAdapter<OneOfInlineAndRefsOneOf1> adapterOneOfInlineAndRefsOneOf1 = gson.getDelegateAdapter(this, TypeToken.get(OneOfInlineAndRefsOneOf1.class));
 
             return (TypeAdapter<T>) new TypeAdapter<OneOfInlineAndRefs>() {
                 @Override
@@ -15138,23 +14042,16 @@ public class OneOfInlineAndRefs extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    // check if the actual instance is of the type \`A\`
-                    if (value.getActualInstance() instanceof A) {
-                        JsonObject obj = adapterA.toJsonTree((A)value.getActualInstance()).getAsJsonObject();
-                        elementAdapter.write(out, obj);
-                        return;
-                    }
-
-                    // check if the actual instance is of the type \`AllOfInlineAndRefsAllOf\`
-                    if (value.getActualInstance() instanceof AllOfInlineAndRefsAllOf) {
-                        JsonObject obj = adapterAllOfInlineAndRefsAllOf.toJsonTree((AllOfInlineAndRefsAllOf)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`OneOfInlineAndRefsOneOf\`
+                    if (value.getActualInstance() instanceof OneOfInlineAndRefsOneOf) {
+                        JsonObject obj = adapterOneOfInlineAndRefsOneOf.toJsonTree((OneOfInlineAndRefsOneOf)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    // check if the actual instance is of the type \`AllOfInlineAndRefsAllOf1\`
-                    if (value.getActualInstance() instanceof AllOfInlineAndRefsAllOf1) {
-                        JsonObject obj = adapterAllOfInlineAndRefsAllOf1.toJsonTree((AllOfInlineAndRefsAllOf1)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`A\`
+                    if (value.getActualInstance() instanceof A) {
+                        JsonObject obj = adapterA.toJsonTree((A)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
@@ -15173,7 +14070,14 @@ public class OneOfInlineAndRefs extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C");
+                    // check if the actual instance is of the type \`OneOfInlineAndRefsOneOf1\`
+                    if (value.getActualInstance() instanceof OneOfInlineAndRefsOneOf1) {
+                        JsonObject obj = adapterOneOfInlineAndRefsOneOf1.toJsonTree((OneOfInlineAndRefsOneOf1)value.getActualInstance()).getAsJsonObject();
+                        elementAdapter.write(out, obj);
+                        return;
+                    }
+
+                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: OneOfInlineAndRefsOneOf, A, B, C, OneOfInlineAndRefsOneOf1");
                 }
 
                 @Override
@@ -15185,43 +14089,30 @@ public class OneOfInlineAndRefs extends AbstractOpenApiSchema {
                     ArrayList<String> errorMessages = new ArrayList<>();
                     TypeAdapter actualAdapter = elementAdapter;
 
-                    // deserialize A
-                    try {
-                        // validate the JSON object to see if any exception is thrown
-                        A.validateJsonObject(jsonObject);
-                        actualAdapter = adapterA;
-                        match++;
-                        log.log(Level.FINER, "Input data matches schema 'A'");
-                    } catch (Exception e) {
-                        // deserialization failed, continue
-                        errorMessages.add(String.format("Deserialization for A failed with \`%s\`.", e.getMessage()));
-                        log.log(Level.FINER, "Input data does not match schema 'A'", e);
-                    }
-
-                    // deserialize AllOfInlineAndRefsAllOf
+                    // deserialize OneOfInlineAndRefsOneOf
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        AllOfInlineAndRefsAllOf.validateJsonObject(jsonObject);
-                        actualAdapter = adapterAllOfInlineAndRefsAllOf;
+                        OneOfInlineAndRefsOneOf.validateJsonObject(jsonObject);
+                        actualAdapter = adapterOneOfInlineAndRefsOneOf;
                         match++;
-                        log.log(Level.FINER, "Input data matches schema 'AllOfInlineAndRefsAllOf'");
+                        log.log(Level.FINER, "Input data matches schema 'OneOfInlineAndRefsOneOf'");
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        errorMessages.add(String.format("Deserialization for AllOfInlineAndRefsAllOf failed with \`%s\`.", e.getMessage()));
-                        log.log(Level.FINER, "Input data does not match schema 'AllOfInlineAndRefsAllOf'", e);
+                        errorMessages.add(String.format("Deserialization for OneOfInlineAndRefsOneOf failed with \`%s\`.", e.getMessage()));
+                        log.log(Level.FINER, "Input data does not match schema 'OneOfInlineAndRefsOneOf'", e);
                     }
 
-                    // deserialize AllOfInlineAndRefsAllOf1
+                    // deserialize A
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        AllOfInlineAndRefsAllOf1.validateJsonObject(jsonObject);
-                        actualAdapter = adapterAllOfInlineAndRefsAllOf1;
+                        A.validateJsonObject(jsonObject);
+                        actualAdapter = adapterA;
                         match++;
-                        log.log(Level.FINER, "Input data matches schema 'AllOfInlineAndRefsAllOf1'");
+                        log.log(Level.FINER, "Input data matches schema 'A'");
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        errorMessages.add(String.format("Deserialization for AllOfInlineAndRefsAllOf1 failed with \`%s\`.", e.getMessage()));
-                        log.log(Level.FINER, "Input data does not match schema 'AllOfInlineAndRefsAllOf1'", e);
+                        errorMessages.add(String.format("Deserialization for A failed with \`%s\`.", e.getMessage()));
+                        log.log(Level.FINER, "Input data does not match schema 'A'", e);
                     }
 
                     // deserialize B
@@ -15250,6 +14141,19 @@ public class OneOfInlineAndRefs extends AbstractOpenApiSchema {
                         log.log(Level.FINER, "Input data does not match schema 'C'", e);
                     }
 
+                    // deserialize OneOfInlineAndRefsOneOf1
+                    try {
+                        // validate the JSON object to see if any exception is thrown
+                        OneOfInlineAndRefsOneOf1.validateJsonObject(jsonObject);
+                        actualAdapter = adapterOneOfInlineAndRefsOneOf1;
+                        match++;
+                        log.log(Level.FINER, "Input data matches schema 'OneOfInlineAndRefsOneOf1'");
+                    } catch (Exception e) {
+                        // deserialization failed, continue
+                        errorMessages.add(String.format("Deserialization for OneOfInlineAndRefsOneOf1 failed with \`%s\`.", e.getMessage()));
+                        log.log(Level.FINER, "Input data does not match schema 'OneOfInlineAndRefsOneOf1'", e);
+                    }
+
                     if (match == 1) {
                         OneOfInlineAndRefs ret = new OneOfInlineAndRefs();
                         ret.setActualInstance(actualAdapter.fromJsonTree(jsonObject));
@@ -15269,222 +14173,681 @@ public class OneOfInlineAndRefs extends AbstractOpenApiSchema {
         super("oneOf", Boolean.FALSE);
     }
 
-    public OneOfInlineAndRefs(A o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
+    public OneOfInlineAndRefs(OneOfInlineAndRefsOneOf o) {
+        super("oneOf", Boolean.FALSE);
+        setActualInstance(o);
+    }
+
+    public OneOfInlineAndRefs(A o) {
+        super("oneOf", Boolean.FALSE);
+        setActualInstance(o);
+    }
+
+    public OneOfInlineAndRefs(B o) {
+        super("oneOf", Boolean.FALSE);
+        setActualInstance(o);
+    }
+
+    public OneOfInlineAndRefs(C o) {
+        super("oneOf", Boolean.FALSE);
+        setActualInstance(o);
+    }
+
+    public OneOfInlineAndRefs(OneOfInlineAndRefsOneOf1 o) {
+        super("oneOf", Boolean.FALSE);
+        setActualInstance(o);
+    }
+
+    static {
+        schemas.put("OneOfInlineAndRefsOneOf", new GenericType<OneOfInlineAndRefsOneOf>() {
+        });
+        schemas.put("A", new GenericType<A>() {
+        });
+        schemas.put("B", new GenericType<B>() {
+        });
+        schemas.put("C", new GenericType<C>() {
+        });
+        schemas.put("OneOfInlineAndRefsOneOf1", new GenericType<OneOfInlineAndRefsOneOf1>() {
+        });
+    }
+
+    @Override
+    public Map<String, GenericType> getSchemas() {
+        return OneOfInlineAndRefs.schemas;
+    }
+
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas:
+     * OneOfInlineAndRefsOneOf, A, B, C, OneOfInlineAndRefsOneOf1
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
+    @Override
+    public void setActualInstance(Object instance) {
+        if (instance instanceof OneOfInlineAndRefsOneOf) {
+            super.setActualInstance(instance);
+            return;
+        }
+
+        if (instance instanceof A) {
+            super.setActualInstance(instance);
+            return;
+        }
+
+        if (instance instanceof B) {
+            super.setActualInstance(instance);
+            return;
+        }
+
+        if (instance instanceof C) {
+            super.setActualInstance(instance);
+            return;
+        }
+
+        if (instance instanceof OneOfInlineAndRefsOneOf1) {
+            super.setActualInstance(instance);
+            return;
+        }
+
+        throw new RuntimeException("Invalid instance type. Must be OneOfInlineAndRefsOneOf, A, B, C, OneOfInlineAndRefsOneOf1");
+    }
+
+    /**
+     * Get the actual instance, which can be the following:
+     * OneOfInlineAndRefsOneOf, A, B, C, OneOfInlineAndRefsOneOf1
+     *
+     * @return The actual instance (OneOfInlineAndRefsOneOf, A, B, C, OneOfInlineAndRefsOneOf1)
+     */
+    @Override
+    public Object getActualInstance() {
+        return super.getActualInstance();
+    }
+
+    /**
+     * Get the actual instance of \`OneOfInlineAndRefsOneOf\`. If the actual instance is not \`OneOfInlineAndRefsOneOf\`,
+     * the ClassCastException will be thrown.
+     *
+     * @return The actual instance of \`OneOfInlineAndRefsOneOf\`
+     * @throws ClassCastException if the instance is not \`OneOfInlineAndRefsOneOf\`
+     */
+    public OneOfInlineAndRefsOneOf getOneOfInlineAndRefsOneOf() throws ClassCastException {
+        return (OneOfInlineAndRefsOneOf)super.getActualInstance();
+    }
+
+    /**
+     * Get the actual instance of \`A\`. If the actual instance is not \`A\`,
+     * the ClassCastException will be thrown.
+     *
+     * @return The actual instance of \`A\`
+     * @throws ClassCastException if the instance is not \`A\`
+     */
+    public A getA() throws ClassCastException {
+        return (A)super.getActualInstance();
+    }
+
+    /**
+     * Get the actual instance of \`B\`. If the actual instance is not \`B\`,
+     * the ClassCastException will be thrown.
+     *
+     * @return The actual instance of \`B\`
+     * @throws ClassCastException if the instance is not \`B\`
+     */
+    public B getB() throws ClassCastException {
+        return (B)super.getActualInstance();
+    }
+
+    /**
+     * Get the actual instance of \`C\`. If the actual instance is not \`C\`,
+     * the ClassCastException will be thrown.
+     *
+     * @return The actual instance of \`C\`
+     * @throws ClassCastException if the instance is not \`C\`
+     */
+    public C getC() throws ClassCastException {
+        return (C)super.getActualInstance();
+    }
+
+    /**
+     * Get the actual instance of \`OneOfInlineAndRefsOneOf1\`. If the actual instance is not \`OneOfInlineAndRefsOneOf1\`,
+     * the ClassCastException will be thrown.
+     *
+     * @return The actual instance of \`OneOfInlineAndRefsOneOf1\`
+     * @throws ClassCastException if the instance is not \`OneOfInlineAndRefsOneOf1\`
+     */
+    public OneOfInlineAndRefsOneOf1 getOneOfInlineAndRefsOneOf1() throws ClassCastException {
+        return (OneOfInlineAndRefsOneOf1)super.getActualInstance();
+    }
+
+
+ /**
+  * Validates the JSON Object and throws an exception if issues found
+  *
+  * @param jsonObj JSON Object
+  * @throws IOException if the JSON Object is invalid with respect to OneOfInlineAndRefs
+  */
+  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
+    // validate oneOf schemas one by one
+    int validCount = 0;
+    ArrayList<String> errorMessages = new ArrayList<>();
+    // validate the json string with OneOfInlineAndRefsOneOf
+    try {
+      OneOfInlineAndRefsOneOf.validateJsonObject(jsonObj);
+      validCount++;
+    } catch (Exception e) {
+      errorMessages.add(String.format("Deserialization for OneOfInlineAndRefsOneOf failed with \`%s\`.", e.getMessage()));
+      // continue to the next one
+    }
+    // validate the json string with A
+    try {
+      A.validateJsonObject(jsonObj);
+      validCount++;
+    } catch (Exception e) {
+      errorMessages.add(String.format("Deserialization for A failed with \`%s\`.", e.getMessage()));
+      // continue to the next one
+    }
+    // validate the json string with B
+    try {
+      B.validateJsonObject(jsonObj);
+      validCount++;
+    } catch (Exception e) {
+      errorMessages.add(String.format("Deserialization for B failed with \`%s\`.", e.getMessage()));
+      // continue to the next one
+    }
+    // validate the json string with C
+    try {
+      C.validateJsonObject(jsonObj);
+      validCount++;
+    } catch (Exception e) {
+      errorMessages.add(String.format("Deserialization for C failed with \`%s\`.", e.getMessage()));
+      // continue to the next one
+    }
+    // validate the json string with OneOfInlineAndRefsOneOf1
+    try {
+      OneOfInlineAndRefsOneOf1.validateJsonObject(jsonObj);
+      validCount++;
+    } catch (Exception e) {
+      errorMessages.add(String.format("Deserialization for OneOfInlineAndRefsOneOf1 failed with \`%s\`.", e.getMessage()));
+      // continue to the next one
+    }
+    if (validCount != 1) {
+      throw new IOException(String.format("The JSON string is invalid for OneOfInlineAndRefs with oneOf schemas: OneOfInlineAndRefsOneOf, A, B, C, OneOfInlineAndRefsOneOf1. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonObj.toString()));
+    }
+  }
+
+ /**
+  * Create an instance of OneOfInlineAndRefs given an JSON string
+  *
+  * @param jsonString JSON string
+  * @return An instance of OneOfInlineAndRefs
+  * @throws IOException if the JSON string is invalid with respect to OneOfInlineAndRefs
+  */
+  public static OneOfInlineAndRefs fromJson(String jsonString) throws IOException {
+    return JSON.getGson().fromJson(jsonString, OneOfInlineAndRefs.class);
+  }
+
+ /**
+  * Convert an instance of OneOfInlineAndRefs to an JSON string
+  *
+  * @return JSON string
+  */
+  public String toJson() {
+    return JSON.getGson().toJson(this);
+  }
+
+}
+",
+  "src/main/java/test/test/runtime/model/OneOfInlineAndRefsOneOf.java": "/*
+ * composite models
+ * 
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated.
+ * Do not edit the class manually.
+ */
+
+
+package test.test.runtime.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
+import test.test.runtime.JSON;
+
+/**
+ * OneOfInlineAndRefsOneOf
+ */
+@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
+public class OneOfInlineAndRefsOneOf {
+  public static final String SERIALIZED_NAME_D = "d";
+  @SerializedName(SERIALIZED_NAME_D)
+  private String d;
+
+  public OneOfInlineAndRefsOneOf() {
+  }
+
+  public OneOfInlineAndRefsOneOf d(String d) {
+
+    this.d = d;
+    return this;
+  }
+
+   /**
+   * Get d
+   * @return d
+  **/
+  @javax.annotation.Nonnull
+  public String getD() {
+    return d;
+  }
+
+
+  public void setD(String d) {
+    this.d = d;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    OneOfInlineAndRefsOneOf oneOfInlineAndRefsOneOf = (OneOfInlineAndRefsOneOf) o;
+    return Objects.equals(this.d, oneOfInlineAndRefsOneOf.d);
+        
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(d);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OneOfInlineAndRefsOneOf {\\n");
+    sb.append("    d: ").append(toIndentedString(d)).append("\\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\\n", "\\n    ");
+  }
+
+
+  public static HashSet<String> openapiFields;
+  public static HashSet<String> openapiRequiredFields;
+
+  static {
+    // a set of all properties/fields (JSON key names)
+    openapiFields = new HashSet<String>();
+    openapiFields.add("d");
+
+    // a set of required properties/fields (JSON key names)
+    openapiRequiredFields = new HashSet<String>();
+    openapiRequiredFields.add("d");
+  }
+
+ /**
+  * Validates the JSON Object and throws an exception if issues found
+  *
+  * @param jsonObj JSON Object
+  * @throws IOException if the JSON Object is invalid with respect to OneOfInlineAndRefsOneOf
+  */
+  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
+      if (jsonObj == null) {
+        if (!OneOfInlineAndRefsOneOf.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
+          throw new IllegalArgumentException(String.format("The required field(s) %s in OneOfInlineAndRefsOneOf is not found in the empty JSON string", OneOfInlineAndRefsOneOf.openapiRequiredFields.toString()));
+        }
+      }
+
+      Set<Entry<String, JsonElement>> entries = jsonObj.entrySet();
+      // check to see if the JSON string contains additional fields
+      for (Entry<String, JsonElement> entry : entries) {
+        if (!OneOfInlineAndRefsOneOf.openapiFields.contains(entry.getKey())) {
+          throw new IllegalArgumentException(String.format("The field \`%s\` in the JSON string is not defined in the \`OneOfInlineAndRefsOneOf\` properties. JSON: %s", entry.getKey(), jsonObj.toString()));
+        }
+      }
+
+      // check to make sure all required properties/fields are present in the JSON string
+      for (String requiredField : OneOfInlineAndRefsOneOf.openapiRequiredFields) {
+        if (jsonObj.get(requiredField) == null) {
+          throw new IllegalArgumentException(String.format("The required field \`%s\` is not found in the JSON string: %s", requiredField, jsonObj.toString()));
+        }
+      }
+      if (!jsonObj.get("d").isJsonPrimitive()) {
+        throw new IllegalArgumentException(String.format("Expected the field \`d\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("d").toString()));
+      }
+  }
+
+  public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+       if (!OneOfInlineAndRefsOneOf.class.isAssignableFrom(type.getRawType())) {
+         return null; // this class only serializes 'OneOfInlineAndRefsOneOf' and its subtypes
+       }
+       final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
+       final TypeAdapter<OneOfInlineAndRefsOneOf> thisAdapter
+                        = gson.getDelegateAdapter(this, TypeToken.get(OneOfInlineAndRefsOneOf.class));
+
+       return (TypeAdapter<T>) new TypeAdapter<OneOfInlineAndRefsOneOf>() {
+           @Override
+           public void write(JsonWriter out, OneOfInlineAndRefsOneOf value) throws IOException {
+             JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
+             elementAdapter.write(out, obj);
+           }
+
+           @Override
+           public OneOfInlineAndRefsOneOf read(JsonReader in) throws IOException {
+             JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
+             validateJsonObject(jsonObj);
+             return thisAdapter.fromJsonTree(jsonObj);
+           }
+
+       }.nullSafe();
+    }
+  }
+
+ /**
+  * Create an instance of OneOfInlineAndRefsOneOf given an JSON string
+  *
+  * @param jsonString JSON string
+  * @return An instance of OneOfInlineAndRefsOneOf
+  * @throws IOException if the JSON string is invalid with respect to OneOfInlineAndRefsOneOf
+  */
+  public static OneOfInlineAndRefsOneOf fromJson(String jsonString) throws IOException {
+    return JSON.getGson().fromJson(jsonString, OneOfInlineAndRefsOneOf.class);
+  }
+
+ /**
+  * Convert an instance of OneOfInlineAndRefsOneOf to an JSON string
+  *
+  * @return JSON string
+  */
+  public String toJson() {
+    return JSON.getGson().toJson(this);
+  }
+}
+",
+  "src/main/java/test/test/runtime/model/OneOfInlineAndRefsOneOf1.java": "/*
+ * composite models
+ * 
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated.
+ * Do not edit the class manually.
+ */
+
+
+package test.test.runtime.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
 
-    public OneOfInlineAndRefs(AllOfInlineAndRefsAllOf o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
-    public OneOfInlineAndRefs(AllOfInlineAndRefsAllOf1 o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
 
-    public OneOfInlineAndRefs(B o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
+import test.test.runtime.JSON;
 
-    public OneOfInlineAndRefs(C o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
+/**
+ * OneOfInlineAndRefsOneOf1
+ */
+@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
+public class OneOfInlineAndRefsOneOf1 {
+  public static final String SERIALIZED_NAME_E = "e";
+  @SerializedName(SERIALIZED_NAME_E)
+  private String e;
 
-    static {
-        schemas.put("A", new GenericType<A>() {
-        });
-        schemas.put("AllOfInlineAndRefsAllOf", new GenericType<AllOfInlineAndRefsAllOf>() {
-        });
-        schemas.put("AllOfInlineAndRefsAllOf1", new GenericType<AllOfInlineAndRefsAllOf1>() {
-        });
-        schemas.put("B", new GenericType<B>() {
-        });
-        schemas.put("C", new GenericType<C>() {
-        });
-    }
+  public OneOfInlineAndRefsOneOf1() {
+  }
 
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return OneOfInlineAndRefs.schemas;
-    }
+  public OneOfInlineAndRefsOneOf1 e(String e) {
 
-    /**
-     * Set the instance that matches the oneOf child schema, check
-     * the instance parameter is valid against the oneOf child schemas:
-     * A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C
-     *
-     * It could be an instance of the 'oneOf' schemas.
-     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
-     */
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof A) {
-            super.setActualInstance(instance);
-            return;
-        }
+    this.e = e;
+    return this;
+  }
 
-        if (instance instanceof AllOfInlineAndRefsAllOf) {
-            super.setActualInstance(instance);
-            return;
-        }
+   /**
+   * Get e
+   * @return e
+  **/
+  @javax.annotation.Nullable
+  public String getE() {
+    return e;
+  }
 
-        if (instance instanceof AllOfInlineAndRefsAllOf1) {
-            super.setActualInstance(instance);
-            return;
-        }
 
-        if (instance instanceof B) {
-            super.setActualInstance(instance);
-            return;
-        }
+  public void setE(String e) {
+    this.e = e;
+  }
 
-        if (instance instanceof C) {
-            super.setActualInstance(instance);
-            return;
-        }
 
-        throw new RuntimeException("Invalid instance type. Must be A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C");
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    /**
-     * Get the actual instance, which can be the following:
-     * A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C
-     *
-     * @return The actual instance (A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C)
-     */
-    @Override
-    public Object getActualInstance() {
-        return super.getActualInstance();
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    OneOfInlineAndRefsOneOf1 oneOfInlineAndRefsOneOf1 = (OneOfInlineAndRefsOneOf1) o;
+    return Objects.equals(this.e, oneOfInlineAndRefsOneOf1.e);
+        
+  }
 
-    /**
-     * Get the actual instance of \`A\`. If the actual instance is not \`A\`,
-     * the ClassCastException will be thrown.
-     *
-     * @return The actual instance of \`A\`
-     * @throws ClassCastException if the instance is not \`A\`
-     */
-    public A getA() throws ClassCastException {
-        return (A)super.getActualInstance();
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(e);
+  }
 
-    /**
-     * Get the actual instance of \`AllOfInlineAndRefsAllOf\`. If the actual instance is not \`AllOfInlineAndRefsAllOf\`,
-     * the ClassCastException will be thrown.
-     *
-     * @return The actual instance of \`AllOfInlineAndRefsAllOf\`
-     * @throws ClassCastException if the instance is not \`AllOfInlineAndRefsAllOf\`
-     */
-    public AllOfInlineAndRefsAllOf getAllOfInlineAndRefsAllOf() throws ClassCastException {
-        return (AllOfInlineAndRefsAllOf)super.getActualInstance();
-    }
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OneOfInlineAndRefsOneOf1 {\\n");
+    sb.append("    e: ").append(toIndentedString(e)).append("\\n");
+    sb.append("}");
+    return sb.toString();
+  }
 
-    /**
-     * Get the actual instance of \`AllOfInlineAndRefsAllOf1\`. If the actual instance is not \`AllOfInlineAndRefsAllOf1\`,
-     * the ClassCastException will be thrown.
-     *
-     * @return The actual instance of \`AllOfInlineAndRefsAllOf1\`
-     * @throws ClassCastException if the instance is not \`AllOfInlineAndRefsAllOf1\`
-     */
-    public AllOfInlineAndRefsAllOf1 getAllOfInlineAndRefsAllOf1() throws ClassCastException {
-        return (AllOfInlineAndRefsAllOf1)super.getActualInstance();
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
     }
+    return o.toString().replace("\\n", "\\n    ");
+  }
 
-    /**
-     * Get the actual instance of \`B\`. If the actual instance is not \`B\`,
-     * the ClassCastException will be thrown.
-     *
-     * @return The actual instance of \`B\`
-     * @throws ClassCastException if the instance is not \`B\`
-     */
-    public B getB() throws ClassCastException {
-        return (B)super.getActualInstance();
-    }
 
-    /**
-     * Get the actual instance of \`C\`. If the actual instance is not \`C\`,
-     * the ClassCastException will be thrown.
-     *
-     * @return The actual instance of \`C\`
-     * @throws ClassCastException if the instance is not \`C\`
-     */
-    public C getC() throws ClassCastException {
-        return (C)super.getActualInstance();
-    }
+  public static HashSet<String> openapiFields;
+  public static HashSet<String> openapiRequiredFields;
+
+  static {
+    // a set of all properties/fields (JSON key names)
+    openapiFields = new HashSet<String>();
+    openapiFields.add("e");
 
+    // a set of required properties/fields (JSON key names)
+    openapiRequiredFields = new HashSet<String>();
+  }
 
  /**
   * Validates the JSON Object and throws an exception if issues found
   *
   * @param jsonObj JSON Object
-  * @throws IOException if the JSON Object is invalid with respect to OneOfInlineAndRefs
+  * @throws IOException if the JSON Object is invalid with respect to OneOfInlineAndRefsOneOf1
   */
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
-    // validate oneOf schemas one by one
-    int validCount = 0;
-    ArrayList<String> errorMessages = new ArrayList<>();
-    // validate the json string with A
-    try {
-      A.validateJsonObject(jsonObj);
-      validCount++;
-    } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for A failed with \`%s\`.", e.getMessage()));
-      // continue to the next one
-    }
-    // validate the json string with AllOfInlineAndRefsAllOf
-    try {
-      AllOfInlineAndRefsAllOf.validateJsonObject(jsonObj);
-      validCount++;
-    } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for AllOfInlineAndRefsAllOf failed with \`%s\`.", e.getMessage()));
-      // continue to the next one
-    }
-    // validate the json string with AllOfInlineAndRefsAllOf1
-    try {
-      AllOfInlineAndRefsAllOf1.validateJsonObject(jsonObj);
-      validCount++;
-    } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for AllOfInlineAndRefsAllOf1 failed with \`%s\`.", e.getMessage()));
-      // continue to the next one
-    }
-    // validate the json string with B
-    try {
-      B.validateJsonObject(jsonObj);
-      validCount++;
-    } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for B failed with \`%s\`.", e.getMessage()));
-      // continue to the next one
-    }
-    // validate the json string with C
-    try {
-      C.validateJsonObject(jsonObj);
-      validCount++;
-    } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for C failed with \`%s\`.", e.getMessage()));
-      // continue to the next one
-    }
-    if (validCount != 1) {
-      throw new IOException(String.format("The JSON string is invalid for OneOfInlineAndRefs with oneOf schemas: A, AllOfInlineAndRefsAllOf, AllOfInlineAndRefsAllOf1, B, C. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonObj.toString()));
+      if (jsonObj == null) {
+        if (!OneOfInlineAndRefsOneOf1.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
+          throw new IllegalArgumentException(String.format("The required field(s) %s in OneOfInlineAndRefsOneOf1 is not found in the empty JSON string", OneOfInlineAndRefsOneOf1.openapiRequiredFields.toString()));
+        }
+      }
+
+      Set<Entry<String, JsonElement>> entries = jsonObj.entrySet();
+      // check to see if the JSON string contains additional fields
+      for (Entry<String, JsonElement> entry : entries) {
+        if (!OneOfInlineAndRefsOneOf1.openapiFields.contains(entry.getKey())) {
+          throw new IllegalArgumentException(String.format("The field \`%s\` in the JSON string is not defined in the \`OneOfInlineAndRefsOneOf1\` properties. JSON: %s", entry.getKey(), jsonObj.toString()));
+        }
+      }
+      if ((jsonObj.get("e") != null && !jsonObj.get("e").isJsonNull()) && !jsonObj.get("e").isJsonPrimitive()) {
+        throw new IllegalArgumentException(String.format("Expected the field \`e\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("e").toString()));
+      }
+  }
+
+  public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+       if (!OneOfInlineAndRefsOneOf1.class.isAssignableFrom(type.getRawType())) {
+         return null; // this class only serializes 'OneOfInlineAndRefsOneOf1' and its subtypes
+       }
+       final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
+       final TypeAdapter<OneOfInlineAndRefsOneOf1> thisAdapter
+                        = gson.getDelegateAdapter(this, TypeToken.get(OneOfInlineAndRefsOneOf1.class));
+
+       return (TypeAdapter<T>) new TypeAdapter<OneOfInlineAndRefsOneOf1>() {
+           @Override
+           public void write(JsonWriter out, OneOfInlineAndRefsOneOf1 value) throws IOException {
+             JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
+             elementAdapter.write(out, obj);
+           }
+
+           @Override
+           public OneOfInlineAndRefsOneOf1 read(JsonReader in) throws IOException {
+             JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
+             validateJsonObject(jsonObj);
+             return thisAdapter.fromJsonTree(jsonObj);
+           }
+
+       }.nullSafe();
     }
   }
 
  /**
-  * Create an instance of OneOfInlineAndRefs given an JSON string
+  * Create an instance of OneOfInlineAndRefsOneOf1 given an JSON string
   *
   * @param jsonString JSON string
-  * @return An instance of OneOfInlineAndRefs
-  * @throws IOException if the JSON string is invalid with respect to OneOfInlineAndRefs
+  * @return An instance of OneOfInlineAndRefsOneOf1
+  * @throws IOException if the JSON string is invalid with respect to OneOfInlineAndRefsOneOf1
   */
-  public static OneOfInlineAndRefs fromJson(String jsonString) throws IOException {
-    return JSON.getGson().fromJson(jsonString, OneOfInlineAndRefs.class);
+  public static OneOfInlineAndRefsOneOf1 fromJson(String jsonString) throws IOException {
+    return JSON.getGson().fromJson(jsonString, OneOfInlineAndRefsOneOf1.class);
   }
 
  /**
-  * Convert an instance of OneOfInlineAndRefs to an JSON string
+  * Convert an instance of OneOfInlineAndRefsOneOf1 to an JSON string
   *
   * @return JSON string
   */
@@ -15492,17 +14855,15 @@ public class OneOfInlineAndRefs extends AbstractOpenApiSchema {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/OneOfPrimitives.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -15511,10 +14872,22 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -15523,9 +14896,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -15545,8 +14922,7 @@ import com.google.gson.JsonParseException;
 
 import test.test.runtime.JSON;
 
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@lombok.experimental.SuperBuilder
 public class OneOfPrimitives extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(OneOfPrimitives.class.getName());
 
@@ -15558,8 +14934,8 @@ public class OneOfPrimitives extends AbstractOpenApiSchema {
                 return null; // this class only serializes 'OneOfPrimitives' and its subtypes
             }
             final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-            final TypeAdapter<Integer> adapterInteger = gson.getDelegateAdapter(this, TypeToken.get(Integer.class));
             final TypeAdapter<String> adapterString = gson.getDelegateAdapter(this, TypeToken.get(String.class));
+            final TypeAdapter<Integer> adapterInteger = gson.getDelegateAdapter(this, TypeToken.get(Integer.class));
 
             return (TypeAdapter<T>) new TypeAdapter<OneOfPrimitives>() {
                 @Override
@@ -15569,21 +14945,21 @@ public class OneOfPrimitives extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    // check if the actual instance is of the type \`Integer\`
-                    if (value.getActualInstance() instanceof Integer) {
-                        JsonObject obj = adapterInteger.toJsonTree((Integer)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`String\`
+                    if (value.getActualInstance() instanceof String) {
+                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    // check if the actual instance is of the type \`String\`
-                    if (value.getActualInstance() instanceof String) {
-                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`Integer\`
+                    if (value.getActualInstance() instanceof Integer) {
+                        JsonObject obj = adapterInteger.toJsonTree((Integer)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: Integer, String");
+                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: String, Integer");
                 }
 
                 @Override
@@ -15595,30 +14971,30 @@ public class OneOfPrimitives extends AbstractOpenApiSchema {
                     ArrayList<String> errorMessages = new ArrayList<>();
                     TypeAdapter actualAdapter = elementAdapter;
 
-                    // deserialize Integer
+                    // deserialize String
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        Integer.validateJsonObject(jsonObject);
-                        actualAdapter = adapterInteger;
+                        String.validateJsonObject(jsonObject);
+                        actualAdapter = adapterString;
                         match++;
-                        log.log(Level.FINER, "Input data matches schema 'Integer'");
+                        log.log(Level.FINER, "Input data matches schema 'String'");
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        errorMessages.add(String.format("Deserialization for Integer failed with \`%s\`.", e.getMessage()));
-                        log.log(Level.FINER, "Input data does not match schema 'Integer'", e);
+                        errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
+                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
                     }
 
-                    // deserialize String
+                    // deserialize Integer
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        String.validateJsonObject(jsonObject);
-                        actualAdapter = adapterString;
+                        Integer.validateJsonObject(jsonObject);
+                        actualAdapter = adapterInteger;
                         match++;
-                        log.log(Level.FINER, "Input data matches schema 'String'");
+                        log.log(Level.FINER, "Input data matches schema 'Integer'");
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
-                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
+                        errorMessages.add(String.format("Deserialization for Integer failed with \`%s\`.", e.getMessage()));
+                        log.log(Level.FINER, "Input data does not match schema 'Integer'", e);
                     }
 
                     if (match == 1) {
@@ -15640,21 +15016,21 @@ public class OneOfPrimitives extends AbstractOpenApiSchema {
         super("oneOf", Boolean.FALSE);
     }
 
-    public OneOfPrimitives(Integer o) {
+    public OneOfPrimitives(String o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
-    public OneOfPrimitives(String o) {
+    public OneOfPrimitives(Integer o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
     static {
-        schemas.put("Integer", new GenericType<Integer>() {
-        });
         schemas.put("String", new GenericType<String>() {
         });
+        schemas.put("Integer", new GenericType<Integer>() {
+        });
     }
 
     @Override
@@ -15665,31 +15041,31 @@ public class OneOfPrimitives extends AbstractOpenApiSchema {
     /**
      * Set the instance that matches the oneOf child schema, check
      * the instance parameter is valid against the oneOf child schemas:
-     * Integer, String
+     * String, Integer
      *
      * It could be an instance of the 'oneOf' schemas.
      * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
      */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof Integer) {
+        if (instance instanceof String) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof String) {
+        if (instance instanceof Integer) {
             super.setActualInstance(instance);
             return;
         }
 
-        throw new RuntimeException("Invalid instance type. Must be Integer, String");
+        throw new RuntimeException("Invalid instance type. Must be String, Integer");
     }
 
     /**
      * Get the actual instance, which can be the following:
-     * Integer, String
+     * String, Integer
      *
-     * @return The actual instance (Integer, String)
+     * @return The actual instance (String, Integer)
      */
     @Override
     public Object getActualInstance() {
@@ -15697,25 +15073,25 @@ public class OneOfPrimitives extends AbstractOpenApiSchema {
     }
 
     /**
-     * Get the actual instance of \`Integer\`. If the actual instance is not \`Integer\`,
+     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`Integer\`
-     * @throws ClassCastException if the instance is not \`Integer\`
+     * @return The actual instance of \`String\`
+     * @throws ClassCastException if the instance is not \`String\`
      */
-    public Integer getInteger() throws ClassCastException {
-        return (Integer)super.getActualInstance();
+    public String getString() throws ClassCastException {
+        return (String)super.getActualInstance();
     }
 
     /**
-     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
+     * Get the actual instance of \`Integer\`. If the actual instance is not \`Integer\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`String\`
-     * @throws ClassCastException if the instance is not \`String\`
+     * @return The actual instance of \`Integer\`
+     * @throws ClassCastException if the instance is not \`Integer\`
      */
-    public String getString() throws ClassCastException {
-        return (String)super.getActualInstance();
+    public Integer getInteger() throws ClassCastException {
+        return (Integer)super.getActualInstance();
     }
 
 
@@ -15729,24 +15105,24 @@ public class OneOfPrimitives extends AbstractOpenApiSchema {
     // validate oneOf schemas one by one
     int validCount = 0;
     ArrayList<String> errorMessages = new ArrayList<>();
-    // validate the json string with Integer
+    // validate the json string with String
     try {
-      Integer.validateJsonObject(jsonObj);
+      String.validateJsonObject(jsonObj);
       validCount++;
     } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for Integer failed with \`%s\`.", e.getMessage()));
+      errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
       // continue to the next one
     }
-    // validate the json string with String
+    // validate the json string with Integer
     try {
-      String.validateJsonObject(jsonObj);
+      Integer.validateJsonObject(jsonObj);
       validCount++;
     } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
+      errorMessages.add(String.format("Deserialization for Integer failed with \`%s\`.", e.getMessage()));
       // continue to the next one
     }
     if (validCount != 1) {
-      throw new IOException(String.format("The JSON string is invalid for OneOfPrimitives with oneOf schemas: Integer, String. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonObj.toString()));
+      throw new IOException(String.format("The JSON string is invalid for OneOfPrimitives with oneOf schemas: String, Integer. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonObj.toString()));
     }
   }
 
@@ -15769,18 +15145,17 @@ public class OneOfPrimitives extends AbstractOpenApiSchema {
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
-}
 
+}
 ",
   "src/main/java/test/test/runtime/model/OneOfPrimitivesAndRefs.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -15789,17 +15164,23 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.A;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.A;
 
 import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -15808,9 +15189,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -15830,8 +15215,7 @@ import com.google.gson.JsonParseException;
 
 import test.test.runtime.JSON;
 
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@lombok.experimental.SuperBuilder
 public class OneOfPrimitivesAndRefs extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(OneOfPrimitivesAndRefs.class.getName());
 
@@ -15843,8 +15227,8 @@ public class OneOfPrimitivesAndRefs extends AbstractOpenApiSchema {
                 return null; // this class only serializes 'OneOfPrimitivesAndRefs' and its subtypes
             }
             final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-            final TypeAdapter<A> adapterA = gson.getDelegateAdapter(this, TypeToken.get(A.class));
             final TypeAdapter<String> adapterString = gson.getDelegateAdapter(this, TypeToken.get(String.class));
+            final TypeAdapter<A> adapterA = gson.getDelegateAdapter(this, TypeToken.get(A.class));
 
             return (TypeAdapter<T>) new TypeAdapter<OneOfPrimitivesAndRefs>() {
                 @Override
@@ -15854,21 +15238,21 @@ public class OneOfPrimitivesAndRefs extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    // check if the actual instance is of the type \`A\`
-                    if (value.getActualInstance() instanceof A) {
-                        JsonObject obj = adapterA.toJsonTree((A)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`String\`
+                    if (value.getActualInstance() instanceof String) {
+                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    // check if the actual instance is of the type \`String\`
-                    if (value.getActualInstance() instanceof String) {
-                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`A\`
+                    if (value.getActualInstance() instanceof A) {
+                        JsonObject obj = adapterA.toJsonTree((A)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: A, String");
+                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: String, A");
                 }
 
                 @Override
@@ -15880,30 +15264,30 @@ public class OneOfPrimitivesAndRefs extends AbstractOpenApiSchema {
                     ArrayList<String> errorMessages = new ArrayList<>();
                     TypeAdapter actualAdapter = elementAdapter;
 
-                    // deserialize A
+                    // deserialize String
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        A.validateJsonObject(jsonObject);
-                        actualAdapter = adapterA;
+                        String.validateJsonObject(jsonObject);
+                        actualAdapter = adapterString;
                         match++;
-                        log.log(Level.FINER, "Input data matches schema 'A'");
+                        log.log(Level.FINER, "Input data matches schema 'String'");
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        errorMessages.add(String.format("Deserialization for A failed with \`%s\`.", e.getMessage()));
-                        log.log(Level.FINER, "Input data does not match schema 'A'", e);
+                        errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
+                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
                     }
 
-                    // deserialize String
+                    // deserialize A
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        String.validateJsonObject(jsonObject);
-                        actualAdapter = adapterString;
+                        A.validateJsonObject(jsonObject);
+                        actualAdapter = adapterA;
                         match++;
-                        log.log(Level.FINER, "Input data matches schema 'String'");
+                        log.log(Level.FINER, "Input data matches schema 'A'");
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
-                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
+                        errorMessages.add(String.format("Deserialization for A failed with \`%s\`.", e.getMessage()));
+                        log.log(Level.FINER, "Input data does not match schema 'A'", e);
                     }
 
                     if (match == 1) {
@@ -15925,21 +15309,21 @@ public class OneOfPrimitivesAndRefs extends AbstractOpenApiSchema {
         super("oneOf", Boolean.FALSE);
     }
 
-    public OneOfPrimitivesAndRefs(A o) {
+    public OneOfPrimitivesAndRefs(String o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
-    public OneOfPrimitivesAndRefs(String o) {
+    public OneOfPrimitivesAndRefs(A o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
     static {
-        schemas.put("A", new GenericType<A>() {
-        });
         schemas.put("String", new GenericType<String>() {
         });
+        schemas.put("A", new GenericType<A>() {
+        });
     }
 
     @Override
@@ -15950,31 +15334,31 @@ public class OneOfPrimitivesAndRefs extends AbstractOpenApiSchema {
     /**
      * Set the instance that matches the oneOf child schema, check
      * the instance parameter is valid against the oneOf child schemas:
-     * A, String
+     * String, A
      *
      * It could be an instance of the 'oneOf' schemas.
      * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
      */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof A) {
+        if (instance instanceof String) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof String) {
+        if (instance instanceof A) {
             super.setActualInstance(instance);
             return;
         }
 
-        throw new RuntimeException("Invalid instance type. Must be A, String");
+        throw new RuntimeException("Invalid instance type. Must be String, A");
     }
 
     /**
      * Get the actual instance, which can be the following:
-     * A, String
+     * String, A
      *
-     * @return The actual instance (A, String)
+     * @return The actual instance (String, A)
      */
     @Override
     public Object getActualInstance() {
@@ -15982,25 +15366,25 @@ public class OneOfPrimitivesAndRefs extends AbstractOpenApiSchema {
     }
 
     /**
-     * Get the actual instance of \`A\`. If the actual instance is not \`A\`,
+     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`A\`
-     * @throws ClassCastException if the instance is not \`A\`
+     * @return The actual instance of \`String\`
+     * @throws ClassCastException if the instance is not \`String\`
      */
-    public A getA() throws ClassCastException {
-        return (A)super.getActualInstance();
+    public String getString() throws ClassCastException {
+        return (String)super.getActualInstance();
     }
 
     /**
-     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
+     * Get the actual instance of \`A\`. If the actual instance is not \`A\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`String\`
-     * @throws ClassCastException if the instance is not \`String\`
+     * @return The actual instance of \`A\`
+     * @throws ClassCastException if the instance is not \`A\`
      */
-    public String getString() throws ClassCastException {
-        return (String)super.getActualInstance();
+    public A getA() throws ClassCastException {
+        return (A)super.getActualInstance();
     }
 
 
@@ -16014,24 +15398,24 @@ public class OneOfPrimitivesAndRefs extends AbstractOpenApiSchema {
     // validate oneOf schemas one by one
     int validCount = 0;
     ArrayList<String> errorMessages = new ArrayList<>();
-    // validate the json string with A
+    // validate the json string with String
     try {
-      A.validateJsonObject(jsonObj);
+      String.validateJsonObject(jsonObj);
       validCount++;
     } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for A failed with \`%s\`.", e.getMessage()));
+      errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
       // continue to the next one
     }
-    // validate the json string with String
+    // validate the json string with A
     try {
-      String.validateJsonObject(jsonObj);
+      A.validateJsonObject(jsonObj);
       validCount++;
     } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
+      errorMessages.add(String.format("Deserialization for A failed with \`%s\`.", e.getMessage()));
       // continue to the next one
     }
     if (validCount != 1) {
-      throw new IOException(String.format("The JSON string is invalid for OneOfPrimitivesAndRefs with oneOf schemas: A, String. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonObj.toString()));
+      throw new IOException(String.format("The JSON string is invalid for OneOfPrimitivesAndRefs with oneOf schemas: String, A. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonObj.toString()));
     }
   }
 
@@ -16054,18 +15438,17 @@ public class OneOfPrimitivesAndRefs extends AbstractOpenApiSchema {
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
-}
 
+}
 ",
   "src/main/java/test/test/runtime/model/OneOfRefs.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -16074,19 +15457,25 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.A;
+import test.test.runtime.model.B;
+import test.test.runtime.model.C;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.A;
-import test.test.runtime.model.B;
-import test.test.runtime.model.C;
 
 import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -16095,9 +15484,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -16117,8 +15510,7 @@ import com.google.gson.JsonParseException;
 
 import test.test.runtime.JSON;
 
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@lombok.experimental.SuperBuilder
 public class OneOfRefs extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(OneOfRefs.class.getName());
 
@@ -16393,18 +15785,17 @@ public class OneOfRefs extends AbstractOpenApiSchema {
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
-}
 
+}
 ",
   "src/main/java/test/test/runtime/model/Wrapper.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -16413,34 +15804,56 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.WrapperAllOf;
+import test.test.runtime.model.WrapperAnyOf;
+import test.test.runtime.model.WrapperOneOf;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.WrapperAllOf;
-import test.test.runtime.model.WrapperAnyOf;
-import test.test.runtime.model.WrapperOneOf;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -16448,7 +15861,6 @@ import test.test.runtime.JSON;
  * Wrapper
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Wrapper {
   public static final String SERIALIZED_NAME_ALL_OF = "allOf";
   @SerializedName(SERIALIZED_NAME_ALL_OF)
@@ -16466,7 +15878,7 @@ public class Wrapper {
   }
 
   public Wrapper allOf(WrapperAllOf allOf) {
-    
+
     this.allOf = allOf;
     return this;
   }
@@ -16476,7 +15888,6 @@ public class Wrapper {
    * @return allOf
   **/
   @javax.annotation.Nullable
-
   public WrapperAllOf getAllOf() {
     return allOf;
   }
@@ -16486,9 +15897,8 @@ public class Wrapper {
     this.allOf = allOf;
   }
 
-
   public Wrapper anyOf(WrapperAnyOf anyOf) {
-    
+
     this.anyOf = anyOf;
     return this;
   }
@@ -16498,7 +15908,6 @@ public class Wrapper {
    * @return anyOf
   **/
   @javax.annotation.Nullable
-
   public WrapperAnyOf getAnyOf() {
     return anyOf;
   }
@@ -16508,9 +15917,8 @@ public class Wrapper {
     this.anyOf = anyOf;
   }
 
-
   public Wrapper oneOf(WrapperOneOf oneOf) {
-    
+
     this.oneOf = oneOf;
     return this;
   }
@@ -16520,7 +15928,6 @@ public class Wrapper {
    * @return oneOf
   **/
   @javax.annotation.Nullable
-
   public WrapperOneOf getOneOf() {
     return oneOf;
   }
@@ -16531,7 +15938,6 @@ public class Wrapper {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -16544,6 +15950,7 @@ public class Wrapper {
     return Objects.equals(this.allOf, wrapper.allOf) &&
         Objects.equals(this.anyOf, wrapper.anyOf) &&
         Objects.equals(this.oneOf, wrapper.oneOf);
+        
   }
 
   @Override
@@ -16671,17 +16078,15 @@ public class Wrapper {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/WrapperAllOf.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -16690,33 +16095,55 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.AllOfInlineAndRefs;
+import test.test.runtime.model.AllOfRefs;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.AllOfInlineAndRefs;
-import test.test.runtime.model.AllOfRefs;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -16724,7 +16151,6 @@ import test.test.runtime.JSON;
  * WrapperAllOf
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class WrapperAllOf {
   public static final String SERIALIZED_NAME_REFS = "refs";
   @SerializedName(SERIALIZED_NAME_REFS)
@@ -16738,7 +16164,7 @@ public class WrapperAllOf {
   }
 
   public WrapperAllOf refs(AllOfRefs refs) {
-    
+
     this.refs = refs;
     return this;
   }
@@ -16748,7 +16174,6 @@ public class WrapperAllOf {
    * @return refs
   **/
   @javax.annotation.Nullable
-
   public AllOfRefs getRefs() {
     return refs;
   }
@@ -16758,9 +16183,8 @@ public class WrapperAllOf {
     this.refs = refs;
   }
 
-
   public WrapperAllOf inlineAndRefs(AllOfInlineAndRefs inlineAndRefs) {
-    
+
     this.inlineAndRefs = inlineAndRefs;
     return this;
   }
@@ -16770,7 +16194,6 @@ public class WrapperAllOf {
    * @return inlineAndRefs
   **/
   @javax.annotation.Nullable
-
   public AllOfInlineAndRefs getInlineAndRefs() {
     return inlineAndRefs;
   }
@@ -16781,7 +16204,6 @@ public class WrapperAllOf {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -16793,6 +16215,7 @@ public class WrapperAllOf {
     WrapperAllOf wrapperAllOf = (WrapperAllOf) o;
     return Objects.equals(this.refs, wrapperAllOf.refs) &&
         Objects.equals(this.inlineAndRefs, wrapperAllOf.inlineAndRefs);
+        
   }
 
   @Override
@@ -16914,17 +16337,15 @@ public class WrapperAllOf {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/WrapperAnyOf.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -16933,35 +16354,57 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.AnyOfInlineAndRefs;
+import test.test.runtime.model.AnyOfPrimitives;
+import test.test.runtime.model.AnyOfPrimitivesAndRefs;
+import test.test.runtime.model.AnyOfRefs;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.AnyOfInlineAndRefs;
-import test.test.runtime.model.AnyOfPrimitives;
-import test.test.runtime.model.AnyOfPrimitivesAndRefs;
-import test.test.runtime.model.AnyOfRefs;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -16969,7 +16412,6 @@ import test.test.runtime.JSON;
  * WrapperAnyOf
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class WrapperAnyOf {
   public static final String SERIALIZED_NAME_REFS = "refs";
   @SerializedName(SERIALIZED_NAME_REFS)
@@ -16991,7 +16433,7 @@ public class WrapperAnyOf {
   }
 
   public WrapperAnyOf refs(AnyOfRefs refs) {
-    
+
     this.refs = refs;
     return this;
   }
@@ -17001,7 +16443,6 @@ public class WrapperAnyOf {
    * @return refs
   **/
   @javax.annotation.Nullable
-
   public AnyOfRefs getRefs() {
     return refs;
   }
@@ -17011,9 +16452,8 @@ public class WrapperAnyOf {
     this.refs = refs;
   }
 
-
   public WrapperAnyOf inlineAndRefs(AnyOfInlineAndRefs inlineAndRefs) {
-    
+
     this.inlineAndRefs = inlineAndRefs;
     return this;
   }
@@ -17023,7 +16463,6 @@ public class WrapperAnyOf {
    * @return inlineAndRefs
   **/
   @javax.annotation.Nullable
-
   public AnyOfInlineAndRefs getInlineAndRefs() {
     return inlineAndRefs;
   }
@@ -17033,9 +16472,8 @@ public class WrapperAnyOf {
     this.inlineAndRefs = inlineAndRefs;
   }
 
-
   public WrapperAnyOf primitives(AnyOfPrimitives primitives) {
-    
+
     this.primitives = primitives;
     return this;
   }
@@ -17045,7 +16483,6 @@ public class WrapperAnyOf {
    * @return primitives
   **/
   @javax.annotation.Nullable
-
   public AnyOfPrimitives getPrimitives() {
     return primitives;
   }
@@ -17055,9 +16492,8 @@ public class WrapperAnyOf {
     this.primitives = primitives;
   }
 
-
   public WrapperAnyOf primitivesAndRefs(AnyOfPrimitivesAndRefs primitivesAndRefs) {
-    
+
     this.primitivesAndRefs = primitivesAndRefs;
     return this;
   }
@@ -17067,7 +16503,6 @@ public class WrapperAnyOf {
    * @return primitivesAndRefs
   **/
   @javax.annotation.Nullable
-
   public AnyOfPrimitivesAndRefs getPrimitivesAndRefs() {
     return primitivesAndRefs;
   }
@@ -17078,7 +16513,6 @@ public class WrapperAnyOf {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -17092,6 +16526,7 @@ public class WrapperAnyOf {
         Objects.equals(this.inlineAndRefs, wrapperAnyOf.inlineAndRefs) &&
         Objects.equals(this.primitives, wrapperAnyOf.primitives) &&
         Objects.equals(this.primitivesAndRefs, wrapperAnyOf.primitivesAndRefs);
+        
   }
 
   @Override
@@ -17225,17 +16660,15 @@ public class WrapperAnyOf {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/WrapperOneOf.java": "/*
  * composite models
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -17244,35 +16677,57 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.OneOfInlineAndRefs;
+import test.test.runtime.model.OneOfPrimitives;
+import test.test.runtime.model.OneOfPrimitivesAndRefs;
+import test.test.runtime.model.OneOfRefs;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.OneOfInlineAndRefs;
-import test.test.runtime.model.OneOfPrimitives;
-import test.test.runtime.model.OneOfPrimitivesAndRefs;
-import test.test.runtime.model.OneOfRefs;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -17280,7 +16735,6 @@ import test.test.runtime.JSON;
  * WrapperOneOf
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class WrapperOneOf {
   public static final String SERIALIZED_NAME_REFS = "refs";
   @SerializedName(SERIALIZED_NAME_REFS)
@@ -17302,7 +16756,7 @@ public class WrapperOneOf {
   }
 
   public WrapperOneOf refs(OneOfRefs refs) {
-    
+
     this.refs = refs;
     return this;
   }
@@ -17312,7 +16766,6 @@ public class WrapperOneOf {
    * @return refs
   **/
   @javax.annotation.Nullable
-
   public OneOfRefs getRefs() {
     return refs;
   }
@@ -17322,9 +16775,8 @@ public class WrapperOneOf {
     this.refs = refs;
   }
 
-
   public WrapperOneOf inlineAndRefs(OneOfInlineAndRefs inlineAndRefs) {
-    
+
     this.inlineAndRefs = inlineAndRefs;
     return this;
   }
@@ -17334,7 +16786,6 @@ public class WrapperOneOf {
    * @return inlineAndRefs
   **/
   @javax.annotation.Nullable
-
   public OneOfInlineAndRefs getInlineAndRefs() {
     return inlineAndRefs;
   }
@@ -17344,9 +16795,8 @@ public class WrapperOneOf {
     this.inlineAndRefs = inlineAndRefs;
   }
 
-
   public WrapperOneOf primitives(OneOfPrimitives primitives) {
-    
+
     this.primitives = primitives;
     return this;
   }
@@ -17356,7 +16806,6 @@ public class WrapperOneOf {
    * @return primitives
   **/
   @javax.annotation.Nullable
-
   public OneOfPrimitives getPrimitives() {
     return primitives;
   }
@@ -17366,9 +16815,8 @@ public class WrapperOneOf {
     this.primitives = primitives;
   }
 
-
   public WrapperOneOf primitivesAndRefs(OneOfPrimitivesAndRefs primitivesAndRefs) {
-    
+
     this.primitivesAndRefs = primitivesAndRefs;
     return this;
   }
@@ -17378,7 +16826,6 @@ public class WrapperOneOf {
    * @return primitivesAndRefs
   **/
   @javax.annotation.Nullable
-
   public OneOfPrimitivesAndRefs getPrimitivesAndRefs() {
     return primitivesAndRefs;
   }
@@ -17389,7 +16836,6 @@ public class WrapperOneOf {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -17403,6 +16849,7 @@ public class WrapperOneOf {
         Objects.equals(this.inlineAndRefs, wrapperOneOf.inlineAndRefs) &&
         Objects.equals(this.primitives, wrapperOneOf.primitives) &&
         Objects.equals(this.primitivesAndRefs, wrapperOneOf.primitivesAndRefs);
+        
   }
 
   @Override
@@ -17536,164 +16983,13 @@ public class WrapperOneOf {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
 }
 `;
 
 exports[`Java Client Code Generation Script Unit Tests Generates With data-types.yaml 1`] = `
 {
-  ".github/workflows/maven.yml": "# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-#
-# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  build:
-    name: Build Data Types
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8' ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: \${{ matrix.java }}
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
-",
-  ".gitignore": "*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
-",
-  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
-",
-  ".openapi-generator/FILES": ".github/workflows/maven.yml
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/DataTypes200Response.md
-docs/DataTypes200ResponseMyAllOf.md
-docs/DataTypes200ResponseMyAllOfAllOf.md
-docs/DataTypes200ResponseMyAllOfAllOf1.md
-docs/DataTypes200ResponseMyAnyOf.md
-docs/DataTypes200ResponseMyNotNot.md
-docs/DataTypes200ResponseMyObject.md
-docs/DataTypes200ResponseMyObjectOne.md
-docs/DataTypes200ResponseMyObjectOneTwo.md
-docs/DataTypes200ResponseMyOneOf.md
-docs/DefaultApi.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
-src/main/java/test/test/runtime/ApiCallback.java
-src/main/java/test/test/runtime/ApiClient.java
-src/main/java/test/test/runtime/ApiException.java
-src/main/java/test/test/runtime/ApiResponse.java
-src/main/java/test/test/runtime/Configuration.java
-src/main/java/test/test/runtime/GzipRequestInterceptor.java
-src/main/java/test/test/runtime/JSON.java
-src/main/java/test/test/runtime/Pair.java
-src/main/java/test/test/runtime/ProgressRequestBody.java
-src/main/java/test/test/runtime/ProgressResponseBody.java
-src/main/java/test/test/runtime/ServerConfiguration.java
-src/main/java/test/test/runtime/ServerVariable.java
-src/main/java/test/test/runtime/StringUtil.java
-src/main/java/test/test/runtime/__handlers.java
-src/main/java/test/test/runtime/__interceptors.java
-src/main/java/test/test/runtime/api/DefaultApi.java
-src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
-src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
-src/main/java/test/test/runtime/api/operation_config/Operations.java
-src/main/java/test/test/runtime/auth/ApiKeyAuth.java
-src/main/java/test/test/runtime/auth/Authentication.java
-src/main/java/test/test/runtime/auth/HttpBasicAuth.java
-src/main/java/test/test/runtime/auth/HttpBearerAuth.java
-src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
-src/main/java/test/test/runtime/model/DataTypes200Response.java
-src/main/java/test/test/runtime/model/DataTypes200ResponseMyAllOf.java
-src/main/java/test/test/runtime/model/DataTypes200ResponseMyAllOfAllOf.java
-src/main/java/test/test/runtime/model/DataTypes200ResponseMyAllOfAllOf1.java
-src/main/java/test/test/runtime/model/DataTypes200ResponseMyAnyOf.java
-src/main/java/test/test/runtime/model/DataTypes200ResponseMyNotNot.java
-src/main/java/test/test/runtime/model/DataTypes200ResponseMyObject.java
-src/main/java/test/test/runtime/model/DataTypes200ResponseMyObjectOne.java
-src/main/java/test/test/runtime/model/DataTypes200ResponseMyObjectOneTwo.java
-src/main/java/test/test/runtime/model/DataTypes200ResponseMyOneOf.java
-src/test/java/test/test/runtime/api/DefaultApiTest.java
-src/test/java/test/test/runtime/model/DataTypes200ResponseMyAllOfAllOf1Test.java
-src/test/java/test/test/runtime/model/DataTypes200ResponseMyAllOfAllOfTest.java
-src/test/java/test/test/runtime/model/DataTypes200ResponseMyAllOfTest.java
-src/test/java/test/test/runtime/model/DataTypes200ResponseMyAnyOfTest.java
-src/test/java/test/test/runtime/model/DataTypes200ResponseMyNotNotTest.java
-src/test/java/test/test/runtime/model/DataTypes200ResponseMyObjectOneTest.java
-src/test/java/test/test/runtime/model/DataTypes200ResponseMyObjectOneTwoTest.java
-src/test/java/test/test/runtime/model/DataTypes200ResponseMyObjectTest.java
-src/test/java/test/test/runtime/model/DataTypes200ResponseMyOneOfTest.java
-src/test/java/test/test/runtime/model/DataTypes200ResponseTest.java
-src/main/java/test/test/runtime/api/handlers/Handlers.java
+  ".tsapi-manifest": "src/main/java/test/test/runtime/api/handlers/Handlers.java
 src/main/java/test/test/runtime/api/handlers/Response.java
 src/main/java/test/test/runtime/api/handlers/ApiResponse.java
 src/main/java/test/test/runtime/api/handlers/Interceptor.java
@@ -17715,569 +17011,45 @@ src/main/java/test/test/runtime/api/interceptors/ResponseHeadersInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/LoggingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/TracingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/MetricsInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java",
-  ".openapi-generator/VERSION": "6.3.0",
-  ".pdk/dynamic-files/openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
-  "README.md": "# com.aws.pdk.test
-
-Data Types
-- API version: 1.0.0
-
-No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
-
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
-
-## Requirements
-
-Building the API client library requires:
-1. Java 1.8+
-2. Maven (3.8.3+)/Gradle (7.2+)
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-\`\`\`shell
-mvn clean install
-\`\`\`
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-\`\`\`shell
-mvn clean deploy
-\`\`\`
-
-Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-\`\`\`xml
-<dependency>
-  <groupId>test</groupId>
-  <artifactId>com.aws.pdk.test</artifactId>
-  <version>1.0.0</version>
-  <scope>compile</scope>
-</dependency>
-\`\`\`
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-\`\`\`groovy
-  repositories {
-    mavenCentral()     // Needed if the 'com.aws.pdk.test' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'com.aws.pdk.test' jar has been published to the local maven repo.
-  }
-
-  dependencies {
-     implementation "test:com.aws.pdk.test:1.0.0"
-  }
-\`\`\`
-
-### Others
-
-At first generate the JAR by executing:
-
-\`\`\`shell
-mvn clean package
-\`\`\`
-
-Then manually install the following JARs:
-
-* \`target/com.aws.pdk.test-1.0.0.jar\`
-* \`target/lib/*.jar\`
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following Java code:
-
-\`\`\`java
-
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      DataTypes200Response result = apiInstance.dataTypes()
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#dataTypes");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-
-\`\`\`
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://localhost*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*DefaultApi* | [**dataTypes**](docs/DefaultApi.md#dataTypes) | **GET** /types | 
-
-
-## Documentation for Models
-
- - [DataTypes200Response](docs/DataTypes200Response.md)
- - [DataTypes200ResponseMyAllOf](docs/DataTypes200ResponseMyAllOf.md)
- - [DataTypes200ResponseMyAllOfAllOf](docs/DataTypes200ResponseMyAllOfAllOf.md)
- - [DataTypes200ResponseMyAllOfAllOf1](docs/DataTypes200ResponseMyAllOfAllOf1.md)
- - [DataTypes200ResponseMyAnyOf](docs/DataTypes200ResponseMyAnyOf.md)
- - [DataTypes200ResponseMyNotNot](docs/DataTypes200ResponseMyNotNot.md)
- - [DataTypes200ResponseMyObject](docs/DataTypes200ResponseMyObject.md)
- - [DataTypes200ResponseMyObjectOne](docs/DataTypes200ResponseMyObjectOne.md)
- - [DataTypes200ResponseMyObjectOneTwo](docs/DataTypes200ResponseMyObjectOneTwo.md)
- - [DataTypes200ResponseMyOneOf](docs/DataTypes200ResponseMyOneOf.md)
-
-
-## Documentation for Authorization
-
-All endpoints do not require authorization.
-Authentication schemes defined for the API:
-
-## Recommendation
-
-It's recommended to create an instance of \`ApiClient\` per thread in a multithreaded environment to avoid any potential issues.
-
-## Author
-
-
-
-",
-  "api/openapi.yaml": "openapi: 3.0.3
-info:
-  title: Data Types
-  version: 1.0.0
-servers:
-- url: /
-paths:
-  /types:
-    get:
-      operationId: dataTypes
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/dataTypes_200_response'
-          description: Ok
-      x-accepts: application/json
-components:
-  schemas:
-    dataTypes_200_response_myObject_one:
-      properties:
-        twoString:
-          type: string
-        two:
-          $ref: '#/components/schemas/dataTypes_200_response_myObject_one_two'
-      type: object
-    dataTypes_200_response_myAllOf_allOf_1:
-      properties:
-        second:
-          type: string
-      type: object
-    dataTypes_200_response_myOneOf:
-      oneOf:
-      - type: string
-      - type: number
-    dataTypes_200_response_myAllOf:
-      allOf:
-      - $ref: '#/components/schemas/dataTypes_200_response_myAllOf_allOf'
-      - $ref: '#/components/schemas/dataTypes_200_response_myAllOf_allOf_1'
-    dataTypes_200_response_myObject:
-      properties:
-        one:
-          $ref: '#/components/schemas/dataTypes_200_response_myObject_one'
-        oneString:
-          type: string
-      type: object
-    dataTypes_200_response_myAllOf_allOf:
-      properties:
-        first:
-          type: string
-      type: object
-    dataTypes_200_response:
-      properties:
-        myInt:
-          maximum: 7
-          minimum: 3
-          type: integer
-        myExclusiveInt:
-          exclusiveMaximum: true
-          exclusiveMinimum: true
-          maximum: 7
-          minimum: 3
-          type: integer
-        myString:
-          type: string
-        myStringLength:
-          maxLength: 5
-          minLength: 4
-          type: string
-        myLongMinStringLength:
-          minLength: 1000
-          type: string
-        myBool:
-          type: boolean
-        myNumber:
-          type: number
-        myDateArray:
-          items:
-            format: date
-            type: string
-          type: array
-        myEmail:
-          format: email
-          type: string
-        myUrl:
-          format: uri
-          type: string
-        myHostname:
-          format: hostname
-          type: string
-        myIpv4:
-          format: ipv4
-          type: string
-        myIpv6:
-          format: ipv6
-          type: string
-        myUuid:
-          format: uuid
-          type: string
-        myByte:
-          format: byte
-          type: string
-        myConstrainedByte:
-          format: byte
-          maxLength: 42
-          type: string
-        myDateTime:
-          format: date-time
-          type: string
-        myRegexPattern:
-          pattern: "^\\\\d{4}-pattern-[a-z]+$"
-          type: string
-        myOneOf:
-          $ref: '#/components/schemas/dataTypes_200_response_myOneOf'
-        myAnyOf:
-          $ref: '#/components/schemas/dataTypes_200_response_myAnyOf'
-        myAllOf:
-          $ref: '#/components/schemas/dataTypes_200_response_myAllOf'
-        myNot:
-          not:
-            $ref: '#/components/schemas/dataTypes_200_response_myNot_not'
-        myNotString:
-          not:
-            type: string
-        myAdditionalProperties:
-          additionalProperties:
-            items:
-              maximum: 20
-              minimum: 10
-              type: integer
-            maxItems: 5
-            minItems: 2
-            type: array
-          type: object
-        myObject:
-          $ref: '#/components/schemas/dataTypes_200_response_myObject'
-      type: object
-    dataTypes_200_response_myAnyOf:
-      anyOf:
-      - type: string
-      - type: number
-    dataTypes_200_response_myNot_not:
-      properties:
-        foo:
-          type: string
-      type: object
-    dataTypes_200_response_myObject_one_two:
-      properties:
-        threeString:
-          type: string
-      type: object
-
-",
-  "docs/DataTypes200Response.md": "
-
-# DataTypes200Response
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**myInt** | **Integer** |  |  [optional] |
-|**myExclusiveInt** | **Integer** |  |  [optional] |
-|**myString** | **String** |  |  [optional] |
-|**myStringLength** | **String** |  |  [optional] |
-|**myLongMinStringLength** | **String** |  |  [optional] |
-|**myBool** | **Boolean** |  |  [optional] |
-|**myNumber** | **BigDecimal** |  |  [optional] |
-|**myDateArray** | **List&lt;LocalDate&gt;** |  |  [optional] |
-|**myEmail** | **String** |  |  [optional] |
-|**myUrl** | **URI** |  |  [optional] |
-|**myHostname** | **String** |  |  [optional] |
-|**myIpv4** | **String** |  |  [optional] |
-|**myIpv6** | **String** |  |  [optional] |
-|**myUuid** | **UUID** |  |  [optional] |
-|**myByte** | **byte[]** |  |  [optional] |
-|**myConstrainedByte** | **byte[]** |  |  [optional] |
-|**myDateTime** | **OffsetDateTime** |  |  [optional] |
-|**myRegexPattern** | **String** |  |  [optional] |
-|**myOneOf** | [**DataTypes200ResponseMyOneOf**](DataTypes200ResponseMyOneOf.md) |  |  [optional] |
-|**myAnyOf** | [**DataTypes200ResponseMyAnyOf**](DataTypes200ResponseMyAnyOf.md) |  |  [optional] |
-|**myAllOf** | [**DataTypes200ResponseMyAllOf**](DataTypes200ResponseMyAllOf.md) |  |  [optional] |
-|**myNot** | **Object** |  |  [optional] |
-|**myNotString** | **Object** |  |  [optional] |
-|**myAdditionalProperties** | **Map&lt;String, List&lt;Integer&gt;&gt;** |  |  [optional] |
-|**myObject** | [**DataTypes200ResponseMyObject**](DataTypes200ResponseMyObject.md) |  |  [optional] |
-
-
-
-",
-  "docs/DataTypes200ResponseMyAllOf.md": "
-
-# DataTypes200ResponseMyAllOf
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**first** | **String** |  |  [optional] |
-|**second** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/DataTypes200ResponseMyAllOfAllOf.md": "
-
-# DataTypes200ResponseMyAllOfAllOf
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**first** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/DataTypes200ResponseMyAllOfAllOf1.md": "
-
-# DataTypes200ResponseMyAllOfAllOf1
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**second** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/DataTypes200ResponseMyAnyOf.md": "
-
-# DataTypes200ResponseMyAnyOf
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-
-
-
-",
-  "docs/DataTypes200ResponseMyNotNot.md": "
-
-# DataTypes200ResponseMyNotNot
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**foo** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/DataTypes200ResponseMyObject.md": "
-
-# DataTypes200ResponseMyObject
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**one** | [**DataTypes200ResponseMyObjectOne**](DataTypes200ResponseMyObjectOne.md) |  |  [optional] |
-|**oneString** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/DataTypes200ResponseMyObjectOne.md": "
-
-# DataTypes200ResponseMyObjectOne
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**twoString** | **String** |  |  [optional] |
-|**two** | [**DataTypes200ResponseMyObjectOneTwo**](DataTypes200ResponseMyObjectOneTwo.md) |  |  [optional] |
-
-
-
-",
-  "docs/DataTypes200ResponseMyObjectOneTwo.md": "
-
-# DataTypes200ResponseMyObjectOneTwo
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**threeString** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/DataTypes200ResponseMyOneOf.md": "
-
-# DataTypes200ResponseMyOneOf
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-
-
-
-",
-  "docs/DefaultApi.md": "# DefaultApi
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**dataTypes**](DefaultApi.md#dataTypes) | **GET** /types |  |
-
-
-<a name="dataTypes"></a>
-# **dataTypes**
-> DataTypes200Response dataTypes().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      DataTypes200Response result = apiInstance.dataTypes()
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#dataTypes");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**DataTypes200Response**](DataTypes200Response.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Ok |  -  |
-
-",
-  "openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
+src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java
+src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
+src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
+src/main/java/test/test/runtime/api/operation_config/Operations.java
+src/main/java/test/test/runtime/api/DefaultApi.java
+src/main/java/test/test/runtime/auth/ApiKeyAuth.java
+src/main/java/test/test/runtime/auth/Authentication.java
+src/main/java/test/test/runtime/auth/HttpBasicAuth.java
+src/main/java/test/test/runtime/auth/HttpBearerAuth.java
+src/main/java/test/test/runtime/ApiCallback.java
+src/main/java/test/test/runtime/ApiClient.java
+src/main/java/test/test/runtime/ApiException.java
+src/main/java/test/test/runtime/ApiResponse.java
+src/main/java/test/test/runtime/Configuration.java
+src/main/java/test/test/runtime/GzipRequestInterceptor.java
+src/main/java/test/test/runtime/JSON.java
+src/main/java/test/test/runtime/Pair.java
+src/main/java/test/test/runtime/ProgressRequestBody.java
+src/main/java/test/test/runtime/ProgressResponseBody.java
+src/main/java/test/test/runtime/ServerConfiguration.java
+src/main/java/test/test/runtime/ServerVariable.java
+src/main/java/test/test/runtime/StringUtil.java
+src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
+src/main/java/test/test/runtime/model/DataTypes200Response.java
+src/main/java/test/test/runtime/model/DataTypes200ResponseMyAllOf.java
+src/main/java/test/test/runtime/model/DataTypes200ResponseMyAnyOf.java
+src/main/java/test/test/runtime/model/DataTypes200ResponseMyNotNot.java
+src/main/java/test/test/runtime/model/DataTypes200ResponseMyObject.java
+src/main/java/test/test/runtime/model/DataTypes200ResponseMyObjectOne.java
+src/main/java/test/test/runtime/model/DataTypes200ResponseMyObjectOneTwo.java
+src/main/java/test/test/runtime/model/DataTypes200ResponseMyOneOf.java",
   "src/main/java/test/test/runtime/ApiCallback.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -18334,13 +17106,12 @@ public interface ApiCallback<T> {
 ",
   "src/main/java/test/test/runtime/ApiClient.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -18472,7 +17243,7 @@ public class ApiClient {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/1.0.0/java");
+        setUserAgent("OpenAPI-Generator/0.0.0/java");
 
         authentications = new HashMap<String, Authentication>();
     }
@@ -19724,10 +18495,10 @@ public class ApiClient {
     /**
      * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
      *
-     * @param mpBuilder MultipartBody.Builder 
+     * @param mpBuilder MultipartBody.Builder
      * @param key The key of the Header element
      * @param file The file to add to the Header
-     */ 
+     */
     private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
         Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\\"" + key + "\\"; filename=\\"" + file.getName() + "\\"");
         MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
@@ -19881,13 +18652,12 @@ public class ApiClient {
 ",
   "src/main/java/test/test/runtime/ApiException.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -19903,12 +18673,11 @@ import javax.ws.rs.core.GenericType;
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
- 
+
     /**
      * <p>Constructor for ApiException.</p>
      */
@@ -20048,13 +18817,12 @@ public class ApiException extends Exception {
 ",
   "src/main/java/test/test/runtime/ApiResponse.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -20107,7 +18875,7 @@ public class ApiResponse<T> {
     /**
      * <p>Get the <code>headers</code>.</p>
      *
-     * @return a {@link java.util.Map} of headers 
+     * @return a {@link java.util.Map} of headers
      */
     public Map<String, List<String>> getHeaders() {
         return headers;
@@ -20125,20 +18893,18 @@ public class ApiResponse<T> {
 ",
   "src/main/java/test/test/runtime/Configuration.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
@@ -20165,13 +18931,12 @@ public class Configuration {
 ",
   "src/main/java/test/test/runtime/GzipRequestInterceptor.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -20251,13 +19016,12 @@ class GzipRequestInterceptor implements Interceptor {
 ",
   "src/main/java/test/test/runtime/JSON.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -20662,20 +19426,18 @@ public class JSON {
 ",
   "src/main/java/test/test/runtime/Pair.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
@@ -20720,13 +19482,12 @@ public class Pair {
 ",
   "src/main/java/test/test/runtime/ProgressRequestBody.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -20794,13 +19555,12 @@ public class ProgressRequestBody extends RequestBody {
 ",
   "src/main/java/test/test/runtime/ProgressResponseBody.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -20948,13 +19708,12 @@ public class ServerVariable {
 ",
   "src/main/java/test/test/runtime/StringUtil.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -20964,7 +19723,6 @@ package test.test.runtime;
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -21032,13 +19790,12 @@ public class StringUtil {
 ",
   "src/main/java/test/test/runtime/api/DefaultApi.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -21059,6 +19816,8 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 
+import java.math.BigDecimal;
+import java.io.File;
 import test.test.runtime.model.DataTypes200Response;
 
 import java.lang.reflect.Type;
@@ -21149,19 +19908,20 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call dataTypesValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return dataTypesCall(_callback);
 
     }
 
-
     private ApiResponse<DataTypes200Response> dataTypesWithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = dataTypesValidateBeforeCall(null);
         Type localVarReturnType = new TypeToken<DataTypes200Response>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call dataTypesAsync(final ApiCallback<DataTypes200Response> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = dataTypesValidateBeforeCall(_callback);
@@ -21245,10 +20005,12 @@ public class DefaultApi {
         <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIdataTypesRequest dataTypes() {
         return new APIdataTypesRequest();
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/handlers/ApiResponse.java": "
 package test.test.runtime.api.handlers;
@@ -21398,11 +20160,8 @@ import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-import test.test.runtime.model.DataTypes200Response;
-
 import test.test.runtime.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Handlers {
 
     static {
@@ -22394,8 +21153,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the DataTypes operation
  */
@@ -22774,13 +21536,10 @@ public class TracingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.DataTypes200Response;
-
 import java.util.HashMap;
 import java.util.Map;
 
 // Generic type for object "keyed" by operation names
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @lombok.Builder @lombok.Getter
 public class OperationConfig<T> {
     private T dataTypes;
@@ -22796,8 +21555,6 @@ public class OperationConfig<T> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.DataTypes200Response;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
@@ -22805,7 +21562,6 @@ import java.util.Arrays;
 
 
 // Look up path and http method for a given operation name
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OperationLookup {
     @lombok.Builder @lombok.Getter
     public static class OperationLookupEntry {
@@ -22832,7 +21588,6 @@ public class OperationLookup {
 ",
   "src/main/java/test/test/runtime/api/operation_config/Operations.java": "package test.test.runtime.api.operation_config;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Operations {
     /**
      * Returns an OperationConfig Builder with all values populated with the given value.
@@ -22848,13 +21603,12 @@ public class Operations {
 ",
   "src/main/java/test/test/runtime/auth/ApiKeyAuth.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -22868,7 +21622,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -22929,13 +21682,12 @@ public class ApiKeyAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/Authentication.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -22966,13 +21718,12 @@ public interface Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBasicAuth.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -23024,13 +21775,12 @@ public class HttpBasicAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBearerAuth.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -23044,7 +21794,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
@@ -23088,13 +21837,12 @@ public class HttpBearerAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -23113,7 +21861,6 @@ import javax.ws.rs.core.GenericType;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -23239,13 +21986,12 @@ public abstract class AbstractOpenApiSchema {
 ",
   "src/main/java/test/test/runtime/model/DataTypes200Response.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -23254,45 +22000,57 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.DataTypes200ResponseMyAllOf;
+import test.test.runtime.model.DataTypes200ResponseMyAnyOf;
+import test.test.runtime.model.DataTypes200ResponseMyObject;
+import test.test.runtime.model.DataTypes200ResponseMyOneOf;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
 import java.math.BigDecimal;
 import java.net.URI;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.UUID;
-import org.openapitools.jackson.nullable.JsonNullable;
-import test.test.runtime.model.DataTypes200ResponseMyAllOf;
-import test.test.runtime.model.DataTypes200ResponseMyAnyOf;
-import test.test.runtime.model.DataTypes200ResponseMyObject;
-import test.test.runtime.model.DataTypes200ResponseMyOneOf;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -23300,7 +22058,6 @@ import test.test.runtime.JSON;
  * DataTypes200Response
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DataTypes200Response {
   public static final String SERIALIZED_NAME_MY_INT = "myInt";
   @SerializedName(SERIALIZED_NAME_MY_INT)
@@ -23406,19 +22163,16 @@ public class DataTypes200Response {
   }
 
   public DataTypes200Response myInt(Integer myInt) {
-    
+
     this.myInt = myInt;
     return this;
   }
 
    /**
    * Get myInt
-   * minimum: 3
-   * maximum: 7
    * @return myInt
   **/
   @javax.annotation.Nullable
-
   public Integer getMyInt() {
     return myInt;
   }
@@ -23428,21 +22182,17 @@ public class DataTypes200Response {
     this.myInt = myInt;
   }
 
-
   public DataTypes200Response myExclusiveInt(Integer myExclusiveInt) {
-    
+
     this.myExclusiveInt = myExclusiveInt;
     return this;
   }
 
    /**
    * Get myExclusiveInt
-   * minimum: 3
-   * maximum: 7
    * @return myExclusiveInt
   **/
   @javax.annotation.Nullable
-
   public Integer getMyExclusiveInt() {
     return myExclusiveInt;
   }
@@ -23452,9 +22202,8 @@ public class DataTypes200Response {
     this.myExclusiveInt = myExclusiveInt;
   }
 
-
   public DataTypes200Response myString(String myString) {
-    
+
     this.myString = myString;
     return this;
   }
@@ -23464,7 +22213,6 @@ public class DataTypes200Response {
    * @return myString
   **/
   @javax.annotation.Nullable
-
   public String getMyString() {
     return myString;
   }
@@ -23474,9 +22222,8 @@ public class DataTypes200Response {
     this.myString = myString;
   }
 
-
   public DataTypes200Response myStringLength(String myStringLength) {
-    
+
     this.myStringLength = myStringLength;
     return this;
   }
@@ -23486,7 +22233,6 @@ public class DataTypes200Response {
    * @return myStringLength
   **/
   @javax.annotation.Nullable
-
   public String getMyStringLength() {
     return myStringLength;
   }
@@ -23496,9 +22242,8 @@ public class DataTypes200Response {
     this.myStringLength = myStringLength;
   }
 
-
   public DataTypes200Response myLongMinStringLength(String myLongMinStringLength) {
-    
+
     this.myLongMinStringLength = myLongMinStringLength;
     return this;
   }
@@ -23508,7 +22253,6 @@ public class DataTypes200Response {
    * @return myLongMinStringLength
   **/
   @javax.annotation.Nullable
-
   public String getMyLongMinStringLength() {
     return myLongMinStringLength;
   }
@@ -23518,9 +22262,8 @@ public class DataTypes200Response {
     this.myLongMinStringLength = myLongMinStringLength;
   }
 
-
   public DataTypes200Response myBool(Boolean myBool) {
-    
+
     this.myBool = myBool;
     return this;
   }
@@ -23530,7 +22273,6 @@ public class DataTypes200Response {
    * @return myBool
   **/
   @javax.annotation.Nullable
-
   public Boolean getMyBool() {
     return myBool;
   }
@@ -23540,9 +22282,8 @@ public class DataTypes200Response {
     this.myBool = myBool;
   }
 
-
   public DataTypes200Response myNumber(BigDecimal myNumber) {
-    
+
     this.myNumber = myNumber;
     return this;
   }
@@ -23552,7 +22293,6 @@ public class DataTypes200Response {
    * @return myNumber
   **/
   @javax.annotation.Nullable
-
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -23562,9 +22302,8 @@ public class DataTypes200Response {
     this.myNumber = myNumber;
   }
 
-
   public DataTypes200Response myDateArray(List<LocalDate> myDateArray) {
-    
+
     this.myDateArray = myDateArray;
     return this;
   }
@@ -23582,7 +22321,6 @@ public class DataTypes200Response {
    * @return myDateArray
   **/
   @javax.annotation.Nullable
-
   public List<LocalDate> getMyDateArray() {
     return myDateArray;
   }
@@ -23592,9 +22330,8 @@ public class DataTypes200Response {
     this.myDateArray = myDateArray;
   }
 
-
   public DataTypes200Response myEmail(String myEmail) {
-    
+
     this.myEmail = myEmail;
     return this;
   }
@@ -23604,7 +22341,6 @@ public class DataTypes200Response {
    * @return myEmail
   **/
   @javax.annotation.Nullable
-
   public String getMyEmail() {
     return myEmail;
   }
@@ -23614,9 +22350,8 @@ public class DataTypes200Response {
     this.myEmail = myEmail;
   }
 
-
   public DataTypes200Response myUrl(URI myUrl) {
-    
+
     this.myUrl = myUrl;
     return this;
   }
@@ -23626,7 +22361,6 @@ public class DataTypes200Response {
    * @return myUrl
   **/
   @javax.annotation.Nullable
-
   public URI getMyUrl() {
     return myUrl;
   }
@@ -23636,9 +22370,8 @@ public class DataTypes200Response {
     this.myUrl = myUrl;
   }
 
-
   public DataTypes200Response myHostname(String myHostname) {
-    
+
     this.myHostname = myHostname;
     return this;
   }
@@ -23648,7 +22381,6 @@ public class DataTypes200Response {
    * @return myHostname
   **/
   @javax.annotation.Nullable
-
   public String getMyHostname() {
     return myHostname;
   }
@@ -23658,9 +22390,8 @@ public class DataTypes200Response {
     this.myHostname = myHostname;
   }
 
-
   public DataTypes200Response myIpv4(String myIpv4) {
-    
+
     this.myIpv4 = myIpv4;
     return this;
   }
@@ -23670,7 +22401,6 @@ public class DataTypes200Response {
    * @return myIpv4
   **/
   @javax.annotation.Nullable
-
   public String getMyIpv4() {
     return myIpv4;
   }
@@ -23680,9 +22410,8 @@ public class DataTypes200Response {
     this.myIpv4 = myIpv4;
   }
 
-
   public DataTypes200Response myIpv6(String myIpv6) {
-    
+
     this.myIpv6 = myIpv6;
     return this;
   }
@@ -23692,7 +22421,6 @@ public class DataTypes200Response {
    * @return myIpv6
   **/
   @javax.annotation.Nullable
-
   public String getMyIpv6() {
     return myIpv6;
   }
@@ -23702,9 +22430,8 @@ public class DataTypes200Response {
     this.myIpv6 = myIpv6;
   }
 
-
   public DataTypes200Response myUuid(UUID myUuid) {
-    
+
     this.myUuid = myUuid;
     return this;
   }
@@ -23714,7 +22441,6 @@ public class DataTypes200Response {
    * @return myUuid
   **/
   @javax.annotation.Nullable
-
   public UUID getMyUuid() {
     return myUuid;
   }
@@ -23724,9 +22450,8 @@ public class DataTypes200Response {
     this.myUuid = myUuid;
   }
 
-
   public DataTypes200Response myByte(byte[] myByte) {
-    
+
     this.myByte = myByte;
     return this;
   }
@@ -23736,7 +22461,6 @@ public class DataTypes200Response {
    * @return myByte
   **/
   @javax.annotation.Nullable
-
   public byte[] getMyByte() {
     return myByte;
   }
@@ -23746,9 +22470,8 @@ public class DataTypes200Response {
     this.myByte = myByte;
   }
 
-
   public DataTypes200Response myConstrainedByte(byte[] myConstrainedByte) {
-    
+
     this.myConstrainedByte = myConstrainedByte;
     return this;
   }
@@ -23758,7 +22481,6 @@ public class DataTypes200Response {
    * @return myConstrainedByte
   **/
   @javax.annotation.Nullable
-
   public byte[] getMyConstrainedByte() {
     return myConstrainedByte;
   }
@@ -23768,9 +22490,8 @@ public class DataTypes200Response {
     this.myConstrainedByte = myConstrainedByte;
   }
 
-
   public DataTypes200Response myDateTime(OffsetDateTime myDateTime) {
-    
+
     this.myDateTime = myDateTime;
     return this;
   }
@@ -23780,7 +22501,6 @@ public class DataTypes200Response {
    * @return myDateTime
   **/
   @javax.annotation.Nullable
-
   public OffsetDateTime getMyDateTime() {
     return myDateTime;
   }
@@ -23790,9 +22510,8 @@ public class DataTypes200Response {
     this.myDateTime = myDateTime;
   }
 
-
   public DataTypes200Response myRegexPattern(String myRegexPattern) {
-    
+
     this.myRegexPattern = myRegexPattern;
     return this;
   }
@@ -23802,7 +22521,6 @@ public class DataTypes200Response {
    * @return myRegexPattern
   **/
   @javax.annotation.Nullable
-
   public String getMyRegexPattern() {
     return myRegexPattern;
   }
@@ -23812,9 +22530,8 @@ public class DataTypes200Response {
     this.myRegexPattern = myRegexPattern;
   }
 
-
   public DataTypes200Response myOneOf(DataTypes200ResponseMyOneOf myOneOf) {
-    
+
     this.myOneOf = myOneOf;
     return this;
   }
@@ -23824,7 +22541,6 @@ public class DataTypes200Response {
    * @return myOneOf
   **/
   @javax.annotation.Nullable
-
   public DataTypes200ResponseMyOneOf getMyOneOf() {
     return myOneOf;
   }
@@ -23834,9 +22550,8 @@ public class DataTypes200Response {
     this.myOneOf = myOneOf;
   }
 
-
   public DataTypes200Response myAnyOf(DataTypes200ResponseMyAnyOf myAnyOf) {
-    
+
     this.myAnyOf = myAnyOf;
     return this;
   }
@@ -23846,7 +22561,6 @@ public class DataTypes200Response {
    * @return myAnyOf
   **/
   @javax.annotation.Nullable
-
   public DataTypes200ResponseMyAnyOf getMyAnyOf() {
     return myAnyOf;
   }
@@ -23856,9 +22570,8 @@ public class DataTypes200Response {
     this.myAnyOf = myAnyOf;
   }
 
-
   public DataTypes200Response myAllOf(DataTypes200ResponseMyAllOf myAllOf) {
-    
+
     this.myAllOf = myAllOf;
     return this;
   }
@@ -23868,7 +22581,6 @@ public class DataTypes200Response {
    * @return myAllOf
   **/
   @javax.annotation.Nullable
-
   public DataTypes200ResponseMyAllOf getMyAllOf() {
     return myAllOf;
   }
@@ -23878,9 +22590,8 @@ public class DataTypes200Response {
     this.myAllOf = myAllOf;
   }
 
-
   public DataTypes200Response myNot(Object myNot) {
-    
+
     this.myNot = myNot;
     return this;
   }
@@ -23890,7 +22601,6 @@ public class DataTypes200Response {
    * @return myNot
   **/
   @javax.annotation.Nullable
-
   public Object getMyNot() {
     return myNot;
   }
@@ -23900,9 +22610,8 @@ public class DataTypes200Response {
     this.myNot = myNot;
   }
 
-
   public DataTypes200Response myNotString(Object myNotString) {
-    
+
     this.myNotString = myNotString;
     return this;
   }
@@ -23912,7 +22621,6 @@ public class DataTypes200Response {
    * @return myNotString
   **/
   @javax.annotation.Nullable
-
   public Object getMyNotString() {
     return myNotString;
   }
@@ -23922,9 +22630,8 @@ public class DataTypes200Response {
     this.myNotString = myNotString;
   }
 
-
   public DataTypes200Response myAdditionalProperties(Map<String, List<Integer>> myAdditionalProperties) {
-    
+
     this.myAdditionalProperties = myAdditionalProperties;
     return this;
   }
@@ -23942,7 +22649,6 @@ public class DataTypes200Response {
    * @return myAdditionalProperties
   **/
   @javax.annotation.Nullable
-
   public Map<String, List<Integer>> getMyAdditionalProperties() {
     return myAdditionalProperties;
   }
@@ -23952,9 +22658,8 @@ public class DataTypes200Response {
     this.myAdditionalProperties = myAdditionalProperties;
   }
 
-
   public DataTypes200Response myObject(DataTypes200ResponseMyObject myObject) {
-    
+
     this.myObject = myObject;
     return this;
   }
@@ -23964,7 +22669,6 @@ public class DataTypes200Response {
    * @return myObject
   **/
   @javax.annotation.Nullable
-
   public DataTypes200ResponseMyObject getMyObject() {
     return myObject;
   }
@@ -23975,7 +22679,6 @@ public class DataTypes200Response {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -23999,8 +22702,8 @@ public class DataTypes200Response {
         Objects.equals(this.myIpv4, dataTypes200Response.myIpv4) &&
         Objects.equals(this.myIpv6, dataTypes200Response.myIpv6) &&
         Objects.equals(this.myUuid, dataTypes200Response.myUuid) &&
-        Arrays.equals(this.myByte, dataTypes200Response.myByte) &&
-        Arrays.equals(this.myConstrainedByte, dataTypes200Response.myConstrainedByte) &&
+        Objects.equals(this.myByte, dataTypes200Response.myByte) &&
+        Objects.equals(this.myConstrainedByte, dataTypes200Response.myConstrainedByte) &&
         Objects.equals(this.myDateTime, dataTypes200Response.myDateTime) &&
         Objects.equals(this.myRegexPattern, dataTypes200Response.myRegexPattern) &&
         Objects.equals(this.myOneOf, dataTypes200Response.myOneOf) &&
@@ -24010,22 +22713,12 @@ public class DataTypes200Response {
         Objects.equals(this.myNotString, dataTypes200Response.myNotString) &&
         Objects.equals(this.myAdditionalProperties, dataTypes200Response.myAdditionalProperties) &&
         Objects.equals(this.myObject, dataTypes200Response.myObject);
-  }
-
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
+        
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(myInt, myExclusiveInt, myString, myStringLength, myLongMinStringLength, myBool, myNumber, myDateArray, myEmail, myUrl, myHostname, myIpv4, myIpv6, myUuid, Arrays.hashCode(myByte), Arrays.hashCode(myConstrainedByte), myDateTime, myRegexPattern, myOneOf, myAnyOf, myAllOf, myNot, myNotString, myAdditionalProperties, myObject);
-  }
-
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
+    return Objects.hash(myInt, myExclusiveInt, myString, myStringLength, myLongMinStringLength, myBool, myNumber, myDateArray, myEmail, myUrl, myHostname, myIpv4, myIpv6, myUuid, myByte, myConstrainedByte, myDateTime, myRegexPattern, myOneOf, myAnyOf, myAllOf, myNot, myNotString, myAdditionalProperties, myObject);
   }
 
   @Override
@@ -24142,6 +22835,9 @@ public class DataTypes200Response {
       if (jsonObj.get("myDateArray") != null && !jsonObj.get("myDateArray").isJsonArray()) {
         throw new IllegalArgumentException(String.format("Expected the field \`myDateArray\` to be an array in the JSON string but got \`%s\`", jsonObj.get("myDateArray").toString()));
       }
+      if ((jsonObj.get("myDateArray") != null && !jsonObj.get("myDateArray").isJsonNull()) && !jsonObj.get("myDateArray").isJsonPrimitive()) {
+        throw new IllegalArgumentException(String.format("Expected the field \`myDateArray\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("myDateArray").toString()));
+      }
       if ((jsonObj.get("myEmail") != null && !jsonObj.get("myEmail").isJsonNull()) && !jsonObj.get("myEmail").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format("Expected the field \`myEmail\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("myEmail").toString()));
       }
@@ -24160,6 +22856,15 @@ public class DataTypes200Response {
       if ((jsonObj.get("myUuid") != null && !jsonObj.get("myUuid").isJsonNull()) && !jsonObj.get("myUuid").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format("Expected the field \`myUuid\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("myUuid").toString()));
       }
+      if ((jsonObj.get("myByte") != null && !jsonObj.get("myByte").isJsonNull()) && !jsonObj.get("myByte").isJsonPrimitive()) {
+        throw new IllegalArgumentException(String.format("Expected the field \`myByte\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("myByte").toString()));
+      }
+      if ((jsonObj.get("myConstrainedByte") != null && !jsonObj.get("myConstrainedByte").isJsonNull()) && !jsonObj.get("myConstrainedByte").isJsonPrimitive()) {
+        throw new IllegalArgumentException(String.format("Expected the field \`myConstrainedByte\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("myConstrainedByte").toString()));
+      }
+      if ((jsonObj.get("myDateTime") != null && !jsonObj.get("myDateTime").isJsonNull()) && !jsonObj.get("myDateTime").isJsonPrimitive()) {
+        throw new IllegalArgumentException(String.format("Expected the field \`myDateTime\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("myDateTime").toString()));
+      }
       if ((jsonObj.get("myRegexPattern") != null && !jsonObj.get("myRegexPattern").isJsonNull()) && !jsonObj.get("myRegexPattern").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format("Expected the field \`myRegexPattern\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("myRegexPattern").toString()));
       }
@@ -24230,17 +22935,15 @@ public class DataTypes200Response {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/DataTypes200ResponseMyAllOf.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -24256,24 +22959,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -24281,7 +23006,6 @@ import test.test.runtime.JSON;
  * DataTypes200ResponseMyAllOf
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DataTypes200ResponseMyAllOf {
   public static final String SERIALIZED_NAME_FIRST = "first";
   @SerializedName(SERIALIZED_NAME_FIRST)
@@ -24295,7 +23019,7 @@ public class DataTypes200ResponseMyAllOf {
   }
 
   public DataTypes200ResponseMyAllOf first(String first) {
-    
+
     this.first = first;
     return this;
   }
@@ -24305,7 +23029,6 @@ public class DataTypes200ResponseMyAllOf {
    * @return first
   **/
   @javax.annotation.Nullable
-
   public String getFirst() {
     return first;
   }
@@ -24315,9 +23038,8 @@ public class DataTypes200ResponseMyAllOf {
     this.first = first;
   }
 
-
   public DataTypes200ResponseMyAllOf second(String second) {
-    
+
     this.second = second;
     return this;
   }
@@ -24327,7 +23049,6 @@ public class DataTypes200ResponseMyAllOf {
    * @return second
   **/
   @javax.annotation.Nullable
-
   public String getSecond() {
     return second;
   }
@@ -24338,7 +23059,6 @@ public class DataTypes200ResponseMyAllOf {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -24350,6 +23070,7 @@ public class DataTypes200ResponseMyAllOf {
     DataTypes200ResponseMyAllOf dataTypes200ResponseMyAllOf = (DataTypes200ResponseMyAllOf) o;
     return Objects.equals(this.first, dataTypes200ResponseMyAllOf.first) &&
         Objects.equals(this.second, dataTypes200ResponseMyAllOf.second);
+        
   }
 
   @Override
@@ -24469,224 +23190,15 @@ public class DataTypes200ResponseMyAllOf {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
-  "src/main/java/test/test/runtime/model/DataTypes200ResponseMyAllOfAllOf.java": "/*
+  "src/main/java/test/test/runtime/model/DataTypes200ResponseMyAnyOf.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package test.test.runtime.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import test.test.runtime.JSON;
-
-/**
- * DataTypes200ResponseMyAllOfAllOf
- */
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class DataTypes200ResponseMyAllOfAllOf {
-  public static final String SERIALIZED_NAME_FIRST = "first";
-  @SerializedName(SERIALIZED_NAME_FIRST)
-  private String first;
-
-  public DataTypes200ResponseMyAllOfAllOf() {
-  }
-
-  public DataTypes200ResponseMyAllOfAllOf first(String first) {
-    
-    this.first = first;
-    return this;
-  }
-
-   /**
-   * Get first
-   * @return first
-  **/
-  @javax.annotation.Nullable
-
-  public String getFirst() {
-    return first;
-  }
-
-
-  public void setFirst(String first) {
-    this.first = first;
-  }
-
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    DataTypes200ResponseMyAllOfAllOf dataTypes200ResponseMyAllOfAllOf = (DataTypes200ResponseMyAllOfAllOf) o;
-    return Objects.equals(this.first, dataTypes200ResponseMyAllOfAllOf.first);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(first);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class DataTypes200ResponseMyAllOfAllOf {\\n");
-    sb.append("    first: ").append(toIndentedString(first)).append("\\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\\n", "\\n    ");
-  }
-
-
-  public static HashSet<String> openapiFields;
-  public static HashSet<String> openapiRequiredFields;
-
-  static {
-    // a set of all properties/fields (JSON key names)
-    openapiFields = new HashSet<String>();
-    openapiFields.add("first");
-
-    // a set of required properties/fields (JSON key names)
-    openapiRequiredFields = new HashSet<String>();
-  }
-
- /**
-  * Validates the JSON Object and throws an exception if issues found
-  *
-  * @param jsonObj JSON Object
-  * @throws IOException if the JSON Object is invalid with respect to DataTypes200ResponseMyAllOfAllOf
-  */
-  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
-      if (jsonObj == null) {
-        if (!DataTypes200ResponseMyAllOfAllOf.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
-          throw new IllegalArgumentException(String.format("The required field(s) %s in DataTypes200ResponseMyAllOfAllOf is not found in the empty JSON string", DataTypes200ResponseMyAllOfAllOf.openapiRequiredFields.toString()));
-        }
-      }
-
-      Set<Entry<String, JsonElement>> entries = jsonObj.entrySet();
-      // check to see if the JSON string contains additional fields
-      for (Entry<String, JsonElement> entry : entries) {
-        if (!DataTypes200ResponseMyAllOfAllOf.openapiFields.contains(entry.getKey())) {
-          throw new IllegalArgumentException(String.format("The field \`%s\` in the JSON string is not defined in the \`DataTypes200ResponseMyAllOfAllOf\` properties. JSON: %s", entry.getKey(), jsonObj.toString()));
-        }
-      }
-      if ((jsonObj.get("first") != null && !jsonObj.get("first").isJsonNull()) && !jsonObj.get("first").isJsonPrimitive()) {
-        throw new IllegalArgumentException(String.format("Expected the field \`first\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("first").toString()));
-      }
-  }
-
-  public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
-       if (!DataTypes200ResponseMyAllOfAllOf.class.isAssignableFrom(type.getRawType())) {
-         return null; // this class only serializes 'DataTypes200ResponseMyAllOfAllOf' and its subtypes
-       }
-       final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-       final TypeAdapter<DataTypes200ResponseMyAllOfAllOf> thisAdapter
-                        = gson.getDelegateAdapter(this, TypeToken.get(DataTypes200ResponseMyAllOfAllOf.class));
-
-       return (TypeAdapter<T>) new TypeAdapter<DataTypes200ResponseMyAllOfAllOf>() {
-           @Override
-           public void write(JsonWriter out, DataTypes200ResponseMyAllOfAllOf value) throws IOException {
-             JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
-             elementAdapter.write(out, obj);
-           }
-
-           @Override
-           public DataTypes200ResponseMyAllOfAllOf read(JsonReader in) throws IOException {
-             JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
-             validateJsonObject(jsonObj);
-             return thisAdapter.fromJsonTree(jsonObj);
-           }
-
-       }.nullSafe();
-    }
-  }
-
- /**
-  * Create an instance of DataTypes200ResponseMyAllOfAllOf given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of DataTypes200ResponseMyAllOfAllOf
-  * @throws IOException if the JSON string is invalid with respect to DataTypes200ResponseMyAllOfAllOf
-  */
-  public static DataTypes200ResponseMyAllOfAllOf fromJson(String jsonString) throws IOException {
-    return JSON.getGson().fromJson(jsonString, DataTypes200ResponseMyAllOfAllOf.class);
-  }
-
- /**
-  * Convert an instance of DataTypes200ResponseMyAllOfAllOf to an JSON string
-  *
-  * @return JSON string
-  */
-  public String toJson() {
-    return JSON.getGson().toJson(this);
-  }
-}
-
-",
-  "src/main/java/test/test/runtime/model/DataTypes200ResponseMyAllOfAllOf1.java": "/*
- * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -24702,211 +23214,15 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import test.test.runtime.JSON;
-
-/**
- * DataTypes200ResponseMyAllOfAllOf1
- */
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class DataTypes200ResponseMyAllOfAllOf1 {
-  public static final String SERIALIZED_NAME_SECOND = "second";
-  @SerializedName(SERIALIZED_NAME_SECOND)
-  private String second;
-
-  public DataTypes200ResponseMyAllOfAllOf1() {
-  }
-
-  public DataTypes200ResponseMyAllOfAllOf1 second(String second) {
-    
-    this.second = second;
-    return this;
-  }
-
-   /**
-   * Get second
-   * @return second
-  **/
-  @javax.annotation.Nullable
-
-  public String getSecond() {
-    return second;
-  }
-
-
-  public void setSecond(String second) {
-    this.second = second;
-  }
-
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    DataTypes200ResponseMyAllOfAllOf1 dataTypes200ResponseMyAllOfAllOf1 = (DataTypes200ResponseMyAllOfAllOf1) o;
-    return Objects.equals(this.second, dataTypes200ResponseMyAllOfAllOf1.second);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(second);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class DataTypes200ResponseMyAllOfAllOf1 {\\n");
-    sb.append("    second: ").append(toIndentedString(second)).append("\\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\\n", "\\n    ");
-  }
-
-
-  public static HashSet<String> openapiFields;
-  public static HashSet<String> openapiRequiredFields;
-
-  static {
-    // a set of all properties/fields (JSON key names)
-    openapiFields = new HashSet<String>();
-    openapiFields.add("second");
-
-    // a set of required properties/fields (JSON key names)
-    openapiRequiredFields = new HashSet<String>();
-  }
-
- /**
-  * Validates the JSON Object and throws an exception if issues found
-  *
-  * @param jsonObj JSON Object
-  * @throws IOException if the JSON Object is invalid with respect to DataTypes200ResponseMyAllOfAllOf1
-  */
-  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
-      if (jsonObj == null) {
-        if (!DataTypes200ResponseMyAllOfAllOf1.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null
-          throw new IllegalArgumentException(String.format("The required field(s) %s in DataTypes200ResponseMyAllOfAllOf1 is not found in the empty JSON string", DataTypes200ResponseMyAllOfAllOf1.openapiRequiredFields.toString()));
-        }
-      }
-
-      Set<Entry<String, JsonElement>> entries = jsonObj.entrySet();
-      // check to see if the JSON string contains additional fields
-      for (Entry<String, JsonElement> entry : entries) {
-        if (!DataTypes200ResponseMyAllOfAllOf1.openapiFields.contains(entry.getKey())) {
-          throw new IllegalArgumentException(String.format("The field \`%s\` in the JSON string is not defined in the \`DataTypes200ResponseMyAllOfAllOf1\` properties. JSON: %s", entry.getKey(), jsonObj.toString()));
-        }
-      }
-      if ((jsonObj.get("second") != null && !jsonObj.get("second").isJsonNull()) && !jsonObj.get("second").isJsonPrimitive()) {
-        throw new IllegalArgumentException(String.format("Expected the field \`second\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("second").toString()));
-      }
-  }
-
-  public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
-       if (!DataTypes200ResponseMyAllOfAllOf1.class.isAssignableFrom(type.getRawType())) {
-         return null; // this class only serializes 'DataTypes200ResponseMyAllOfAllOf1' and its subtypes
-       }
-       final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-       final TypeAdapter<DataTypes200ResponseMyAllOfAllOf1> thisAdapter
-                        = gson.getDelegateAdapter(this, TypeToken.get(DataTypes200ResponseMyAllOfAllOf1.class));
-
-       return (TypeAdapter<T>) new TypeAdapter<DataTypes200ResponseMyAllOfAllOf1>() {
-           @Override
-           public void write(JsonWriter out, DataTypes200ResponseMyAllOfAllOf1 value) throws IOException {
-             JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
-             elementAdapter.write(out, obj);
-           }
-
-           @Override
-           public DataTypes200ResponseMyAllOfAllOf1 read(JsonReader in) throws IOException {
-             JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
-             validateJsonObject(jsonObj);
-             return thisAdapter.fromJsonTree(jsonObj);
-           }
-
-       }.nullSafe();
-    }
-  }
-
- /**
-  * Create an instance of DataTypes200ResponseMyAllOfAllOf1 given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of DataTypes200ResponseMyAllOfAllOf1
-  * @throws IOException if the JSON string is invalid with respect to DataTypes200ResponseMyAllOfAllOf1
-  */
-  public static DataTypes200ResponseMyAllOfAllOf1 fromJson(String jsonString) throws IOException {
-    return JSON.getGson().fromJson(jsonString, DataTypes200ResponseMyAllOfAllOf1.class);
-  }
-
- /**
-  * Convert an instance of DataTypes200ResponseMyAllOfAllOf1 to an JSON string
-  *
-  * @return JSON string
-  */
-  public String toJson() {
-    return JSON.getGson().toJson(this);
-  }
-}
-
-",
-  "src/main/java/test/test/runtime/model/DataTypes200ResponseMyAnyOf.java": "/*
- * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package test.test.runtime.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import java.math.BigDecimal;
-
 import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -24915,9 +23231,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -24937,8 +23257,7 @@ import com.google.gson.JsonParseException;
 
 import test.test.runtime.JSON;
 
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@lombok.experimental.SuperBuilder
 public class DataTypes200ResponseMyAnyOf extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(DataTypes200ResponseMyAnyOf.class.getName());
 
@@ -24950,8 +23269,8 @@ public class DataTypes200ResponseMyAnyOf extends AbstractOpenApiSchema {
                 return null; // this class only serializes 'DataTypes200ResponseMyAnyOf' and its subtypes
             }
             final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-            final TypeAdapter<BigDecimal> adapterBigDecimal = gson.getDelegateAdapter(this, TypeToken.get(BigDecimal.class));
             final TypeAdapter<String> adapterString = gson.getDelegateAdapter(this, TypeToken.get(String.class));
+            final TypeAdapter<BigDecimal> adapterBigDecimal = gson.getDelegateAdapter(this, TypeToken.get(BigDecimal.class));
 
             return (TypeAdapter<T>) new TypeAdapter<DataTypes200ResponseMyAnyOf>() {
                 @Override
@@ -24961,21 +23280,21 @@ public class DataTypes200ResponseMyAnyOf extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    // check if the actual instance is of the type \`BigDecimal\`
-                    if (value.getActualInstance() instanceof BigDecimal) {
-                        JsonObject obj = adapterBigDecimal.toJsonTree((BigDecimal)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`String\`
+                    if (value.getActualInstance() instanceof String) {
+                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    // check if the actual instance is of the type \`String\`
-                    if (value.getActualInstance() instanceof String) {
-                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`BigDecimal\`
+                    if (value.getActualInstance() instanceof BigDecimal) {
+                        JsonObject obj = adapterBigDecimal.toJsonTree((BigDecimal)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    throw new IOException("Failed to serialize as the type doesn't match anyOf schemas: BigDecimal, String");
+                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: String, BigDecimal");
                 }
 
                 @Override
@@ -24983,30 +23302,31 @@ public class DataTypes200ResponseMyAnyOf extends AbstractOpenApiSchema {
                     Object deserialized = null;
                     JsonObject jsonObject = elementAdapter.read(in).getAsJsonObject();
 
-                    // deserialize BigDecimal
+
+                    // deserialize String
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        BigDecimal.validateJsonObject(jsonObject);
-                        log.log(Level.FINER, "Input data matches schema 'BigDecimal'");
+                        String.validateJsonObject(jsonObject);
+                        log.log(Level.FINER, "Input data matches schema 'String'");
                         DataTypes200ResponseMyAnyOf ret = new DataTypes200ResponseMyAnyOf();
-                        ret.setActualInstance(adapterBigDecimal.fromJsonTree(jsonObject));
+                        ret.setActualInstance(adapterString.fromJsonTree(jsonObject));
                         return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        log.log(Level.FINER, "Input data does not match schema 'BigDecimal'", e);
+                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
                     }
 
-                    // deserialize String
+                    // deserialize BigDecimal
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        String.validateJsonObject(jsonObject);
-                        log.log(Level.FINER, "Input data matches schema 'String'");
+                        BigDecimal.validateJsonObject(jsonObject);
+                        log.log(Level.FINER, "Input data matches schema 'BigDecimal'");
                         DataTypes200ResponseMyAnyOf ret = new DataTypes200ResponseMyAnyOf();
-                        ret.setActualInstance(adapterString.fromJsonTree(jsonObject));
+                        ret.setActualInstance(adapterBigDecimal.fromJsonTree(jsonObject));
                         return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
+                        log.log(Level.FINER, "Input data does not match schema 'BigDecimal'", e);
                     }
 
 
@@ -25023,21 +23343,21 @@ public class DataTypes200ResponseMyAnyOf extends AbstractOpenApiSchema {
         super("anyOf", Boolean.FALSE);
     }
 
-    public DataTypes200ResponseMyAnyOf(BigDecimal o) {
+    public DataTypes200ResponseMyAnyOf(String o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
-    public DataTypes200ResponseMyAnyOf(String o) {
+    public DataTypes200ResponseMyAnyOf(BigDecimal o) {
         super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
     static {
-        schemas.put("BigDecimal", new GenericType<BigDecimal>() {
-        });
         schemas.put("String", new GenericType<String>() {
         });
+        schemas.put("BigDecimal", new GenericType<BigDecimal>() {
+        });
     }
 
     @Override
@@ -25048,31 +23368,31 @@ public class DataTypes200ResponseMyAnyOf extends AbstractOpenApiSchema {
     /**
      * Set the instance that matches the anyOf child schema, check
      * the instance parameter is valid against the anyOf child schemas:
-     * BigDecimal, String
+     * String, BigDecimal
      *
      * It could be an instance of the 'anyOf' schemas.
-     * The anyOf child schemas may themselves be a composed schema (allOf, anyOf, anyOf).
+     * The anyOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
      */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof BigDecimal) {
+        if (instance instanceof String) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof String) {
+        if (instance instanceof BigDecimal) {
             super.setActualInstance(instance);
             return;
         }
 
-        throw new RuntimeException("Invalid instance type. Must be BigDecimal, String");
+        throw new RuntimeException("Invalid instance type. Must be String, BigDecimal");
     }
 
     /**
      * Get the actual instance, which can be the following:
-     * BigDecimal, String
+     * String, BigDecimal
      *
-     * @return The actual instance (BigDecimal, String)
+     * @return The actual instance (String, BigDecimal)
      */
     @Override
     public Object getActualInstance() {
@@ -25080,25 +23400,25 @@ public class DataTypes200ResponseMyAnyOf extends AbstractOpenApiSchema {
     }
 
     /**
-     * Get the actual instance of \`BigDecimal\`. If the actual instance is not \`BigDecimal\`,
+     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`BigDecimal\`
-     * @throws ClassCastException if the instance is not \`BigDecimal\`
+     * @return The actual instance of \`String\`
+     * @throws ClassCastException if the instance is not \`String\`
      */
-    public BigDecimal getBigDecimal() throws ClassCastException {
-        return (BigDecimal)super.getActualInstance();
+    public String getString() throws ClassCastException {
+        return (String)super.getActualInstance();
     }
 
     /**
-     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
+     * Get the actual instance of \`BigDecimal\`. If the actual instance is not \`BigDecimal\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`String\`
-     * @throws ClassCastException if the instance is not \`String\`
+     * @return The actual instance of \`BigDecimal\`
+     * @throws ClassCastException if the instance is not \`BigDecimal\`
      */
-    public String getString() throws ClassCastException {
-        return (String)super.getActualInstance();
+    public BigDecimal getBigDecimal() throws ClassCastException {
+        return (BigDecimal)super.getActualInstance();
     }
 
 
@@ -25111,24 +23431,24 @@ public class DataTypes200ResponseMyAnyOf extends AbstractOpenApiSchema {
   public static void validateJsonObject(JsonObject jsonObj) throws IOException {
     // validate anyOf schemas one by one
     int validCount = 0;
-    // validate the json string with BigDecimal
+    // validate the json string with String
     try {
-      BigDecimal.validateJsonObject(jsonObj);
+      String.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
-    // validate the json string with String
+    // validate the json string with BigDecimal
     try {
-      String.validateJsonObject(jsonObj);
+      BigDecimal.validateJsonObject(jsonObj);
       return; // return earlier as at least one schema is valid with respect to the Json object
       //validCount++;
     } catch (Exception e) {
       // continue to the next one
     }
     if (validCount == 0) {
-      throw new IOException(String.format("The JSON string is invalid for DataTypes200ResponseMyAnyOf with anyOf schemas: BigDecimal, String. JSON: %s", jsonObj.toString()));
+      throw new IOException(String.format("The JSON string is invalid for DataTypes200ResponseMyAnyOf with anyOf schemas: String, BigDecimal. JSON: %s", jsonObj.toString()));
     }
   }
 
@@ -25151,18 +23471,17 @@ public class DataTypes200ResponseMyAnyOf extends AbstractOpenApiSchema {
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
-}
 
+}
 ",
   "src/main/java/test/test/runtime/model/DataTypes200ResponseMyNotNot.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -25178,24 +23497,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -25203,7 +23544,6 @@ import test.test.runtime.JSON;
  * DataTypes200ResponseMyNotNot
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DataTypes200ResponseMyNotNot {
   public static final String SERIALIZED_NAME_FOO = "foo";
   @SerializedName(SERIALIZED_NAME_FOO)
@@ -25213,7 +23553,7 @@ public class DataTypes200ResponseMyNotNot {
   }
 
   public DataTypes200ResponseMyNotNot foo(String foo) {
-    
+
     this.foo = foo;
     return this;
   }
@@ -25223,7 +23563,6 @@ public class DataTypes200ResponseMyNotNot {
    * @return foo
   **/
   @javax.annotation.Nullable
-
   public String getFoo() {
     return foo;
   }
@@ -25234,7 +23573,6 @@ public class DataTypes200ResponseMyNotNot {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -25245,6 +23583,7 @@ public class DataTypes200ResponseMyNotNot {
     }
     DataTypes200ResponseMyNotNot dataTypes200ResponseMyNotNot = (DataTypes200ResponseMyNotNot) o;
     return Objects.equals(this.foo, dataTypes200ResponseMyNotNot.foo);
+        
   }
 
   @Override
@@ -25359,17 +23698,15 @@ public class DataTypes200ResponseMyNotNot {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/DataTypes200ResponseMyObject.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -25378,32 +23715,54 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.DataTypes200ResponseMyObjectOne;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.DataTypes200ResponseMyObjectOne;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -25411,7 +23770,6 @@ import test.test.runtime.JSON;
  * DataTypes200ResponseMyObject
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DataTypes200ResponseMyObject {
   public static final String SERIALIZED_NAME_ONE = "one";
   @SerializedName(SERIALIZED_NAME_ONE)
@@ -25425,7 +23783,7 @@ public class DataTypes200ResponseMyObject {
   }
 
   public DataTypes200ResponseMyObject one(DataTypes200ResponseMyObjectOne one) {
-    
+
     this.one = one;
     return this;
   }
@@ -25435,7 +23793,6 @@ public class DataTypes200ResponseMyObject {
    * @return one
   **/
   @javax.annotation.Nullable
-
   public DataTypes200ResponseMyObjectOne getOne() {
     return one;
   }
@@ -25445,9 +23802,8 @@ public class DataTypes200ResponseMyObject {
     this.one = one;
   }
 
-
   public DataTypes200ResponseMyObject oneString(String oneString) {
-    
+
     this.oneString = oneString;
     return this;
   }
@@ -25457,7 +23813,6 @@ public class DataTypes200ResponseMyObject {
    * @return oneString
   **/
   @javax.annotation.Nullable
-
   public String getOneString() {
     return oneString;
   }
@@ -25468,7 +23823,6 @@ public class DataTypes200ResponseMyObject {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -25480,6 +23834,7 @@ public class DataTypes200ResponseMyObject {
     DataTypes200ResponseMyObject dataTypes200ResponseMyObject = (DataTypes200ResponseMyObject) o;
     return Objects.equals(this.one, dataTypes200ResponseMyObject.one) &&
         Objects.equals(this.oneString, dataTypes200ResponseMyObject.oneString);
+        
   }
 
   @Override
@@ -25600,17 +23955,15 @@ public class DataTypes200ResponseMyObject {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/DataTypes200ResponseMyObjectOne.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -25619,32 +23972,54 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.DataTypes200ResponseMyObjectOneTwo;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import test.test.runtime.model.DataTypes200ResponseMyObjectOneTwo;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -25652,7 +24027,6 @@ import test.test.runtime.JSON;
  * DataTypes200ResponseMyObjectOne
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DataTypes200ResponseMyObjectOne {
   public static final String SERIALIZED_NAME_TWO_STRING = "twoString";
   @SerializedName(SERIALIZED_NAME_TWO_STRING)
@@ -25666,7 +24040,7 @@ public class DataTypes200ResponseMyObjectOne {
   }
 
   public DataTypes200ResponseMyObjectOne twoString(String twoString) {
-    
+
     this.twoString = twoString;
     return this;
   }
@@ -25676,7 +24050,6 @@ public class DataTypes200ResponseMyObjectOne {
    * @return twoString
   **/
   @javax.annotation.Nullable
-
   public String getTwoString() {
     return twoString;
   }
@@ -25686,9 +24059,8 @@ public class DataTypes200ResponseMyObjectOne {
     this.twoString = twoString;
   }
 
-
   public DataTypes200ResponseMyObjectOne two(DataTypes200ResponseMyObjectOneTwo two) {
-    
+
     this.two = two;
     return this;
   }
@@ -25698,7 +24070,6 @@ public class DataTypes200ResponseMyObjectOne {
    * @return two
   **/
   @javax.annotation.Nullable
-
   public DataTypes200ResponseMyObjectOneTwo getTwo() {
     return two;
   }
@@ -25709,7 +24080,6 @@ public class DataTypes200ResponseMyObjectOne {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -25721,6 +24091,7 @@ public class DataTypes200ResponseMyObjectOne {
     DataTypes200ResponseMyObjectOne dataTypes200ResponseMyObjectOne = (DataTypes200ResponseMyObjectOne) o;
     return Objects.equals(this.twoString, dataTypes200ResponseMyObjectOne.twoString) &&
         Objects.equals(this.two, dataTypes200ResponseMyObjectOne.two);
+        
   }
 
   @Override
@@ -25841,17 +24212,15 @@ public class DataTypes200ResponseMyObjectOne {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/DataTypes200ResponseMyObjectOneTwo.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -25867,24 +24236,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -25892,7 +24283,6 @@ import test.test.runtime.JSON;
  * DataTypes200ResponseMyObjectOneTwo
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DataTypes200ResponseMyObjectOneTwo {
   public static final String SERIALIZED_NAME_THREE_STRING = "threeString";
   @SerializedName(SERIALIZED_NAME_THREE_STRING)
@@ -25902,7 +24292,7 @@ public class DataTypes200ResponseMyObjectOneTwo {
   }
 
   public DataTypes200ResponseMyObjectOneTwo threeString(String threeString) {
-    
+
     this.threeString = threeString;
     return this;
   }
@@ -25912,7 +24302,6 @@ public class DataTypes200ResponseMyObjectOneTwo {
    * @return threeString
   **/
   @javax.annotation.Nullable
-
   public String getThreeString() {
     return threeString;
   }
@@ -25923,7 +24312,6 @@ public class DataTypes200ResponseMyObjectOneTwo {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -25934,6 +24322,7 @@ public class DataTypes200ResponseMyObjectOneTwo {
     }
     DataTypes200ResponseMyObjectOneTwo dataTypes200ResponseMyObjectOneTwo = (DataTypes200ResponseMyObjectOneTwo) o;
     return Objects.equals(this.threeString, dataTypes200ResponseMyObjectOneTwo.threeString);
+        
   }
 
   @Override
@@ -26048,17 +24437,15 @@ public class DataTypes200ResponseMyObjectOneTwo {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/DataTypes200ResponseMyOneOf.java": "/*
  * Data Types
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -26067,11 +24454,22 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import java.math.BigDecimal;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -26080,9 +24478,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -26102,8 +24504,7 @@ import com.google.gson.JsonParseException;
 
 import test.test.runtime.JSON;
 
-@lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@lombok.experimental.SuperBuilder
 public class DataTypes200ResponseMyOneOf extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(DataTypes200ResponseMyOneOf.class.getName());
 
@@ -26115,8 +24516,8 @@ public class DataTypes200ResponseMyOneOf extends AbstractOpenApiSchema {
                 return null; // this class only serializes 'DataTypes200ResponseMyOneOf' and its subtypes
             }
             final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-            final TypeAdapter<BigDecimal> adapterBigDecimal = gson.getDelegateAdapter(this, TypeToken.get(BigDecimal.class));
             final TypeAdapter<String> adapterString = gson.getDelegateAdapter(this, TypeToken.get(String.class));
+            final TypeAdapter<BigDecimal> adapterBigDecimal = gson.getDelegateAdapter(this, TypeToken.get(BigDecimal.class));
 
             return (TypeAdapter<T>) new TypeAdapter<DataTypes200ResponseMyOneOf>() {
                 @Override
@@ -26126,21 +24527,21 @@ public class DataTypes200ResponseMyOneOf extends AbstractOpenApiSchema {
                         return;
                     }
 
-                    // check if the actual instance is of the type \`BigDecimal\`
-                    if (value.getActualInstance() instanceof BigDecimal) {
-                        JsonObject obj = adapterBigDecimal.toJsonTree((BigDecimal)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`String\`
+                    if (value.getActualInstance() instanceof String) {
+                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    // check if the actual instance is of the type \`String\`
-                    if (value.getActualInstance() instanceof String) {
-                        JsonObject obj = adapterString.toJsonTree((String)value.getActualInstance()).getAsJsonObject();
+                    // check if the actual instance is of the type \`BigDecimal\`
+                    if (value.getActualInstance() instanceof BigDecimal) {
+                        JsonObject obj = adapterBigDecimal.toJsonTree((BigDecimal)value.getActualInstance()).getAsJsonObject();
                         elementAdapter.write(out, obj);
                         return;
                     }
 
-                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: BigDecimal, String");
+                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: String, BigDecimal");
                 }
 
                 @Override
@@ -26152,30 +24553,30 @@ public class DataTypes200ResponseMyOneOf extends AbstractOpenApiSchema {
                     ArrayList<String> errorMessages = new ArrayList<>();
                     TypeAdapter actualAdapter = elementAdapter;
 
-                    // deserialize BigDecimal
+                    // deserialize String
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        BigDecimal.validateJsonObject(jsonObject);
-                        actualAdapter = adapterBigDecimal;
+                        String.validateJsonObject(jsonObject);
+                        actualAdapter = adapterString;
                         match++;
-                        log.log(Level.FINER, "Input data matches schema 'BigDecimal'");
+                        log.log(Level.FINER, "Input data matches schema 'String'");
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        errorMessages.add(String.format("Deserialization for BigDecimal failed with \`%s\`.", e.getMessage()));
-                        log.log(Level.FINER, "Input data does not match schema 'BigDecimal'", e);
+                        errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
+                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
                     }
 
-                    // deserialize String
+                    // deserialize BigDecimal
                     try {
                         // validate the JSON object to see if any exception is thrown
-                        String.validateJsonObject(jsonObject);
-                        actualAdapter = adapterString;
+                        BigDecimal.validateJsonObject(jsonObject);
+                        actualAdapter = adapterBigDecimal;
                         match++;
-                        log.log(Level.FINER, "Input data matches schema 'String'");
+                        log.log(Level.FINER, "Input data matches schema 'BigDecimal'");
                     } catch (Exception e) {
                         // deserialization failed, continue
-                        errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
-                        log.log(Level.FINER, "Input data does not match schema 'String'", e);
+                        errorMessages.add(String.format("Deserialization for BigDecimal failed with \`%s\`.", e.getMessage()));
+                        log.log(Level.FINER, "Input data does not match schema 'BigDecimal'", e);
                     }
 
                     if (match == 1) {
@@ -26197,21 +24598,21 @@ public class DataTypes200ResponseMyOneOf extends AbstractOpenApiSchema {
         super("oneOf", Boolean.FALSE);
     }
 
-    public DataTypes200ResponseMyOneOf(BigDecimal o) {
+    public DataTypes200ResponseMyOneOf(String o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
-    public DataTypes200ResponseMyOneOf(String o) {
+    public DataTypes200ResponseMyOneOf(BigDecimal o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
     static {
-        schemas.put("BigDecimal", new GenericType<BigDecimal>() {
-        });
         schemas.put("String", new GenericType<String>() {
         });
+        schemas.put("BigDecimal", new GenericType<BigDecimal>() {
+        });
     }
 
     @Override
@@ -26222,31 +24623,31 @@ public class DataTypes200ResponseMyOneOf extends AbstractOpenApiSchema {
     /**
      * Set the instance that matches the oneOf child schema, check
      * the instance parameter is valid against the oneOf child schemas:
-     * BigDecimal, String
+     * String, BigDecimal
      *
      * It could be an instance of the 'oneOf' schemas.
      * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
      */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof BigDecimal) {
+        if (instance instanceof String) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof String) {
+        if (instance instanceof BigDecimal) {
             super.setActualInstance(instance);
             return;
         }
 
-        throw new RuntimeException("Invalid instance type. Must be BigDecimal, String");
+        throw new RuntimeException("Invalid instance type. Must be String, BigDecimal");
     }
 
     /**
      * Get the actual instance, which can be the following:
-     * BigDecimal, String
+     * String, BigDecimal
      *
-     * @return The actual instance (BigDecimal, String)
+     * @return The actual instance (String, BigDecimal)
      */
     @Override
     public Object getActualInstance() {
@@ -26254,25 +24655,25 @@ public class DataTypes200ResponseMyOneOf extends AbstractOpenApiSchema {
     }
 
     /**
-     * Get the actual instance of \`BigDecimal\`. If the actual instance is not \`BigDecimal\`,
+     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`BigDecimal\`
-     * @throws ClassCastException if the instance is not \`BigDecimal\`
+     * @return The actual instance of \`String\`
+     * @throws ClassCastException if the instance is not \`String\`
      */
-    public BigDecimal getBigDecimal() throws ClassCastException {
-        return (BigDecimal)super.getActualInstance();
+    public String getString() throws ClassCastException {
+        return (String)super.getActualInstance();
     }
 
     /**
-     * Get the actual instance of \`String\`. If the actual instance is not \`String\`,
+     * Get the actual instance of \`BigDecimal\`. If the actual instance is not \`BigDecimal\`,
      * the ClassCastException will be thrown.
      *
-     * @return The actual instance of \`String\`
-     * @throws ClassCastException if the instance is not \`String\`
+     * @return The actual instance of \`BigDecimal\`
+     * @throws ClassCastException if the instance is not \`BigDecimal\`
      */
-    public String getString() throws ClassCastException {
-        return (String)super.getActualInstance();
+    public BigDecimal getBigDecimal() throws ClassCastException {
+        return (BigDecimal)super.getActualInstance();
     }
 
 
@@ -26286,24 +24687,24 @@ public class DataTypes200ResponseMyOneOf extends AbstractOpenApiSchema {
     // validate oneOf schemas one by one
     int validCount = 0;
     ArrayList<String> errorMessages = new ArrayList<>();
-    // validate the json string with BigDecimal
+    // validate the json string with String
     try {
-      BigDecimal.validateJsonObject(jsonObj);
+      String.validateJsonObject(jsonObj);
       validCount++;
     } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for BigDecimal failed with \`%s\`.", e.getMessage()));
+      errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
       // continue to the next one
     }
-    // validate the json string with String
+    // validate the json string with BigDecimal
     try {
-      String.validateJsonObject(jsonObj);
+      BigDecimal.validateJsonObject(jsonObj);
       validCount++;
     } catch (Exception e) {
-      errorMessages.add(String.format("Deserialization for String failed with \`%s\`.", e.getMessage()));
+      errorMessages.add(String.format("Deserialization for BigDecimal failed with \`%s\`.", e.getMessage()));
       // continue to the next one
     }
     if (validCount != 1) {
-      throw new IOException(String.format("The JSON string is invalid for DataTypes200ResponseMyOneOf with oneOf schemas: BigDecimal, String. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonObj.toString()));
+      throw new IOException(String.format("The JSON string is invalid for DataTypes200ResponseMyOneOf with oneOf schemas: String, BigDecimal. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonObj.toString()));
     }
   }
 
@@ -26326,141 +24727,15 @@ public class DataTypes200ResponseMyOneOf extends AbstractOpenApiSchema {
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
-}
 
+}
 ",
 }
 `;
 
 exports[`Java Client Code Generation Script Unit Tests Generates With default-response.yaml 1`] = `
 {
-  ".github/workflows/maven.yml": "# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-#
-# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  build:
-    name: Build My API
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8' ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: \${{ matrix.java }}
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
-",
-  ".gitignore": "*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
-",
-  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
-",
-  ".openapi-generator/FILES": ".github/workflows/maven.yml
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/DefaultApi.md
-docs/SayHelloResponseContent.md
-docs/ServiceUnavailableErrorResponseContent.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
-src/main/java/test/test/runtime/ApiCallback.java
-src/main/java/test/test/runtime/ApiClient.java
-src/main/java/test/test/runtime/ApiException.java
-src/main/java/test/test/runtime/ApiResponse.java
-src/main/java/test/test/runtime/Configuration.java
-src/main/java/test/test/runtime/GzipRequestInterceptor.java
-src/main/java/test/test/runtime/JSON.java
-src/main/java/test/test/runtime/Pair.java
-src/main/java/test/test/runtime/ProgressRequestBody.java
-src/main/java/test/test/runtime/ProgressResponseBody.java
-src/main/java/test/test/runtime/ServerConfiguration.java
-src/main/java/test/test/runtime/ServerVariable.java
-src/main/java/test/test/runtime/StringUtil.java
-src/main/java/test/test/runtime/__handlers.java
-src/main/java/test/test/runtime/__interceptors.java
-src/main/java/test/test/runtime/api/DefaultApi.java
-src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
-src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
-src/main/java/test/test/runtime/api/operation_config/Operations.java
-src/main/java/test/test/runtime/auth/ApiKeyAuth.java
-src/main/java/test/test/runtime/auth/Authentication.java
-src/main/java/test/test/runtime/auth/HttpBasicAuth.java
-src/main/java/test/test/runtime/auth/HttpBearerAuth.java
-src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
-src/main/java/test/test/runtime/model/SayHelloResponseContent.java
-src/main/java/test/test/runtime/model/ServiceUnavailableErrorResponseContent.java
-src/test/java/test/test/runtime/api/DefaultApiTest.java
-src/test/java/test/test/runtime/model/SayHelloResponseContentTest.java
-src/test/java/test/test/runtime/model/ServiceUnavailableErrorResponseContentTest.java
-src/main/java/test/test/runtime/api/handlers/Handlers.java
+  ".tsapi-manifest": "src/main/java/test/test/runtime/api/handlers/Handlers.java
 src/main/java/test/test/runtime/api/handlers/Response.java
 src/main/java/test/test/runtime/api/handlers/ApiResponse.java
 src/main/java/test/test/runtime/api/handlers/Interceptor.java
@@ -26483,337 +24758,39 @@ src/main/java/test/test/runtime/api/interceptors/ResponseHeadersInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/LoggingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/TracingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/MetricsInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java",
-  ".openapi-generator/VERSION": "6.3.0",
-  ".pdk/dynamic-files/openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
-  "README.md": "# com.aws.pdk.test
-
-My API
-- API version: 1.0.0
-
-See https://github.com/aws/aws-pdk/issues/841
-
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
-
-## Requirements
-
-Building the API client library requires:
-1. Java 1.8+
-2. Maven (3.8.3+)/Gradle (7.2+)
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-\`\`\`shell
-mvn clean install
-\`\`\`
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-\`\`\`shell
-mvn clean deploy
-\`\`\`
-
-Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-\`\`\`xml
-<dependency>
-  <groupId>test</groupId>
-  <artifactId>com.aws.pdk.test</artifactId>
-  <version>1.0.0</version>
-  <scope>compile</scope>
-</dependency>
-\`\`\`
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-\`\`\`groovy
-  repositories {
-    mavenCentral()     // Needed if the 'com.aws.pdk.test' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'com.aws.pdk.test' jar has been published to the local maven repo.
-  }
-
-  dependencies {
-     implementation "test:com.aws.pdk.test:1.0.0"
-  }
-\`\`\`
-
-### Others
-
-At first generate the JAR by executing:
-
-\`\`\`shell
-mvn clean package
-\`\`\`
-
-Then manually install the following JARs:
-
-* \`target/com.aws.pdk.test-1.0.0.jar\`
-* \`target/lib/*.jar\`
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following Java code:
-
-\`\`\`java
-
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    String name = "name_example"; // String | 
-    try {
-      SayHelloResponseContent result = apiInstance.sayHello(name)
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#sayHello");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-
-\`\`\`
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://localhost*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*DefaultApi* | [**sayHello**](docs/DefaultApi.md#sayHello) | **GET** /hello | 
-
-
-## Documentation for Models
-
- - [SayHelloResponseContent](docs/SayHelloResponseContent.md)
- - [ServiceUnavailableErrorResponseContent](docs/ServiceUnavailableErrorResponseContent.md)
-
-
-## Documentation for Authorization
-
-All endpoints do not require authorization.
-Authentication schemes defined for the API:
-
-## Recommendation
-
-It's recommended to create an instance of \`ApiClient\` per thread in a multithreaded environment to avoid any potential issues.
-
-## Author
-
-
-
-",
-  "api/openapi.yaml": "openapi: 3.0.3
-info:
-  description: See https://github.com/aws/aws-pdk/issues/841
-  title: My API
-  version: 1.0.0
-servers:
-- url: /
-paths:
-  /hello:
-    get:
-      operationId: sayHello
-      parameters:
-      - explode: true
-        in: query
-        name: name
-        required: true
-        schema:
-          type: string
-        style: form
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/SayHelloResponseContent'
-          description: Successful response
-        default:
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ServiceUnavailableErrorResponseContent'
-          description: An error due to the client not being authorized to access the
-            resource
-      x-handler:
-        language: typescript
-      x-accepts: application/json
-components:
-  schemas:
-    SayHelloResponseContent:
-      properties:
-        id:
-          format: uuid
-          type: string
-        message:
-          type: string
-      required:
-      - message
-      type: object
-    HelloId:
-      format: uuid
-      type: string
-    ServiceUnavailableErrorResponseContent:
-      properties:
-        message:
-          type: string
-      required:
-      - message
-      type: object
-
-",
-  "docs/DefaultApi.md": "# DefaultApi
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**sayHello**](DefaultApi.md#sayHello) | **GET** /hello |  |
-
-
-<a name="sayHello"></a>
-# **sayHello**
-> SayHelloResponseContent sayHello(name).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    String name = "name_example"; // String | 
-    try {
-      SayHelloResponseContent result = apiInstance.sayHello(name)
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#sayHello");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **name** | **String**|  | |
-
-### Return type
-
-[**SayHelloResponseContent**](SayHelloResponseContent.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Successful response |  -  |
-| **0** | An error due to the client not being authorized to access the resource |  -  |
-
-",
-  "docs/SayHelloResponseContent.md": "
-
-# SayHelloResponseContent
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**id** | **UUID** |  |  [optional] |
-|**message** | **String** |  |  |
-
-
-
-",
-  "docs/ServiceUnavailableErrorResponseContent.md": "
-
-# ServiceUnavailableErrorResponseContent
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**message** | **String** |  |  |
-
-
-
-",
-  "openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
+src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java
+src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
+src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
+src/main/java/test/test/runtime/api/operation_config/Operations.java
+src/main/java/test/test/runtime/api/DefaultApi.java
+src/main/java/test/test/runtime/auth/ApiKeyAuth.java
+src/main/java/test/test/runtime/auth/Authentication.java
+src/main/java/test/test/runtime/auth/HttpBasicAuth.java
+src/main/java/test/test/runtime/auth/HttpBearerAuth.java
+src/main/java/test/test/runtime/ApiCallback.java
+src/main/java/test/test/runtime/ApiClient.java
+src/main/java/test/test/runtime/ApiException.java
+src/main/java/test/test/runtime/ApiResponse.java
+src/main/java/test/test/runtime/Configuration.java
+src/main/java/test/test/runtime/GzipRequestInterceptor.java
+src/main/java/test/test/runtime/JSON.java
+src/main/java/test/test/runtime/Pair.java
+src/main/java/test/test/runtime/ProgressRequestBody.java
+src/main/java/test/test/runtime/ProgressResponseBody.java
+src/main/java/test/test/runtime/ServerConfiguration.java
+src/main/java/test/test/runtime/ServerVariable.java
+src/main/java/test/test/runtime/StringUtil.java
+src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
+src/main/java/test/test/runtime/model/SayHelloResponseContent.java
+src/main/java/test/test/runtime/model/ServiceUnavailableErrorResponseContent.java",
   "src/main/java/test/test/runtime/ApiCallback.java": "/*
  * My API
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -26873,10 +24850,9 @@ public interface ApiCallback<T> {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -27008,7 +24984,7 @@ public class ApiClient {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/1.0.0/java");
+        setUserAgent("OpenAPI-Generator/0.0.0/java");
 
         authentications = new HashMap<String, Authentication>();
     }
@@ -28260,10 +26236,10 @@ public class ApiClient {
     /**
      * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
      *
-     * @param mpBuilder MultipartBody.Builder 
+     * @param mpBuilder MultipartBody.Builder
      * @param key The key of the Header element
      * @param file The file to add to the Header
-     */ 
+     */
     private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
         Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\\"" + key + "\\"; filename=\\"" + file.getName() + "\\"");
         MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
@@ -28420,10 +26396,9 @@ public class ApiClient {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -28439,12 +26414,11 @@ import javax.ws.rs.core.GenericType;
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
- 
+
     /**
      * <p>Constructor for ApiException.</p>
      */
@@ -28587,10 +26561,9 @@ public class ApiException extends Exception {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -28643,7 +26616,7 @@ public class ApiResponse<T> {
     /**
      * <p>Get the <code>headers</code>.</p>
      *
-     * @return a {@link java.util.Map} of headers 
+     * @return a {@link java.util.Map} of headers
      */
     public Map<String, List<String>> getHeaders() {
         return headers;
@@ -28664,17 +26637,15 @@ public class ApiResponse<T> {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
@@ -28704,10 +26675,9 @@ public class Configuration {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -28790,10 +26760,9 @@ class GzipRequestInterceptor implements Interceptor {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -29193,17 +27162,15 @@ public class JSON {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
@@ -29251,10 +27218,9 @@ public class Pair {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -29325,10 +27291,9 @@ public class ProgressRequestBody extends RequestBody {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -29479,10 +27444,9 @@ public class ServerVariable {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -29492,7 +27456,6 @@ package test.test.runtime;
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -29563,10 +27526,9 @@ public class StringUtil {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -29587,6 +27549,8 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 
+import java.math.BigDecimal;
+import java.io.File;
 import test.test.runtime.model.SayHelloResponseContent;
 import test.test.runtime.model.ServiceUnavailableErrorResponseContent;
 
@@ -29682,6 +27646,7 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call sayHelloValidateBeforeCall(String name, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'name' is set
@@ -29693,13 +27658,13 @@ public class DefaultApi {
 
     }
 
-
     private ApiResponse<SayHelloResponseContent> sayHelloWithHttpInfo(String name) throws ApiException {
         okhttp3.Call localVarCall = sayHelloValidateBeforeCall(name, null);
         Type localVarReturnType = new TypeToken<SayHelloResponseContent>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call sayHelloAsync(String name, final ApiCallback<SayHelloResponseContent> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = sayHelloValidateBeforeCall(name, _callback);
@@ -29791,10 +27756,12 @@ public class DefaultApi {
         <tr><td> 0 </td><td> An error due to the client not being authorized to access the resource </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIsayHelloRequest sayHello(String name) {
         return new APIsayHelloRequest(name);
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/handlers/ApiResponse.java": "
 package test.test.runtime.api.handlers;
@@ -29944,12 +27911,8 @@ import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-import test.test.runtime.model.SayHelloResponseContent;
-import test.test.runtime.model.ServiceUnavailableErrorResponseContent;
-
 import test.test.runtime.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Handlers {
 
     static {
@@ -31023,8 +28986,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the SayHello operation
  */
@@ -31408,14 +29374,10 @@ public class TracingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.SayHelloResponseContent;
-import test.test.runtime.model.ServiceUnavailableErrorResponseContent;
-
 import java.util.HashMap;
 import java.util.Map;
 
 // Generic type for object "keyed" by operation names
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @lombok.Builder @lombok.Getter
 public class OperationConfig<T> {
     private T sayHello;
@@ -31431,9 +29393,6 @@ public class OperationConfig<T> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.SayHelloResponseContent;
-import test.test.runtime.model.ServiceUnavailableErrorResponseContent;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
@@ -31441,7 +29400,6 @@ import java.util.Arrays;
 
 
 // Look up path and http method for a given operation name
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OperationLookup {
     @lombok.Builder @lombok.Getter
     public static class OperationLookupEntry {
@@ -31468,7 +29426,6 @@ public class OperationLookup {
 ",
   "src/main/java/test/test/runtime/api/operation_config/Operations.java": "package test.test.runtime.api.operation_config;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Operations {
     /**
      * Returns an OperationConfig Builder with all values populated with the given value.
@@ -31487,10 +29444,9 @@ public class Operations {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -31504,7 +29460,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -31568,10 +29523,9 @@ public class ApiKeyAuth implements Authentication {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -31605,10 +29559,9 @@ public interface Authentication {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -31663,10 +29616,9 @@ public class HttpBasicAuth implements Authentication {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -31680,7 +29632,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
@@ -31727,10 +29678,9 @@ public class HttpBearerAuth implements Authentication {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -31749,7 +29699,6 @@ import javax.ws.rs.core.GenericType;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -31878,10 +29827,9 @@ public abstract class AbstractOpenApiSchema {
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -31896,26 +29844,47 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -31923,7 +29892,6 @@ import test.test.runtime.JSON;
  * SayHelloResponseContent
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SayHelloResponseContent {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
@@ -31937,7 +29905,7 @@ public class SayHelloResponseContent {
   }
 
   public SayHelloResponseContent id(UUID id) {
-    
+
     this.id = id;
     return this;
   }
@@ -31947,7 +29915,6 @@ public class SayHelloResponseContent {
    * @return id
   **/
   @javax.annotation.Nullable
-
   public UUID getId() {
     return id;
   }
@@ -31957,9 +29924,8 @@ public class SayHelloResponseContent {
     this.id = id;
   }
 
-
   public SayHelloResponseContent message(String message) {
-    
+
     this.message = message;
     return this;
   }
@@ -31969,7 +29935,6 @@ public class SayHelloResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-
   public String getMessage() {
     return message;
   }
@@ -31980,7 +29945,6 @@ public class SayHelloResponseContent {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -31992,6 +29956,7 @@ public class SayHelloResponseContent {
     SayHelloResponseContent sayHelloResponseContent = (SayHelloResponseContent) o;
     return Objects.equals(this.id, sayHelloResponseContent.id) &&
         Objects.equals(this.message, sayHelloResponseContent.message);
+        
   }
 
   @Override
@@ -32119,17 +30084,15 @@ public class SayHelloResponseContent {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/ServiceUnavailableErrorResponseContent.java": "/*
  * My API
  * See https://github.com/aws/aws-pdk/issues/841
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -32145,24 +30108,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -32170,7 +30155,6 @@ import test.test.runtime.JSON;
  * ServiceUnavailableErrorResponseContent
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ServiceUnavailableErrorResponseContent {
   public static final String SERIALIZED_NAME_MESSAGE = "message";
   @SerializedName(SERIALIZED_NAME_MESSAGE)
@@ -32180,7 +30164,7 @@ public class ServiceUnavailableErrorResponseContent {
   }
 
   public ServiceUnavailableErrorResponseContent message(String message) {
-    
+
     this.message = message;
     return this;
   }
@@ -32190,7 +30174,6 @@ public class ServiceUnavailableErrorResponseContent {
    * @return message
   **/
   @javax.annotation.Nonnull
-
   public String getMessage() {
     return message;
   }
@@ -32201,7 +30184,6 @@ public class ServiceUnavailableErrorResponseContent {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -32212,6 +30194,7 @@ public class ServiceUnavailableErrorResponseContent {
     }
     ServiceUnavailableErrorResponseContent serviceUnavailableErrorResponseContent = (ServiceUnavailableErrorResponseContent) o;
     return Objects.equals(this.message, serviceUnavailableErrorResponseContent.message);
+        
   }
 
   @Override
@@ -32334,140 +30317,13 @@ public class ServiceUnavailableErrorResponseContent {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
 }
 `;
 
 exports[`Java Client Code Generation Script Unit Tests Generates With edge-cases.yaml 1`] = `
 {
-  ".github/workflows/maven.yml": "# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-#
-# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  build:
-    name: Build Edge Cases
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8' ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: \${{ matrix.java }}
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
-",
-  ".gitignore": "*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
-",
-  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
-",
-  ".openapi-generator/FILES": ".github/workflows/maven.yml
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/DefaultApi.md
-docs/InlineEnum200Response.md
-docs/MyEnum.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
-src/main/java/test/test/runtime/ApiCallback.java
-src/main/java/test/test/runtime/ApiClient.java
-src/main/java/test/test/runtime/ApiException.java
-src/main/java/test/test/runtime/ApiResponse.java
-src/main/java/test/test/runtime/Configuration.java
-src/main/java/test/test/runtime/GzipRequestInterceptor.java
-src/main/java/test/test/runtime/JSON.java
-src/main/java/test/test/runtime/Pair.java
-src/main/java/test/test/runtime/ProgressRequestBody.java
-src/main/java/test/test/runtime/ProgressResponseBody.java
-src/main/java/test/test/runtime/ServerConfiguration.java
-src/main/java/test/test/runtime/ServerVariable.java
-src/main/java/test/test/runtime/StringUtil.java
-src/main/java/test/test/runtime/__handlers.java
-src/main/java/test/test/runtime/__interceptors.java
-src/main/java/test/test/runtime/api/DefaultApi.java
-src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
-src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
-src/main/java/test/test/runtime/api/operation_config/Operations.java
-src/main/java/test/test/runtime/auth/ApiKeyAuth.java
-src/main/java/test/test/runtime/auth/Authentication.java
-src/main/java/test/test/runtime/auth/HttpBasicAuth.java
-src/main/java/test/test/runtime/auth/HttpBearerAuth.java
-src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
-src/main/java/test/test/runtime/model/InlineEnum200Response.java
-src/main/java/test/test/runtime/model/MyEnum.java
-src/test/java/test/test/runtime/api/DefaultApiTest.java
-src/test/java/test/test/runtime/model/InlineEnum200ResponseTest.java
-src/test/java/test/test/runtime/model/MyEnumTest.java
-src/main/java/test/test/runtime/api/handlers/Handlers.java
+  ".tsapi-manifest": "src/main/java/test/test/runtime/api/handlers/Handlers.java
 src/main/java/test/test/runtime/api/handlers/Response.java
 src/main/java/test/test/runtime/api/handlers/ApiResponse.java
 src/main/java/test/test/runtime/api/handlers/Interceptor.java
@@ -32501,598 +30357,40 @@ src/main/java/test/test/runtime/api/interceptors/ResponseHeadersInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/LoggingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/TracingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/MetricsInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java",
-  ".openapi-generator/VERSION": "6.3.0",
-  ".pdk/dynamic-files/openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
-  "README.md": "# com.aws.pdk.test
-
-Edge Cases
-- API version: 1.0.0
-
-No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
-
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
-
-## Requirements
-
-Building the API client library requires:
-1. Java 1.8+
-2. Maven (3.8.3+)/Gradle (7.2+)
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-\`\`\`shell
-mvn clean install
-\`\`\`
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-\`\`\`shell
-mvn clean deploy
-\`\`\`
-
-Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-\`\`\`xml
-<dependency>
-  <groupId>test</groupId>
-  <artifactId>com.aws.pdk.test</artifactId>
-  <version>1.0.0</version>
-  <scope>compile</scope>
-</dependency>
-\`\`\`
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-\`\`\`groovy
-  repositories {
-    mavenCentral()     // Needed if the 'com.aws.pdk.test' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'com.aws.pdk.test' jar has been published to the local maven repo.
-  }
-
-  dependencies {
-     implementation "test:com.aws.pdk.test:1.0.0"
-  }
-\`\`\`
-
-### Others
-
-At first generate the JAR by executing:
-
-\`\`\`shell
-mvn clean package
-\`\`\`
-
-Then manually install the following JARs:
-
-* \`target/com.aws.pdk.test-1.0.0.jar\`
-* \`target/lib/*.jar\`
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following Java code:
-
-\`\`\`java
-
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    List<String> myStringArrayRequestParams = Arrays.asList(); // List<String> | 
-    List<MyEnum> myEnumArrayRequestParams = Arrays.asList(); // List<MyEnum> | 
-    List<Integer> myIntegerArrayRequestParams = Arrays.asList(); // List<Integer> | 
-    List<Long> myLongArrayRequestParams = Arrays.asList(); // List<Long> | 
-    List<Integer> myInt32ArrayRequestParams = Arrays.asList(); // List<Integer> | 
-    List<BigDecimal> myNumberArrayRequestParams = Arrays.asList(); // List<BigDecimal> | 
-    List<Float> myFloatArrayRequestParams = Arrays.asList(); // List<Float> | 
-    List<Double> myDoubleArrayRequestParams = Arrays.asList(); // List<Double> | 
-    try {
-      apiInstance.arrayRequestParameters()
-            .myStringArrayRequestParams(myStringArrayRequestParams)
-            .myEnumArrayRequestParams(myEnumArrayRequestParams)
-            .myIntegerArrayRequestParams(myIntegerArrayRequestParams)
-            .myLongArrayRequestParams(myLongArrayRequestParams)
-            .myInt32ArrayRequestParams(myInt32ArrayRequestParams)
-            .myNumberArrayRequestParams(myNumberArrayRequestParams)
-            .myFloatArrayRequestParams(myFloatArrayRequestParams)
-            .myDoubleArrayRequestParams(myDoubleArrayRequestParams)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#arrayRequestParameters");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-
-\`\`\`
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://localhost*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*DefaultApi* | [**arrayRequestParameters**](docs/DefaultApi.md#arrayRequestParameters) | **GET** /array-request-parameters | 
-*DefaultApi* | [**inlineEnum**](docs/DefaultApi.md#inlineEnum) | **GET** /inline-enum | 
-*DefaultApi* | [**reservedKeywords**](docs/DefaultApi.md#reservedKeywords) | **GET** /reserved-keywords | 
-
-
-## Documentation for Models
-
- - [InlineEnum200Response](docs/InlineEnum200Response.md)
- - [MyEnum](docs/MyEnum.md)
-
-
-## Documentation for Authorization
-
-All endpoints do not require authorization.
-Authentication schemes defined for the API:
-
-## Recommendation
-
-It's recommended to create an instance of \`ApiClient\` per thread in a multithreaded environment to avoid any potential issues.
-
-## Author
-
-
-
-",
-  "api/openapi.yaml": "openapi: 3.0.3
-info:
-  title: Edge Cases
-  version: 1.0.0
-servers:
-- url: /
-paths:
-  /reserved-keywords:
-    get:
-      operationId: reservedKeywords
-      parameters:
-      - explode: true
-        in: query
-        name: with
-        required: false
-        schema:
-          type: string
-        style: form
-      - explode: true
-        in: query
-        name: if
-        required: false
-        schema:
-          type: string
-        style: form
-      - explode: true
-        in: query
-        name: class
-        required: false
-        schema:
-          type: string
-        style: form
-      responses:
-        "200":
-          description: ok
-      x-accepts: application/json
-  /array-request-parameters:
-    get:
-      operationId: arrayRequestParameters
-      parameters:
-      - explode: true
-        in: query
-        name: my-string-array-request-params
-        required: false
-        schema:
-          items:
-            type: string
-          type: array
-        style: form
-      - explode: true
-        in: query
-        name: my-enum-array-request-params
-        required: false
-        schema:
-          items:
-            $ref: '#/components/schemas/MyEnum'
-          type: array
-        style: form
-      - explode: true
-        in: query
-        name: my-integer-array-request-params
-        required: false
-        schema:
-          items:
-            type: integer
-          type: array
-        style: form
-      - explode: true
-        in: query
-        name: my-long-array-request-params
-        required: false
-        schema:
-          items:
-            format: int64
-            type: integer
-          type: array
-        style: form
-      - explode: true
-        in: query
-        name: my-int32-array-request-params
-        required: false
-        schema:
-          items:
-            format: int32
-            type: integer
-          type: array
-        style: form
-      - explode: true
-        in: query
-        name: my-number-array-request-params
-        required: false
-        schema:
-          items:
-            type: number
-          type: array
-        style: form
-      - explode: true
-        in: query
-        name: my-float-array-request-params
-        required: false
-        schema:
-          items:
-            format: float
-            type: number
-          type: array
-        style: form
-      - explode: true
-        in: query
-        name: my-double-array-request-params
-        required: false
-        schema:
-          items:
-            format: double
-            type: number
-          type: array
-        style: form
-      responses:
-        "200":
-          description: ok
-      x-accepts: application/json
-  /inline-enum:
-    get:
-      operationId: inlineEnum
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/inlineEnum_200_response'
-          description: ok
-      x-accepts: application/json
-components:
-  schemas:
-    MyEnum:
-      enum:
-      - one
-      - two
-      - three
-      type: string
-    inlineEnum_200_response:
-      properties:
-        category:
-          enum:
-          - fruit
-          - vegetable
-          type: string
-      type: object
-
-",
-  "docs/DefaultApi.md": "# DefaultApi
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**arrayRequestParameters**](DefaultApi.md#arrayRequestParameters) | **GET** /array-request-parameters |  |
-| [**inlineEnum**](DefaultApi.md#inlineEnum) | **GET** /inline-enum |  |
-| [**reservedKeywords**](DefaultApi.md#reservedKeywords) | **GET** /reserved-keywords |  |
-
-
-<a name="arrayRequestParameters"></a>
-# **arrayRequestParameters**
-> arrayRequestParameters().myStringArrayRequestParams(myStringArrayRequestParams).myEnumArrayRequestParams(myEnumArrayRequestParams).myIntegerArrayRequestParams(myIntegerArrayRequestParams).myLongArrayRequestParams(myLongArrayRequestParams).myInt32ArrayRequestParams(myInt32ArrayRequestParams).myNumberArrayRequestParams(myNumberArrayRequestParams).myFloatArrayRequestParams(myFloatArrayRequestParams).myDoubleArrayRequestParams(myDoubleArrayRequestParams).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    List<String> myStringArrayRequestParams = Arrays.asList(); // List<String> | 
-    List<MyEnum> myEnumArrayRequestParams = Arrays.asList(); // List<MyEnum> | 
-    List<Integer> myIntegerArrayRequestParams = Arrays.asList(); // List<Integer> | 
-    List<Long> myLongArrayRequestParams = Arrays.asList(); // List<Long> | 
-    List<Integer> myInt32ArrayRequestParams = Arrays.asList(); // List<Integer> | 
-    List<BigDecimal> myNumberArrayRequestParams = Arrays.asList(); // List<BigDecimal> | 
-    List<Float> myFloatArrayRequestParams = Arrays.asList(); // List<Float> | 
-    List<Double> myDoubleArrayRequestParams = Arrays.asList(); // List<Double> | 
-    try {
-      apiInstance.arrayRequestParameters()
-            .myStringArrayRequestParams(myStringArrayRequestParams)
-            .myEnumArrayRequestParams(myEnumArrayRequestParams)
-            .myIntegerArrayRequestParams(myIntegerArrayRequestParams)
-            .myLongArrayRequestParams(myLongArrayRequestParams)
-            .myInt32ArrayRequestParams(myInt32ArrayRequestParams)
-            .myNumberArrayRequestParams(myNumberArrayRequestParams)
-            .myFloatArrayRequestParams(myFloatArrayRequestParams)
-            .myDoubleArrayRequestParams(myDoubleArrayRequestParams)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#arrayRequestParameters");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **myStringArrayRequestParams** | [**List&lt;String&gt;**](String.md)|  | [optional] |
-| **myEnumArrayRequestParams** | [**List&lt;MyEnum&gt;**](MyEnum.md)|  | [optional] |
-| **myIntegerArrayRequestParams** | [**List&lt;Integer&gt;**](Integer.md)|  | [optional] |
-| **myLongArrayRequestParams** | [**List&lt;Long&gt;**](Long.md)|  | [optional] |
-| **myInt32ArrayRequestParams** | [**List&lt;Integer&gt;**](Integer.md)|  | [optional] |
-| **myNumberArrayRequestParams** | [**List&lt;BigDecimal&gt;**](BigDecimal.md)|  | [optional] |
-| **myFloatArrayRequestParams** | [**List&lt;Float&gt;**](Float.md)|  | [optional] |
-| **myDoubleArrayRequestParams** | [**List&lt;Double&gt;**](Double.md)|  | [optional] |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | ok |  -  |
-
-<a name="inlineEnum"></a>
-# **inlineEnum**
-> InlineEnum200Response inlineEnum().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      InlineEnum200Response result = apiInstance.inlineEnum()
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#inlineEnum");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**InlineEnum200Response**](InlineEnum200Response.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | ok |  -  |
-
-<a name="reservedKeywords"></a>
-# **reservedKeywords**
-> reservedKeywords().with(with)._if(_if).propertyClass(propertyClass).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    String with = "with_example"; // String | 
-    String _if = "_if_example"; // String | 
-    String propertyClass = "propertyClass_example"; // String | 
-    try {
-      apiInstance.reservedKeywords()
-            .with(with)
-            ._if(_if)
-            .propertyClass(propertyClass)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#reservedKeywords");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **with** | **String**|  | [optional] |
-| **_if** | **String**|  | [optional] |
-| **propertyClass** | **String**|  | [optional] |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | ok |  -  |
-
-",
-  "docs/InlineEnum200Response.md": "
-
-# InlineEnum200Response
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**category** | [**CategoryEnum**](#CategoryEnum) |  |  [optional] |
-
-
-
-## Enum: CategoryEnum
-
-| Name | Value |
-|---- | -----|
-| FRUIT | &quot;fruit&quot; |
-| VEGETABLE | &quot;vegetable&quot; |
-
-
-
-",
-  "docs/MyEnum.md": "
-
-# MyEnum
-
-## Enum
-
-
-* \`ONE\` (value: \`"one"\`)
-
-* \`TWO\` (value: \`"two"\`)
-
-* \`THREE\` (value: \`"three"\`)
-
-
-
-",
-  "openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
+src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java
+src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
+src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
+src/main/java/test/test/runtime/api/operation_config/Operations.java
+src/main/java/test/test/runtime/api/DefaultApi.java
+src/main/java/test/test/runtime/auth/ApiKeyAuth.java
+src/main/java/test/test/runtime/auth/Authentication.java
+src/main/java/test/test/runtime/auth/HttpBasicAuth.java
+src/main/java/test/test/runtime/auth/HttpBearerAuth.java
+src/main/java/test/test/runtime/ApiCallback.java
+src/main/java/test/test/runtime/ApiClient.java
+src/main/java/test/test/runtime/ApiException.java
+src/main/java/test/test/runtime/ApiResponse.java
+src/main/java/test/test/runtime/Configuration.java
+src/main/java/test/test/runtime/GzipRequestInterceptor.java
+src/main/java/test/test/runtime/JSON.java
+src/main/java/test/test/runtime/Pair.java
+src/main/java/test/test/runtime/ProgressRequestBody.java
+src/main/java/test/test/runtime/ProgressResponseBody.java
+src/main/java/test/test/runtime/ServerConfiguration.java
+src/main/java/test/test/runtime/ServerVariable.java
+src/main/java/test/test/runtime/StringUtil.java
+src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
+src/main/java/test/test/runtime/model/InlineEnum200Response.java
+src/main/java/test/test/runtime/model/InlineEnum200ResponseCategoryEnum.java
+src/main/java/test/test/runtime/model/MyEnum.java",
   "src/main/java/test/test/runtime/ApiCallback.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -33149,13 +30447,12 @@ public interface ApiCallback<T> {
 ",
   "src/main/java/test/test/runtime/ApiClient.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -33287,7 +30584,7 @@ public class ApiClient {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/1.0.0/java");
+        setUserAgent("OpenAPI-Generator/0.0.0/java");
 
         authentications = new HashMap<String, Authentication>();
     }
@@ -34539,10 +31836,10 @@ public class ApiClient {
     /**
      * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
      *
-     * @param mpBuilder MultipartBody.Builder 
+     * @param mpBuilder MultipartBody.Builder
      * @param key The key of the Header element
      * @param file The file to add to the Header
-     */ 
+     */
     private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
         Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\\"" + key + "\\"; filename=\\"" + file.getName() + "\\"");
         MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
@@ -34696,13 +31993,12 @@ public class ApiClient {
 ",
   "src/main/java/test/test/runtime/ApiException.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -34718,12 +32014,11 @@ import javax.ws.rs.core.GenericType;
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
- 
+
     /**
      * <p>Constructor for ApiException.</p>
      */
@@ -34863,13 +32158,12 @@ public class ApiException extends Exception {
 ",
   "src/main/java/test/test/runtime/ApiResponse.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -34922,7 +32216,7 @@ public class ApiResponse<T> {
     /**
      * <p>Get the <code>headers</code>.</p>
      *
-     * @return a {@link java.util.Map} of headers 
+     * @return a {@link java.util.Map} of headers
      */
     public Map<String, List<String>> getHeaders() {
         return headers;
@@ -34940,20 +32234,18 @@ public class ApiResponse<T> {
 ",
   "src/main/java/test/test/runtime/Configuration.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
@@ -34980,13 +32272,12 @@ public class Configuration {
 ",
   "src/main/java/test/test/runtime/GzipRequestInterceptor.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -35066,13 +32357,12 @@ class GzipRequestInterceptor implements Interceptor {
 ",
   "src/main/java/test/test/runtime/JSON.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -35468,20 +32758,18 @@ public class JSON {
 ",
   "src/main/java/test/test/runtime/Pair.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
@@ -35526,13 +32814,12 @@ public class Pair {
 ",
   "src/main/java/test/test/runtime/ProgressRequestBody.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -35600,13 +32887,12 @@ public class ProgressRequestBody extends RequestBody {
 ",
   "src/main/java/test/test/runtime/ProgressResponseBody.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -35754,13 +33040,12 @@ public class ServerVariable {
 ",
   "src/main/java/test/test/runtime/StringUtil.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -35770,7 +33055,6 @@ package test.test.runtime;
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -35838,13 +33122,12 @@ public class StringUtil {
 ",
   "src/main/java/test/test/runtime/api/DefaultApi.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -35866,6 +33149,7 @@ import java.io.IOException;
 
 
 import java.math.BigDecimal;
+import java.io.File;
 import test.test.runtime.model.InlineEnum200Response;
 import test.test.runtime.model.MyEnum;
 
@@ -35913,7 +33197,7 @@ public class DefaultApi {
         this.localCustomBaseUrl = customBaseUrl;
     }
 
-    private okhttp3.Call arrayRequestParametersCall(List<String> myStringArrayRequestParams, List<MyEnum> myEnumArrayRequestParams, List<Integer> myIntegerArrayRequestParams, List<Long> myLongArrayRequestParams, List<Integer> myInt32ArrayRequestParams, List<BigDecimal> myNumberArrayRequestParams, List<Float> myFloatArrayRequestParams, List<Double> myDoubleArrayRequestParams, final ApiCallback _callback) throws ApiException {
+    private okhttp3.Call arrayRequestParametersCall(List<String> myStringArrayRequestParams, List<MyEnum> myEnumArrayRequestParams, List<Integer> myIntegerArrayRequestParams, List<Long> myLongArrayRequestParams, List<Integer> myInt32ArrayRequestParams, List<BigDecimal> myNumberArrayRequestParams, List<Float> myFloatArrayRequestParams, List<Double> myDoubleArrayRequestParams, MyEnum myEnumRequestParam, final ApiCallback _callback) throws ApiException {
         String basePath = null;
         // Operation Servers
         String[] localBasePaths = new String[] {  };
@@ -35970,6 +33254,10 @@ public class DefaultApi {
             localVarCollectionQueryParams.addAll(localVarApiClient.parameterToPairs("multi", "my-double-array-request-params", myDoubleArrayRequestParams));
         }
 
+        if (myEnumRequestParam != null) {
+            localVarQueryParams.addAll(localVarApiClient.parameterToPair("my-enum-request-param", myEnumRequestParam));
+        }
+
         final String[] localVarAccepts = {
         };
         final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
@@ -35988,21 +33276,22 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call arrayRequestParametersValidateBeforeCall(List<String> myStringArrayRequestParams, List<MyEnum> myEnumArrayRequestParams, List<Integer> myIntegerArrayRequestParams, List<Long> myLongArrayRequestParams, List<Integer> myInt32ArrayRequestParams, List<BigDecimal> myNumberArrayRequestParams, List<Float> myFloatArrayRequestParams, List<Double> myDoubleArrayRequestParams, final ApiCallback _callback) throws ApiException {
-        return arrayRequestParametersCall(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, _callback);
+    private okhttp3.Call arrayRequestParametersValidateBeforeCall(List<String> myStringArrayRequestParams, List<MyEnum> myEnumArrayRequestParams, List<Integer> myIntegerArrayRequestParams, List<Long> myLongArrayRequestParams, List<Integer> myInt32ArrayRequestParams, List<BigDecimal> myNumberArrayRequestParams, List<Float> myFloatArrayRequestParams, List<Double> myDoubleArrayRequestParams, MyEnum myEnumRequestParam, final ApiCallback _callback) throws ApiException {
+        return arrayRequestParametersCall(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, myEnumRequestParam, _callback);
 
     }
 
-
-    private ApiResponse<Void> arrayRequestParametersWithHttpInfo(List<String> myStringArrayRequestParams, List<MyEnum> myEnumArrayRequestParams, List<Integer> myIntegerArrayRequestParams, List<Long> myLongArrayRequestParams, List<Integer> myInt32ArrayRequestParams, List<BigDecimal> myNumberArrayRequestParams, List<Float> myFloatArrayRequestParams, List<Double> myDoubleArrayRequestParams) throws ApiException {
-        okhttp3.Call localVarCall = arrayRequestParametersValidateBeforeCall(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, null);
+    private ApiResponse<Void> arrayRequestParametersWithHttpInfo(List<String> myStringArrayRequestParams, List<MyEnum> myEnumArrayRequestParams, List<Integer> myIntegerArrayRequestParams, List<Long> myLongArrayRequestParams, List<Integer> myInt32ArrayRequestParams, List<BigDecimal> myNumberArrayRequestParams, List<Float> myFloatArrayRequestParams, List<Double> myDoubleArrayRequestParams, MyEnum myEnumRequestParam) throws ApiException {
+        okhttp3.Call localVarCall = arrayRequestParametersValidateBeforeCall(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, myEnumRequestParam, null);
         return localVarApiClient.execute(localVarCall);
     }
 
-    private okhttp3.Call arrayRequestParametersAsync(List<String> myStringArrayRequestParams, List<MyEnum> myEnumArrayRequestParams, List<Integer> myIntegerArrayRequestParams, List<Long> myLongArrayRequestParams, List<Integer> myInt32ArrayRequestParams, List<BigDecimal> myNumberArrayRequestParams, List<Float> myFloatArrayRequestParams, List<Double> myDoubleArrayRequestParams, final ApiCallback<Void> _callback) throws ApiException {
 
-        okhttp3.Call localVarCall = arrayRequestParametersValidateBeforeCall(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, _callback);
+    private okhttp3.Call arrayRequestParametersAsync(List<String> myStringArrayRequestParams, List<MyEnum> myEnumArrayRequestParams, List<Integer> myIntegerArrayRequestParams, List<Long> myLongArrayRequestParams, List<Integer> myInt32ArrayRequestParams, List<BigDecimal> myNumberArrayRequestParams, List<Float> myFloatArrayRequestParams, List<Double> myDoubleArrayRequestParams, MyEnum myEnumRequestParam, final ApiCallback<Void> _callback) throws ApiException {
+
+        okhttp3.Call localVarCall = arrayRequestParametersValidateBeforeCall(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, myEnumRequestParam, _callback);
         localVarApiClient.executeAsync(localVarCall, _callback);
         return localVarCall;
     }
@@ -36016,6 +33305,7 @@ public class DefaultApi {
         private List<BigDecimal> myNumberArrayRequestParams;
         private List<Float> myFloatArrayRequestParams;
         private List<Double> myDoubleArrayRequestParams;
+        private MyEnum myEnumRequestParam;
 
         private APIarrayRequestParametersRequest() {
         }
@@ -36100,6 +33390,16 @@ public class DefaultApi {
             return this;
         }
 
+        /**
+         * Set myEnumRequestParam
+         * @param myEnumRequestParam  (optional)
+         * @return APIarrayRequestParametersRequest
+         */
+        public APIarrayRequestParametersRequest myEnumRequestParam(MyEnum myEnumRequestParam) {
+            this.myEnumRequestParam = myEnumRequestParam;
+            return this;
+        }
+
         /**
          * Build call for arrayRequestParameters
          * @param _callback ApiCallback API callback
@@ -36112,7 +33412,7 @@ public class DefaultApi {
          </table>
          */
         public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
-            return arrayRequestParametersCall(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, _callback);
+            return arrayRequestParametersCall(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, myEnumRequestParam, _callback);
         }
 
         /**
@@ -36125,7 +33425,7 @@ public class DefaultApi {
          </table>
          */
         public void execute() throws ApiException {
-            arrayRequestParametersWithHttpInfo(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams);
+            arrayRequestParametersWithHttpInfo(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, myEnumRequestParam);
         }
 
         /**
@@ -36139,7 +33439,7 @@ public class DefaultApi {
          </table>
          */
         public ApiResponse<Void> executeWithHttpInfo() throws ApiException {
-            return arrayRequestParametersWithHttpInfo(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams);
+            return arrayRequestParametersWithHttpInfo(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, myEnumRequestParam);
         }
 
         /**
@@ -36154,7 +33454,7 @@ public class DefaultApi {
          </table>
          */
         public okhttp3.Call executeAsync(final ApiCallback<Void> _callback) throws ApiException {
-            return arrayRequestParametersAsync(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, _callback);
+            return arrayRequestParametersAsync(myStringArrayRequestParams, myEnumArrayRequestParams, myIntegerArrayRequestParams, myLongArrayRequestParams, myInt32ArrayRequestParams, myNumberArrayRequestParams, myFloatArrayRequestParams, myDoubleArrayRequestParams, myEnumRequestParam, _callback);
         }
     }
 
@@ -36168,6 +33468,7 @@ public class DefaultApi {
         <tr><td> 200 </td><td> ok </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIarrayRequestParametersRequest arrayRequestParameters() {
         return new APIarrayRequestParametersRequest();
     }
@@ -36215,19 +33516,20 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call inlineEnumValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return inlineEnumCall(_callback);
 
     }
 
-
     private ApiResponse<InlineEnum200Response> inlineEnumWithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = inlineEnumValidateBeforeCall(null);
         Type localVarReturnType = new TypeToken<InlineEnum200Response>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call inlineEnumAsync(final ApiCallback<InlineEnum200Response> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = inlineEnumValidateBeforeCall(_callback);
@@ -36311,6 +33613,7 @@ public class DefaultApi {
         <tr><td> 200 </td><td> ok </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIinlineEnumRequest inlineEnum() {
         return new APIinlineEnumRequest();
     }
@@ -36369,18 +33672,19 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call reservedKeywordsValidateBeforeCall(String with, String _if, String propertyClass, final ApiCallback _callback) throws ApiException {
         return reservedKeywordsCall(with, _if, propertyClass, _callback);
 
     }
 
-
     private ApiResponse<Void> reservedKeywordsWithHttpInfo(String with, String _if, String propertyClass) throws ApiException {
         okhttp3.Call localVarCall = reservedKeywordsValidateBeforeCall(with, _if, propertyClass, null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call reservedKeywordsAsync(String with, String _if, String propertyClass, final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = reservedKeywordsValidateBeforeCall(with, _if, propertyClass, _callback);
@@ -36494,10 +33798,12 @@ public class DefaultApi {
         <tr><td> 200 </td><td> ok </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIreservedKeywordsRequest reservedKeywords() {
         return new APIreservedKeywordsRequest();
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/handlers/ApiResponse.java": "
 package test.test.runtime.api.handlers;
@@ -36675,13 +33981,8 @@ import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-import java.math.BigDecimal;
-import test.test.runtime.model.InlineEnum200Response;
-import test.test.runtime.model.MyEnum;
-
 import test.test.runtime.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Handlers {
 
     static {
@@ -37670,8 +34971,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the ArrayRequestParameters operation
  */
@@ -37686,6 +34990,7 @@ public class ArrayRequestParametersRequestParameters {
     private final Optional<List<BigDecimal>> myNumberArrayRequestParams;
     private final Optional<List<Float>> myFloatArrayRequestParams;
     private final Optional<List<Double>> myDoubleArrayRequestParams;
+    private final Optional<MyEnum> myEnumRequestParam;
 
     public ArrayRequestParametersRequestParameters(final APIGatewayProxyRequestEvent event) {
         Map<String, String> rawStringParameters = new HashMap<>();
@@ -37700,13 +35005,14 @@ public class ArrayRequestParametersRequestParameters {
         Map<String, List<String>> decodedStringArrayParameters = Handlers.decodeRequestArrayParameters(rawStringArrayParameters);
 
         this.myStringArrayRequestParams = Optional.ofNullable(Handlers.coerceStringArrayParameter("my-string-array-request-params", false, decodedStringArrayParameters));
-        this.myEnumArrayRequestParams = Optional.ofNullable(Handlers.coerceMyEnumArrayParameter("my-enum-array-request-params", false, decodedStringArrayParameters));
+        this.myEnumArrayRequestParams = Optional.ofNullable(Handlers.coerceStringArrayParameter("my-enum-array-request-params", false, decodedStringArrayParameters).stream().map(MyEnum::fromValue).collect(Collectors.toList()));
         this.myIntegerArrayRequestParams = Optional.ofNullable(Handlers.coerceIntegerArrayParameter("my-integer-array-request-params", false, decodedStringArrayParameters));
         this.myLongArrayRequestParams = Optional.ofNullable(Handlers.coerceLongArrayParameter("my-long-array-request-params", false, decodedStringArrayParameters));
         this.myInt32ArrayRequestParams = Optional.ofNullable(Handlers.coerceIntegerArrayParameter("my-int32-array-request-params", false, decodedStringArrayParameters));
         this.myNumberArrayRequestParams = Optional.ofNullable(Handlers.coerceBigDecimalArrayParameter("my-number-array-request-params", false, decodedStringArrayParameters));
         this.myFloatArrayRequestParams = Optional.ofNullable(Handlers.coerceFloatArrayParameter("my-float-array-request-params", false, decodedStringArrayParameters));
         this.myDoubleArrayRequestParams = Optional.ofNullable(Handlers.coerceDoubleArrayParameter("my-double-array-request-params", false, decodedStringArrayParameters));
+        this.myEnumRequestParam = Optional.ofNullable(MyEnum.fromValue(Handlers.coerceStringParameter("my-enum-request-param", false, decodedStringParameters)));
     }
 
     public Optional<List<String>> getMyStringArrayRequestParams() {
@@ -37733,6 +35039,9 @@ public class ArrayRequestParametersRequestParameters {
     public Optional<List<Double>> getMyDoubleArrayRequestParams() {
         return this.myDoubleArrayRequestParams;
     }
+    public Optional<MyEnum> getMyEnumRequestParam() {
+        return this.myEnumRequestParam;
+    }
 }
 ",
   "src/main/java/test/test/runtime/api/handlers/array_request_parameters/ArrayRequestParametersResponse.java": "
@@ -38114,8 +35423,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the InlineEnum operation
  */
@@ -38515,8 +35827,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the ReservedKeywords operation
  */
@@ -38910,15 +36225,10 @@ public class TracingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 
 import test.test.runtime.model.*;
 
-import java.math.BigDecimal;
-import test.test.runtime.model.InlineEnum200Response;
-import test.test.runtime.model.MyEnum;
-
 import java.util.HashMap;
 import java.util.Map;
 
 // Generic type for object "keyed" by operation names
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @lombok.Builder @lombok.Getter
 public class OperationConfig<T> {
     private T arrayRequestParameters;
@@ -38938,10 +36248,6 @@ public class OperationConfig<T> {
 
 import test.test.runtime.model.*;
 
-import java.math.BigDecimal;
-import test.test.runtime.model.InlineEnum200Response;
-import test.test.runtime.model.MyEnum;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
@@ -38949,7 +36255,6 @@ import java.util.Arrays;
 
 
 // Look up path and http method for a given operation name
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OperationLookup {
     @lombok.Builder @lombok.Getter
     public static class OperationLookupEntry {
@@ -38986,7 +36291,6 @@ public class OperationLookup {
 ",
   "src/main/java/test/test/runtime/api/operation_config/Operations.java": "package test.test.runtime.api.operation_config;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Operations {
     /**
      * Returns an OperationConfig Builder with all values populated with the given value.
@@ -39004,13 +36308,12 @@ public class Operations {
 ",
   "src/main/java/test/test/runtime/auth/ApiKeyAuth.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -39024,7 +36327,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -39085,13 +36387,12 @@ public class ApiKeyAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/Authentication.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -39122,13 +36423,12 @@ public interface Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBasicAuth.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -39180,13 +36480,12 @@ public class HttpBasicAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBearerAuth.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -39200,7 +36499,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
@@ -39244,13 +36542,12 @@ public class HttpBearerAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -39269,7 +36566,6 @@ import javax.ws.rs.core.GenericType;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -39395,13 +36691,12 @@ public abstract class AbstractOpenApiSchema {
 ",
   "src/main/java/test/test/runtime/model/InlineEnum200Response.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -39410,6 +36705,7 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.InlineEnum200ResponseCategoryEnum;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
@@ -39417,24 +36713,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -39442,64 +36760,16 @@ import test.test.runtime.JSON;
  * InlineEnum200Response
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class InlineEnum200Response {
-  /**
-   * Gets or Sets category
-   */
-  @JsonAdapter(CategoryEnum.Adapter.class)
-  public enum CategoryEnum {
-    FRUIT("fruit"),
-    
-    VEGETABLE("vegetable");
-
-    private String value;
-
-    CategoryEnum(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static CategoryEnum fromValue(String value) {
-      for (CategoryEnum b : CategoryEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<CategoryEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final CategoryEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public CategoryEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return CategoryEnum.fromValue(value);
-      }
-    }
-  }
-
   public static final String SERIALIZED_NAME_CATEGORY = "category";
   @SerializedName(SERIALIZED_NAME_CATEGORY)
-  private CategoryEnum category;
+  private InlineEnum200ResponseCategoryEnum category;
 
   public InlineEnum200Response() {
   }
 
-  public InlineEnum200Response category(CategoryEnum category) {
-    
+  public InlineEnum200Response category(InlineEnum200ResponseCategoryEnum category) {
+
     this.category = category;
     return this;
   }
@@ -39509,18 +36779,16 @@ public class InlineEnum200Response {
    * @return category
   **/
   @javax.annotation.Nullable
-
-  public CategoryEnum getCategory() {
+  public InlineEnum200ResponseCategoryEnum getCategory() {
     return category;
   }
 
 
-  public void setCategory(CategoryEnum category) {
+  public void setCategory(InlineEnum200ResponseCategoryEnum category) {
     this.category = category;
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -39531,6 +36799,7 @@ public class InlineEnum200Response {
     }
     InlineEnum200Response inlineEnum200Response = (InlineEnum200Response) o;
     return Objects.equals(this.category, inlineEnum200Response.category);
+        
   }
 
   @Override
@@ -39591,8 +36860,9 @@ public class InlineEnum200Response {
           throw new IllegalArgumentException(String.format("The field \`%s\` in the JSON string is not defined in the \`InlineEnum200Response\` properties. JSON: %s", entry.getKey(), jsonObj.toString()));
         }
       }
-      if ((jsonObj.get("category") != null && !jsonObj.get("category").isJsonNull()) && !jsonObj.get("category").isJsonPrimitive()) {
-        throw new IllegalArgumentException(String.format("Expected the field \`category\` to be a primitive type in the JSON string but got \`%s\`", jsonObj.get("category").toString()));
+      // validate the optional field \`category\`
+      if (jsonObj.get("category") != null && !jsonObj.get("category").isJsonNull()) {
+        InlineEnum200ResponseCategoryEnum.validateJsonObject(jsonObj.getAsJsonObject("category"));
       }
   }
 
@@ -39645,17 +36915,129 @@ public class InlineEnum200Response {
     return JSON.getGson().toJson(this);
   }
 }
+",
+  "src/main/java/test/test/runtime/model/InlineEnum200ResponseCategoryEnum.java": "/*
+ * Edge Cases
+ * 
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated.
+ * Do not edit the class manually.
+ */
+
+
+package test.test.runtime.model;
 
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
+import test.test.runtime.JSON;
+
+/**
+ * Gets or Sets InlineEnum200ResponseCategoryEnum
+ */
+@JsonAdapter(InlineEnum200ResponseCategoryEnum.Adapter.class)
+public enum InlineEnum200ResponseCategoryEnum {
+
+  FRUIT("fruit"),
+
+  VEGETABLE("vegetable");
+
+  private String value;
+
+  InlineEnum200ResponseCategoryEnum(String value) {
+    this.value = value;
+  }
+
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  public static InlineEnum200ResponseCategoryEnum fromValue(String value) {
+    for (InlineEnum200ResponseCategoryEnum b : InlineEnum200ResponseCategoryEnum.values()) {
+      if (b.value.equals(value)) {
+        return b;
+      }
+    }
+    throw new IllegalArgumentException("Unexpected value '" + value + "'");
+  }
+
+  public static class Adapter extends TypeAdapter<InlineEnum200ResponseCategoryEnum> {
+    @Override
+    public void write(final JsonWriter jsonWriter, final InlineEnum200ResponseCategoryEnum enumeration) throws IOException {
+      jsonWriter.value(enumeration.getValue());
+    }
+
+    @Override
+    public InlineEnum200ResponseCategoryEnum read(final JsonReader jsonReader) throws IOException {
+      String value = jsonReader.nextString();
+      return InlineEnum200ResponseCategoryEnum.fromValue(value);
+    }
+  }
+}
 ",
   "src/main/java/test/test/runtime/model/MyEnum.java": "/*
  * Edge Cases
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -39664,24 +37046,66 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
 
 import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
 import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
+import test.test.runtime.JSON;
 
 /**
  * Gets or Sets MyEnum
  */
 @JsonAdapter(MyEnum.Adapter.class)
 public enum MyEnum {
-  
+
   ONE("one"),
-  
+
   TWO("two"),
-  
+
   THREE("three");
 
   private String value;
@@ -39721,140 +37145,13 @@ public enum MyEnum {
     }
   }
 }
-
 ",
 }
 `;
 
 exports[`Java Client Code Generation Script Unit Tests Generates With multiple-tags.yaml 1`] = `
 {
-  ".github/workflows/maven.yml": "# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-#
-# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  build:
-    name: Build Multiple Tags Test
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8' ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: \${{ matrix.java }}
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
-",
-  ".gitignore": "*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
-",
-  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
-",
-  ".openapi-generator/FILES": ".github/workflows/maven.yml
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/DefaultApi.md
-docs/Tag1Api.md
-docs/Tag2Api.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
-src/main/java/test/test/runtime/ApiCallback.java
-src/main/java/test/test/runtime/ApiClient.java
-src/main/java/test/test/runtime/ApiException.java
-src/main/java/test/test/runtime/ApiResponse.java
-src/main/java/test/test/runtime/Configuration.java
-src/main/java/test/test/runtime/GzipRequestInterceptor.java
-src/main/java/test/test/runtime/JSON.java
-src/main/java/test/test/runtime/Pair.java
-src/main/java/test/test/runtime/ProgressRequestBody.java
-src/main/java/test/test/runtime/ProgressResponseBody.java
-src/main/java/test/test/runtime/ServerConfiguration.java
-src/main/java/test/test/runtime/ServerVariable.java
-src/main/java/test/test/runtime/StringUtil.java
-src/main/java/test/test/runtime/__handlers.java
-src/main/java/test/test/runtime/__interceptors.java
-src/main/java/test/test/runtime/api/DefaultApi.java
-src/main/java/test/test/runtime/api/Tag1Api.java
-src/main/java/test/test/runtime/api/Tag2Api.java
-src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
-src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
-src/main/java/test/test/runtime/api/operation_config/Operations.java
-src/main/java/test/test/runtime/auth/ApiKeyAuth.java
-src/main/java/test/test/runtime/auth/Authentication.java
-src/main/java/test/test/runtime/auth/HttpBasicAuth.java
-src/main/java/test/test/runtime/auth/HttpBearerAuth.java
-src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
-src/test/java/test/test/runtime/api/DefaultApiTest.java
-src/test/java/test/test/runtime/api/Tag1ApiTest.java
-src/test/java/test/test/runtime/api/Tag2ApiTest.java
-src/main/java/test/test/runtime/api/handlers/Handlers.java
+  ".tsapi-manifest": "src/main/java/test/test/runtime/api/handlers/Handlers.java
 src/main/java/test/test/runtime/api/handlers/Response.java
 src/main/java/test/test/runtime/api/handlers/ApiResponse.java
 src/main/java/test/test/runtime/api/handlers/Interceptor.java
@@ -39894,475 +37191,39 @@ src/main/java/test/test/runtime/api/interceptors/ResponseHeadersInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/LoggingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/TracingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/MetricsInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java",
-  ".openapi-generator/VERSION": "6.3.0",
-  ".pdk/dynamic-files/openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
-  "README.md": "# com.aws.pdk.test
-
-Multiple Tags Test
-- API version: 1.0.0
-
-No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
-
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
-
-## Requirements
-
-Building the API client library requires:
-1. Java 1.8+
-2. Maven (3.8.3+)/Gradle (7.2+)
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-\`\`\`shell
-mvn clean install
-\`\`\`
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-\`\`\`shell
-mvn clean deploy
-\`\`\`
-
-Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-\`\`\`xml
-<dependency>
-  <groupId>test</groupId>
-  <artifactId>com.aws.pdk.test</artifactId>
-  <version>1.0.0</version>
-  <scope>compile</scope>
-</dependency>
-\`\`\`
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-\`\`\`groovy
-  repositories {
-    mavenCentral()     // Needed if the 'com.aws.pdk.test' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'com.aws.pdk.test' jar has been published to the local maven repo.
-  }
-
-  dependencies {
-     implementation "test:com.aws.pdk.test:1.0.0"
-  }
-\`\`\`
-
-### Others
-
-At first generate the JAR by executing:
-
-\`\`\`shell
-mvn clean package
-\`\`\`
-
-Then manually install the following JARs:
-
-* \`target/com.aws.pdk.test-1.0.0.jar\`
-* \`target/lib/*.jar\`
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following Java code:
-
-\`\`\`java
-
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      apiInstance.neither()
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#neither");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-
-\`\`\`
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://localhost*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*DefaultApi* | [**neither**](docs/DefaultApi.md#neither) | **GET** /neither | 
-*Tag1Api* | [**both**](docs/Tag1Api.md#both) | **GET** /both | 
-*Tag1Api* | [**tag1**](docs/Tag1Api.md#tag1) | **GET** /tag1 | 
-*Tag2Api* | [**tag2**](docs/Tag2Api.md#tag2) | **GET** /tag2 | 
-
-
-## Documentation for Models
-
-
-
-## Documentation for Authorization
-
-All endpoints do not require authorization.
-Authentication schemes defined for the API:
-
-## Recommendation
-
-It's recommended to create an instance of \`ApiClient\` per thread in a multithreaded environment to avoid any potential issues.
-
-## Author
-
-
-
-",
-  "api/openapi.yaml": "openapi: 3.0.3
-info:
-  title: Multiple Tags Test
-  version: 1.0.0
-servers:
-- url: /
-paths:
-  /tag1:
-    get:
-      operationId: tag1
-      responses:
-        "200":
-          description: Ok
-      tags:
-      - tag1
-      x-accepts: application/json
-  /tag2:
-    get:
-      operationId: tag2
-      responses:
-        "200":
-          description: Ok
-      tags:
-      - tag2
-      x-accepts: application/json
-  /both:
-    get:
-      operationId: both
-      responses:
-        "200":
-          description: Ok
-      tags:
-      - tag1
-      x-accepts: application/json
-  /neither:
-    get:
-      operationId: neither
-      responses:
-        "200":
-          description: Ok
-      x-accepts: application/json
-components:
-  schemas: {}
-
-",
-  "docs/DefaultApi.md": "# DefaultApi
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**neither**](DefaultApi.md#neither) | **GET** /neither |  |
-
-
-<a name="neither"></a>
-# **neither**
-> neither().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      apiInstance.neither()
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#neither");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Ok |  -  |
-
-",
-  "docs/Tag1Api.md": "# Tag1Api
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**both**](Tag1Api.md#both) | **GET** /both |  |
-| [**tag1**](Tag1Api.md#tag1) | **GET** /tag1 |  |
-
-
-<a name="both"></a>
-# **both**
-> both().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.Tag1Api;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    Tag1Api apiInstance = new Tag1Api(defaultClient);
-    try {
-      apiInstance.both()
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling Tag1Api#both");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Ok |  -  |
-
-<a name="tag1"></a>
-# **tag1**
-> tag1().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.Tag1Api;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    Tag1Api apiInstance = new Tag1Api(defaultClient);
-    try {
-      apiInstance.tag1()
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling Tag1Api#tag1");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Ok |  -  |
-
-",
-  "docs/Tag2Api.md": "# Tag2Api
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**tag2**](Tag2Api.md#tag2) | **GET** /tag2 |  |
-
-
-<a name="tag2"></a>
-# **tag2**
-> tag2().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.Tag2Api;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    Tag2Api apiInstance = new Tag2Api(defaultClient);
-    try {
-      apiInstance.tag2()
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling Tag2Api#tag2");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Ok |  -  |
-
-",
-  "openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
+src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java
+src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
+src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
+src/main/java/test/test/runtime/api/operation_config/Operations.java
+src/main/java/test/test/runtime/api/DefaultApi.java
+src/main/java/test/test/runtime/api/Tag1Api.java
+src/main/java/test/test/runtime/api/Tag2Api.java
+src/main/java/test/test/runtime/auth/ApiKeyAuth.java
+src/main/java/test/test/runtime/auth/Authentication.java
+src/main/java/test/test/runtime/auth/HttpBasicAuth.java
+src/main/java/test/test/runtime/auth/HttpBearerAuth.java
+src/main/java/test/test/runtime/ApiCallback.java
+src/main/java/test/test/runtime/ApiClient.java
+src/main/java/test/test/runtime/ApiException.java
+src/main/java/test/test/runtime/ApiResponse.java
+src/main/java/test/test/runtime/Configuration.java
+src/main/java/test/test/runtime/GzipRequestInterceptor.java
+src/main/java/test/test/runtime/JSON.java
+src/main/java/test/test/runtime/Pair.java
+src/main/java/test/test/runtime/ProgressRequestBody.java
+src/main/java/test/test/runtime/ProgressResponseBody.java
+src/main/java/test/test/runtime/ServerConfiguration.java
+src/main/java/test/test/runtime/ServerVariable.java
+src/main/java/test/test/runtime/StringUtil.java
+src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java",
   "src/main/java/test/test/runtime/ApiCallback.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -40419,13 +37280,12 @@ public interface ApiCallback<T> {
 ",
   "src/main/java/test/test/runtime/ApiClient.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -40557,7 +37417,7 @@ public class ApiClient {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/1.0.0/java");
+        setUserAgent("OpenAPI-Generator/0.0.0/java");
 
         authentications = new HashMap<String, Authentication>();
     }
@@ -41809,10 +38669,10 @@ public class ApiClient {
     /**
      * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
      *
-     * @param mpBuilder MultipartBody.Builder 
+     * @param mpBuilder MultipartBody.Builder
      * @param key The key of the Header element
      * @param file The file to add to the Header
-     */ 
+     */
     private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
         Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\\"" + key + "\\"; filename=\\"" + file.getName() + "\\"");
         MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
@@ -41966,13 +38826,12 @@ public class ApiClient {
 ",
   "src/main/java/test/test/runtime/ApiException.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -41988,12 +38847,11 @@ import javax.ws.rs.core.GenericType;
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
- 
+
     /**
      * <p>Constructor for ApiException.</p>
      */
@@ -42133,13 +38991,12 @@ public class ApiException extends Exception {
 ",
   "src/main/java/test/test/runtime/ApiResponse.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -42192,7 +39049,7 @@ public class ApiResponse<T> {
     /**
      * <p>Get the <code>headers</code>.</p>
      *
-     * @return a {@link java.util.Map} of headers 
+     * @return a {@link java.util.Map} of headers
      */
     public Map<String, List<String>> getHeaders() {
         return headers;
@@ -42210,20 +39067,18 @@ public class ApiResponse<T> {
 ",
   "src/main/java/test/test/runtime/Configuration.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
@@ -42250,13 +39105,12 @@ public class Configuration {
 ",
   "src/main/java/test/test/runtime/GzipRequestInterceptor.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -42336,13 +39190,12 @@ class GzipRequestInterceptor implements Interceptor {
 ",
   "src/main/java/test/test/runtime/JSON.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -42737,20 +39590,18 @@ public class JSON {
 ",
   "src/main/java/test/test/runtime/Pair.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
@@ -42795,13 +39646,12 @@ public class Pair {
 ",
   "src/main/java/test/test/runtime/ProgressRequestBody.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -42869,13 +39719,12 @@ public class ProgressRequestBody extends RequestBody {
 ",
   "src/main/java/test/test/runtime/ProgressResponseBody.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -43023,13 +39872,12 @@ public class ServerVariable {
 ",
   "src/main/java/test/test/runtime/StringUtil.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -43039,7 +39887,6 @@ package test.test.runtime;
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -43107,13 +39954,12 @@ public class StringUtil {
 ",
   "src/main/java/test/test/runtime/api/DefaultApi.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -43134,6 +39980,8 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 
+import java.math.BigDecimal;
+import java.io.File;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -43222,18 +40070,19 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call neitherValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return neitherCall(_callback);
 
     }
 
-
     private ApiResponse<Void> neitherWithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = neitherValidateBeforeCall(null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call neitherAsync(final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = neitherValidateBeforeCall(_callback);
@@ -43314,20 +40163,21 @@ public class DefaultApi {
         <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIneitherRequest neither() {
         return new APIneitherRequest();
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/Tag1Api.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -43348,6 +40198,8 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 
+import java.math.BigDecimal;
+import java.io.File;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -43436,18 +40288,19 @@ public class Tag1Api {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call bothValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return bothCall(_callback);
 
     }
 
-
     private ApiResponse<Void> bothWithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = bothValidateBeforeCall(null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call bothAsync(final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = bothValidateBeforeCall(_callback);
@@ -43528,6 +40381,7 @@ public class Tag1Api {
         <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIbothRequest both() {
         return new APIbothRequest();
     }
@@ -43574,18 +40428,19 @@ public class Tag1Api {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call tag1ValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return tag1Call(_callback);
 
     }
 
-
     private ApiResponse<Void> tag1WithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = tag1ValidateBeforeCall(null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call tag1Async(final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = tag1ValidateBeforeCall(_callback);
@@ -43666,20 +40521,21 @@ public class Tag1Api {
         <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
      </table>
      */
+    
     public APItag1Request tag1() {
         return new APItag1Request();
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/Tag2Api.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -43700,6 +40556,8 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 
+import java.math.BigDecimal;
+import java.io.File;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -43788,18 +40646,19 @@ public class Tag2Api {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call tag2ValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return tag2Call(_callback);
 
     }
 
-
     private ApiResponse<Void> tag2WithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = tag2ValidateBeforeCall(null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call tag2Async(final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = tag2ValidateBeforeCall(_callback);
@@ -43880,10 +40739,12 @@ public class Tag2Api {
         <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
      </table>
      */
+    
     public APItag2Request tag2() {
         return new APItag2Request();
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/handlers/ApiResponse.java": "
 package test.test.runtime.api.handlers;
@@ -44075,10 +40936,8 @@ import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-
 import test.test.runtime.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Handlers {
 
     static {
@@ -45067,8 +41926,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the Both operation
  */
@@ -45468,8 +42330,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the Neither operation
  */
@@ -45869,8 +42734,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the Tag1 operation
  */
@@ -46270,8 +43138,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the Tag2 operation
  */
@@ -46650,12 +43521,10 @@ public class TracingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 
 import test.test.runtime.model.*;
 
-
 import java.util.HashMap;
 import java.util.Map;
 
 // Generic type for object "keyed" by operation names
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @lombok.Builder @lombok.Getter
 public class OperationConfig<T> {
     private T neither;
@@ -46677,7 +43546,6 @@ public class OperationConfig<T> {
 
 import test.test.runtime.model.*;
 
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
@@ -46685,7 +43553,6 @@ import java.util.Arrays;
 
 
 // Look up path and http method for a given operation name
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OperationLookup {
     @lombok.Builder @lombok.Getter
     public static class OperationLookupEntry {
@@ -46727,7 +43594,6 @@ public class OperationLookup {
 ",
   "src/main/java/test/test/runtime/api/operation_config/Operations.java": "package test.test.runtime.api.operation_config;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Operations {
     /**
      * Returns an OperationConfig Builder with all values populated with the given value.
@@ -46746,13 +43612,12 @@ public class Operations {
 ",
   "src/main/java/test/test/runtime/auth/ApiKeyAuth.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -46766,7 +43631,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -46827,13 +43691,12 @@ public class ApiKeyAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/Authentication.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -46864,13 +43727,12 @@ public interface Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBasicAuth.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -46922,13 +43784,12 @@ public class HttpBasicAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBearerAuth.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -46942,7 +43803,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
@@ -46986,13 +43846,12 @@ public class HttpBearerAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java": "/*
  * Multiple Tags Test
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -47011,7 +43870,6 @@ import javax.ws.rs.core.GenericType;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -47140,130 +43998,7 @@ public abstract class AbstractOpenApiSchema {
 
 exports[`Java Client Code Generation Script Unit Tests Generates With parameter-refs.yaml 1`] = `
 {
-  ".github/workflows/maven.yml": "# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-#
-# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  build:
-    name: Build Example API
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8' ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: \${{ matrix.java }}
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
-",
-  ".gitignore": "*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
-",
-  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
-",
-  ".openapi-generator/FILES": ".github/workflows/maven.yml
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/DefaultApi.md
-docs/HelloResponse.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
-src/main/java/test/test/runtime/ApiCallback.java
-src/main/java/test/test/runtime/ApiClient.java
-src/main/java/test/test/runtime/ApiException.java
-src/main/java/test/test/runtime/ApiResponse.java
-src/main/java/test/test/runtime/Configuration.java
-src/main/java/test/test/runtime/GzipRequestInterceptor.java
-src/main/java/test/test/runtime/JSON.java
-src/main/java/test/test/runtime/Pair.java
-src/main/java/test/test/runtime/ProgressRequestBody.java
-src/main/java/test/test/runtime/ProgressResponseBody.java
-src/main/java/test/test/runtime/ServerConfiguration.java
-src/main/java/test/test/runtime/ServerVariable.java
-src/main/java/test/test/runtime/StringUtil.java
-src/main/java/test/test/runtime/__handlers.java
-src/main/java/test/test/runtime/__interceptors.java
-src/main/java/test/test/runtime/api/DefaultApi.java
-src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
-src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
-src/main/java/test/test/runtime/api/operation_config/Operations.java
-src/main/java/test/test/runtime/auth/ApiKeyAuth.java
-src/main/java/test/test/runtime/auth/Authentication.java
-src/main/java/test/test/runtime/auth/HttpBasicAuth.java
-src/main/java/test/test/runtime/auth/HttpBearerAuth.java
-src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
-src/main/java/test/test/runtime/model/HelloResponse.java
-src/test/java/test/test/runtime/api/DefaultApiTest.java
-src/test/java/test/test/runtime/model/HelloResponseTest.java
-src/main/java/test/test/runtime/api/handlers/Handlers.java
+  ".tsapi-manifest": "src/main/java/test/test/runtime/api/handlers/Handlers.java
 src/main/java/test/test/runtime/api/handlers/Response.java
 src/main/java/test/test/runtime/api/handlers/ApiResponse.java
 src/main/java/test/test/runtime/api/handlers/Interceptor.java
@@ -47285,315 +44020,38 @@ src/main/java/test/test/runtime/api/interceptors/ResponseHeadersInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/LoggingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/TracingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/MetricsInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java",
-  ".openapi-generator/VERSION": "6.3.0",
-  ".pdk/dynamic-files/openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
-  "README.md": "# com.aws.pdk.test
-
-Example API
-- API version: 1.0.0
-
-No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
-
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
-
-## Requirements
-
-Building the API client library requires:
-1. Java 1.8+
-2. Maven (3.8.3+)/Gradle (7.2+)
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-\`\`\`shell
-mvn clean install
-\`\`\`
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-\`\`\`shell
-mvn clean deploy
-\`\`\`
-
-Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-\`\`\`xml
-<dependency>
-  <groupId>test</groupId>
-  <artifactId>com.aws.pdk.test</artifactId>
-  <version>1.0.0</version>
-  <scope>compile</scope>
-</dependency>
-\`\`\`
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-\`\`\`groovy
-  repositories {
-    mavenCentral()     // Needed if the 'com.aws.pdk.test' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'com.aws.pdk.test' jar has been published to the local maven repo.
-  }
-
-  dependencies {
-     implementation "test:com.aws.pdk.test:1.0.0"
-  }
-\`\`\`
-
-### Others
-
-At first generate the JAR by executing:
-
-\`\`\`shell
-mvn clean package
-\`\`\`
-
-Then manually install the following JARs:
-
-* \`target/com.aws.pdk.test-1.0.0.jar\`
-* \`target/lib/*.jar\`
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following Java code:
-
-\`\`\`java
-
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    String id = "id_example"; // String | 
-    try {
-      HelloResponse result = apiInstance.sayHello()
-            .id(id)
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#sayHello");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-
-\`\`\`
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://localhost*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*DefaultApi* | [**sayHello**](docs/DefaultApi.md#sayHello) | **GET** /hello | 
-
-
-## Documentation for Models
-
- - [HelloResponse](docs/HelloResponse.md)
-
-
-## Documentation for Authorization
-
-All endpoints do not require authorization.
-Authentication schemes defined for the API:
-
-## Recommendation
-
-It's recommended to create an instance of \`ApiClient\` per thread in a multithreaded environment to avoid any potential issues.
-
-## Author
-
-
-
-",
-  "api/openapi.yaml": "openapi: 3.0.3
-info:
-  title: Example API
-  version: 1.0.0
-servers:
-- url: /
-paths:
-  /hello:
-    get:
-      operationId: sayHello
-      parameters:
-      - explode: true
-        in: query
-        name: id
-        required: false
-        schema:
-          $ref: '#/components/schemas/HelloId'
-        style: form
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/HelloResponse'
-          description: Successful response
-      x-handler:
-        language: typescript
-      x-accepts: application/json
-components:
-  parameters:
-    HelloId:
-      explode: true
-      in: query
-      name: id
-      required: false
-      schema:
-        $ref: '#/components/schemas/HelloId'
-      style: form
-  schemas:
-    HelloId:
-      type: string
-    HelloResponse:
-      properties:
-        id:
-          type: string
-        message:
-          $ref: '#/components/schemas/HelloResponse'
-      required:
-      - id
-      type: object
-
-",
-  "docs/DefaultApi.md": "# DefaultApi
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**sayHello**](DefaultApi.md#sayHello) | **GET** /hello |  |
-
-
-<a name="sayHello"></a>
-# **sayHello**
-> HelloResponse sayHello().id(id).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    String id = "id_example"; // String | 
-    try {
-      HelloResponse result = apiInstance.sayHello()
-            .id(id)
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#sayHello");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **id** | **String**|  | [optional] |
-
-### Return type
-
-[**HelloResponse**](HelloResponse.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Successful response |  -  |
-
-",
-  "docs/HelloResponse.md": "
-
-# HelloResponse
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**id** | **String** |  |  |
-|**message** | [**HelloResponse**](HelloResponse.md) |  |  [optional] |
-
-
-
-",
-  "openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
+src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java
+src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
+src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
+src/main/java/test/test/runtime/api/operation_config/Operations.java
+src/main/java/test/test/runtime/api/DefaultApi.java
+src/main/java/test/test/runtime/auth/ApiKeyAuth.java
+src/main/java/test/test/runtime/auth/Authentication.java
+src/main/java/test/test/runtime/auth/HttpBasicAuth.java
+src/main/java/test/test/runtime/auth/HttpBearerAuth.java
+src/main/java/test/test/runtime/ApiCallback.java
+src/main/java/test/test/runtime/ApiClient.java
+src/main/java/test/test/runtime/ApiException.java
+src/main/java/test/test/runtime/ApiResponse.java
+src/main/java/test/test/runtime/Configuration.java
+src/main/java/test/test/runtime/GzipRequestInterceptor.java
+src/main/java/test/test/runtime/JSON.java
+src/main/java/test/test/runtime/Pair.java
+src/main/java/test/test/runtime/ProgressRequestBody.java
+src/main/java/test/test/runtime/ProgressResponseBody.java
+src/main/java/test/test/runtime/ServerConfiguration.java
+src/main/java/test/test/runtime/ServerVariable.java
+src/main/java/test/test/runtime/StringUtil.java
+src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
+src/main/java/test/test/runtime/model/HelloResponse.java",
   "src/main/java/test/test/runtime/ApiCallback.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -47650,13 +44108,12 @@ public interface ApiCallback<T> {
 ",
   "src/main/java/test/test/runtime/ApiClient.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -47788,7 +44245,7 @@ public class ApiClient {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/1.0.0/java");
+        setUserAgent("OpenAPI-Generator/0.0.0/java");
 
         authentications = new HashMap<String, Authentication>();
     }
@@ -49040,10 +45497,10 @@ public class ApiClient {
     /**
      * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
      *
-     * @param mpBuilder MultipartBody.Builder 
+     * @param mpBuilder MultipartBody.Builder
      * @param key The key of the Header element
      * @param file The file to add to the Header
-     */ 
+     */
     private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
         Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\\"" + key + "\\"; filename=\\"" + file.getName() + "\\"");
         MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
@@ -49197,13 +45654,12 @@ public class ApiClient {
 ",
   "src/main/java/test/test/runtime/ApiException.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -49219,12 +45675,11 @@ import javax.ws.rs.core.GenericType;
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
- 
+
     /**
      * <p>Constructor for ApiException.</p>
      */
@@ -49364,13 +45819,12 @@ public class ApiException extends Exception {
 ",
   "src/main/java/test/test/runtime/ApiResponse.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -49423,7 +45877,7 @@ public class ApiResponse<T> {
     /**
      * <p>Get the <code>headers</code>.</p>
      *
-     * @return a {@link java.util.Map} of headers 
+     * @return a {@link java.util.Map} of headers
      */
     public Map<String, List<String>> getHeaders() {
         return headers;
@@ -49441,20 +45895,18 @@ public class ApiResponse<T> {
 ",
   "src/main/java/test/test/runtime/Configuration.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
@@ -49481,13 +45933,12 @@ public class Configuration {
 ",
   "src/main/java/test/test/runtime/GzipRequestInterceptor.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -49567,13 +46018,12 @@ class GzipRequestInterceptor implements Interceptor {
 ",
   "src/main/java/test/test/runtime/JSON.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -49969,20 +46419,18 @@ public class JSON {
 ",
   "src/main/java/test/test/runtime/Pair.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
@@ -50027,13 +46475,12 @@ public class Pair {
 ",
   "src/main/java/test/test/runtime/ProgressRequestBody.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -50101,13 +46548,12 @@ public class ProgressRequestBody extends RequestBody {
 ",
   "src/main/java/test/test/runtime/ProgressResponseBody.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -50255,13 +46701,12 @@ public class ServerVariable {
 ",
   "src/main/java/test/test/runtime/StringUtil.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -50271,7 +46716,6 @@ package test.test.runtime;
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -50339,13 +46783,12 @@ public class StringUtil {
 ",
   "src/main/java/test/test/runtime/api/DefaultApi.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -50366,6 +46809,8 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 
+import java.math.BigDecimal;
+import java.io.File;
 import test.test.runtime.model.HelloResponse;
 
 import java.lang.reflect.Type;
@@ -50460,19 +46905,20 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call sayHelloValidateBeforeCall(String id, final ApiCallback _callback) throws ApiException {
         return sayHelloCall(id, _callback);
 
     }
 
-
     private ApiResponse<HelloResponse> sayHelloWithHttpInfo(String id) throws ApiException {
         okhttp3.Call localVarCall = sayHelloValidateBeforeCall(id, null);
         Type localVarReturnType = new TypeToken<HelloResponse>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call sayHelloAsync(String id, final ApiCallback<HelloResponse> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = sayHelloValidateBeforeCall(id, _callback);
@@ -50567,10 +47013,12 @@ public class DefaultApi {
         <tr><td> 200 </td><td> Successful response </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIsayHelloRequest sayHello() {
         return new APIsayHelloRequest();
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/handlers/ApiResponse.java": "
 package test.test.runtime.api.handlers;
@@ -50720,11 +47168,8 @@ import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-import test.test.runtime.model.HelloResponse;
-
 import test.test.runtime.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Handlers {
 
     static {
@@ -51716,8 +48161,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the SayHello operation
  */
@@ -52101,13 +48549,10 @@ public class TracingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.HelloResponse;
-
 import java.util.HashMap;
 import java.util.Map;
 
 // Generic type for object "keyed" by operation names
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @lombok.Builder @lombok.Getter
 public class OperationConfig<T> {
     private T sayHello;
@@ -52123,8 +48568,6 @@ public class OperationConfig<T> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.HelloResponse;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
@@ -52132,7 +48575,6 @@ import java.util.Arrays;
 
 
 // Look up path and http method for a given operation name
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OperationLookup {
     @lombok.Builder @lombok.Getter
     public static class OperationLookupEntry {
@@ -52159,7 +48601,6 @@ public class OperationLookup {
 ",
   "src/main/java/test/test/runtime/api/operation_config/Operations.java": "package test.test.runtime.api.operation_config;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Operations {
     /**
      * Returns an OperationConfig Builder with all values populated with the given value.
@@ -52175,13 +48616,12 @@ public class Operations {
 ",
   "src/main/java/test/test/runtime/auth/ApiKeyAuth.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -52195,7 +48635,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -52256,13 +48695,12 @@ public class ApiKeyAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/Authentication.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -52293,13 +48731,12 @@ public interface Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBasicAuth.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -52351,13 +48788,12 @@ public class HttpBasicAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBearerAuth.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -52371,7 +48807,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
@@ -52415,13 +48850,12 @@ public class HttpBearerAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -52440,7 +48874,6 @@ import javax.ws.rs.core.GenericType;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -52566,13 +48999,12 @@ public abstract class AbstractOpenApiSchema {
 ",
   "src/main/java/test/test/runtime/model/HelloResponse.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -52581,6 +49013,7 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.HelloResponse;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
@@ -52588,24 +49021,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -52613,7 +49068,6 @@ import test.test.runtime.JSON;
  * HelloResponse
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HelloResponse {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
@@ -52627,7 +49081,7 @@ public class HelloResponse {
   }
 
   public HelloResponse id(String id) {
-    
+
     this.id = id;
     return this;
   }
@@ -52637,7 +49091,6 @@ public class HelloResponse {
    * @return id
   **/
   @javax.annotation.Nonnull
-
   public String getId() {
     return id;
   }
@@ -52647,9 +49100,8 @@ public class HelloResponse {
     this.id = id;
   }
 
-
   public HelloResponse message(HelloResponse message) {
-    
+
     this.message = message;
     return this;
   }
@@ -52659,7 +49111,6 @@ public class HelloResponse {
    * @return message
   **/
   @javax.annotation.Nullable
-
   public HelloResponse getMessage() {
     return message;
   }
@@ -52670,7 +49121,6 @@ public class HelloResponse {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -52682,6 +49132,7 @@ public class HelloResponse {
     HelloResponse helloResponse = (HelloResponse) o;
     return Objects.equals(this.id, helloResponse.id) &&
         Objects.equals(this.message, helloResponse.message);
+        
   }
 
   @Override
@@ -52810,152 +49261,13 @@ public class HelloResponse {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
 }
 `;
 
 exports[`Java Client Code Generation Script Unit Tests Generates With single.yaml 1`] = `
 {
-  ".github/workflows/maven.yml": "# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-#
-# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  build:
-    name: Build Example API
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8' ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: \${{ matrix.java }}
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
-",
-  ".gitignore": "*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
-",
-  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
-",
-  ".openapi-generator/FILES": ".github/workflows/maven.yml
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/ApiError.md
-docs/DefaultApi.md
-docs/MapResponse.md
-docs/MapResponseMapPropertyValue.md
-docs/TestRequest.md
-docs/TestResponse.md
-docs/TestResponseMessagesInner.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
-src/main/java/test/test/runtime/ApiCallback.java
-src/main/java/test/test/runtime/ApiClient.java
-src/main/java/test/test/runtime/ApiException.java
-src/main/java/test/test/runtime/ApiResponse.java
-src/main/java/test/test/runtime/Configuration.java
-src/main/java/test/test/runtime/GzipRequestInterceptor.java
-src/main/java/test/test/runtime/JSON.java
-src/main/java/test/test/runtime/Pair.java
-src/main/java/test/test/runtime/ProgressRequestBody.java
-src/main/java/test/test/runtime/ProgressResponseBody.java
-src/main/java/test/test/runtime/ServerConfiguration.java
-src/main/java/test/test/runtime/ServerVariable.java
-src/main/java/test/test/runtime/StringUtil.java
-src/main/java/test/test/runtime/__handlers.java
-src/main/java/test/test/runtime/__interceptors.java
-src/main/java/test/test/runtime/api/DefaultApi.java
-src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
-src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
-src/main/java/test/test/runtime/api/operation_config/Operations.java
-src/main/java/test/test/runtime/auth/ApiKeyAuth.java
-src/main/java/test/test/runtime/auth/Authentication.java
-src/main/java/test/test/runtime/auth/HttpBasicAuth.java
-src/main/java/test/test/runtime/auth/HttpBearerAuth.java
-src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
-src/main/java/test/test/runtime/model/ApiError.java
-src/main/java/test/test/runtime/model/MapResponse.java
-src/main/java/test/test/runtime/model/MapResponseMapPropertyValue.java
-src/main/java/test/test/runtime/model/TestRequest.java
-src/main/java/test/test/runtime/model/TestResponse.java
-src/main/java/test/test/runtime/model/TestResponseMessagesInner.java
-src/test/java/test/test/runtime/api/DefaultApiTest.java
-src/test/java/test/test/runtime/model/ApiErrorTest.java
-src/test/java/test/test/runtime/model/MapResponseMapPropertyValueTest.java
-src/test/java/test/test/runtime/model/MapResponseTest.java
-src/test/java/test/test/runtime/model/TestRequestTest.java
-src/test/java/test/test/runtime/model/TestResponseMessagesInnerTest.java
-src/test/java/test/test/runtime/model/TestResponseTest.java
-src/main/java/test/test/runtime/api/handlers/Handlers.java
+  ".tsapi-manifest": "src/main/java/test/test/runtime/api/handlers/Handlers.java
 src/main/java/test/test/runtime/api/handlers/Response.java
 src/main/java/test/test/runtime/api/handlers/ApiResponse.java
 src/main/java/test/test/runtime/api/handlers/Interceptor.java
@@ -53014,950 +49326,43 @@ src/main/java/test/test/runtime/api/interceptors/ResponseHeadersInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/LoggingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/TracingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/MetricsInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java",
-  ".openapi-generator/VERSION": "6.3.0",
-  ".pdk/dynamic-files/openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
-  "README.md": "# com.aws.pdk.test
-
-Example API
-- API version: 1.0.0
-
-No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
-
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
-
-## Requirements
-
-Building the API client library requires:
-1. Java 1.8+
-2. Maven (3.8.3+)/Gradle (7.2+)
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-\`\`\`shell
-mvn clean install
-\`\`\`
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-\`\`\`shell
-mvn clean deploy
-\`\`\`
-
-Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-\`\`\`xml
-<dependency>
-  <groupId>test</groupId>
-  <artifactId>com.aws.pdk.test</artifactId>
-  <version>1.0.0</version>
-  <scope>compile</scope>
-</dependency>
-\`\`\`
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-\`\`\`groovy
-  repositories {
-    mavenCentral()     // Needed if the 'com.aws.pdk.test' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'com.aws.pdk.test' jar has been published to the local maven repo.
-  }
-
-  dependencies {
-     implementation "test:com.aws.pdk.test:1.0.0"
-  }
-\`\`\`
-
-### Others
-
-At first generate the JAR by executing:
-
-\`\`\`shell
-mvn clean package
-\`\`\`
-
-Then manually install the following JARs:
-
-* \`target/com.aws.pdk.test-1.0.0.jar\`
-* \`target/lib/*.jar\`
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following Java code:
-
-\`\`\`java
-
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    Object body = null; // Object | 
-    try {
-      Object result = apiInstance.anyRequestResponse()
-            .body(body)
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#anyRequestResponse");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-
-\`\`\`
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://localhost*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*DefaultApi* | [**anyRequestResponse**](docs/DefaultApi.md#anyRequestResponse) | **PUT** /any-request-response | 
-*DefaultApi* | [**empty**](docs/DefaultApi.md#empty) | **PUT** /empty-response | 
-*DefaultApi* | [**mapResponse**](docs/DefaultApi.md#mapResponse) | **GET** /map-response | 
-*DefaultApi* | [**mediaTypes**](docs/DefaultApi.md#mediaTypes) | **POST** /different-media-type | 
-*DefaultApi* | [**multipleContentTypes**](docs/DefaultApi.md#multipleContentTypes) | **POST** /multiple-content-types | 
-*DefaultApi* | [**operationOne**](docs/DefaultApi.md#operationOne) | **POST** /path/{pathParam} | 
-*DefaultApi* | [**withoutOperationIdDelete**](docs/DefaultApi.md#withoutOperationIdDelete) | **DELETE** /without-operation-id | 
-
-
-## Documentation for Models
-
- - [ApiError](docs/ApiError.md)
- - [MapResponse](docs/MapResponse.md)
- - [MapResponseMapPropertyValue](docs/MapResponseMapPropertyValue.md)
- - [TestRequest](docs/TestRequest.md)
- - [TestResponse](docs/TestResponse.md)
- - [TestResponseMessagesInner](docs/TestResponseMessagesInner.md)
-
-
-## Documentation for Authorization
-
-All endpoints do not require authorization.
-Authentication schemes defined for the API:
-
-## Recommendation
-
-It's recommended to create an instance of \`ApiClient\` per thread in a multithreaded environment to avoid any potential issues.
-
-## Author
-
-
-
-",
-  "api/openapi.yaml": "openapi: 3.0.3
-info:
-  title: Example API
-  version: 1.0.0
-servers:
-- url: /
-paths:
-  /path/{pathParam}:
-    post:
-      operationId: operationOne
-      parameters:
-      - description: This is parameter 1
-        explode: true
-        in: query
-        name: param1
-        required: true
-        schema:
-          type: string
-        style: form
-      - description: This is parameter 2
-        explode: true
-        in: query
-        name: param2
-        required: true
-        schema:
-          items:
-            type: string
-          type: array
-        style: form
-      - explode: true
-        in: query
-        name: param3
-        required: true
-        schema:
-          type: number
-        style: form
-      - explode: true
-        in: query
-        name: param4
-        required: false
-        schema:
-          type: string
-        style: form
-      - explode: false
-        in: path
-        name: pathParam
-        required: true
-        schema:
-          type: string
-        style: simple
-      - description: This is a header parameter
-        explode: false
-        in: header
-        name: x-header-param
-        required: true
-        schema:
-          type: string
-        style: simple
-      - explode: false
-        in: header
-        name: x-multi-value-header-param
-        required: false
-        schema:
-          items:
-            type: string
-          type: array
-        style: simple
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TestRequest'
-        required: true
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TestResponse'
-          description: Successful response
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ApiError'
-          description: Error response
-      x-content-type: application/json
-      x-accepts: application/json
-  /without-operation-id:
-    delete:
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TestResponse'
-          description: Successful response
-      x-accepts: application/json
-  /empty-response:
-    put:
-      operationId: empty
-      responses:
-        "204":
-          description: No response body!
-      x-accepts: application/json
-  /map-response:
-    get:
-      operationId: mapResponse
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MapResponse'
-          description: Successful response
-      x-accepts: application/json
-  /any-request-response:
-    put:
-      operationId: anyRequestResponse
-      requestBody:
-        content:
-          application/json:
-            schema: {}
-      responses:
-        "200":
-          content:
-            application/json:
-              schema: {}
-          description: Any response
-      x-content-type: application/json
-      x-accepts: application/json
-  /different-media-type:
-    post:
-      operationId: mediaTypes
-      requestBody:
-        content:
-          application/pdf:
-            schema:
-              format: binary
-              type: string
-        required: true
-      responses:
-        "200":
-          content:
-            application/x-mpegurl:
-              schema:
-                type: string
-          description: Success
-      x-content-type: application/pdf
-      x-accepts: application/x-mpegurl
-  /multiple-content-types:
-    post:
-      operationId: multipleContentTypes
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TestRequest'
-          application/pdf:
-            schema:
-              format: binary
-              type: string
-        required: true
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                type: string
-          description: Success
-      x-content-type: application/json
-      x-accepts: application/json
-components:
-  schemas:
-    ApiError:
-      properties:
-        errorMessage:
-          type: string
-      required:
-      - errorMessage
-      type: object
-    TestRequest:
-      description: This is a test request
-      properties:
-        myInput:
-          type: number
-      type: object
-    TestResponse:
-      description: This is a test response
-      properties:
-        messages:
-          items:
-            $ref: '#/components/schemas/TestResponse_messages_inner'
-          type: array
-      required:
-      - messages
-      type: object
-    MapResponse:
-      properties:
-        mapProperty:
-          additionalProperties:
-            $ref: '#/components/schemas/MapResponse_mapProperty_value'
-          type: object
-      required:
-      - mapProperty
-      type: object
-    TestResponse_messages_inner:
-      properties:
-        message:
-          description: This is a message
-          type: string
-        id:
-          type: integer
-      required:
-      - id
-      type: object
-    MapResponse_mapProperty_value:
-      properties:
-        a:
-          type: string
-        b:
-          type: string
-      required:
-      - a
-      type: object
-
-",
-  "docs/ApiError.md": "
-
-# ApiError
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**errorMessage** | **String** |  |  |
-
-
-
-",
-  "docs/DefaultApi.md": "# DefaultApi
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**anyRequestResponse**](DefaultApi.md#anyRequestResponse) | **PUT** /any-request-response |  |
-| [**empty**](DefaultApi.md#empty) | **PUT** /empty-response |  |
-| [**mapResponse**](DefaultApi.md#mapResponse) | **GET** /map-response |  |
-| [**mediaTypes**](DefaultApi.md#mediaTypes) | **POST** /different-media-type |  |
-| [**multipleContentTypes**](DefaultApi.md#multipleContentTypes) | **POST** /multiple-content-types |  |
-| [**operationOne**](DefaultApi.md#operationOne) | **POST** /path/{pathParam} |  |
-| [**withoutOperationIdDelete**](DefaultApi.md#withoutOperationIdDelete) | **DELETE** /without-operation-id |  |
-
-
-<a name="anyRequestResponse"></a>
-# **anyRequestResponse**
-> Object anyRequestResponse().body(body).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    Object body = null; // Object | 
-    try {
-      Object result = apiInstance.anyRequestResponse()
-            .body(body)
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#anyRequestResponse");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **body** | **Object**|  | [optional] |
-
-### Return type
-
-**Object**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Any response |  -  |
-
-<a name="empty"></a>
-# **empty**
-> empty().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      apiInstance.empty()
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#empty");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **204** | No response body! |  -  |
-
-<a name="mapResponse"></a>
-# **mapResponse**
-> MapResponse mapResponse().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      MapResponse result = apiInstance.mapResponse()
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#mapResponse");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**MapResponse**](MapResponse.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Successful response |  -  |
-
-<a name="mediaTypes"></a>
-# **mediaTypes**
-> String mediaTypes(body).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    File body = new File("/path/to/file"); // File | 
-    try {
-      String result = apiInstance.mediaTypes(body)
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#mediaTypes");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **body** | **File**|  | |
-
-### Return type
-
-**String**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/pdf
- - **Accept**: application/x-mpegurl
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Success |  -  |
-
-<a name="multipleContentTypes"></a>
-# **multipleContentTypes**
-> String multipleContentTypes(testRequest).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    TestRequest testRequest = new TestRequest(); // TestRequest | 
-    try {
-      String result = apiInstance.multipleContentTypes(testRequest)
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#multipleContentTypes");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **testRequest** | [**TestRequest**](TestRequest.md)|  | |
-
-### Return type
-
-**String**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json, application/pdf
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Success |  -  |
-
-<a name="operationOne"></a>
-# **operationOne**
-> TestResponse operationOne(param1, param2, param3, pathParam, xHeaderParam, testRequest).param4(param4).xMultiValueHeaderParam(xMultiValueHeaderParam).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    String param1 = "param1_example"; // String | This is parameter 1
-    List<String> param2 = Arrays.asList(); // List<String> | This is parameter 2
-    BigDecimal param3 = new BigDecimal(78); // BigDecimal | 
-    String pathParam = "pathParam_example"; // String | 
-    String xHeaderParam = "xHeaderParam_example"; // String | This is a header parameter
-    TestRequest testRequest = new TestRequest(); // TestRequest | 
-    String param4 = "param4_example"; // String | 
-    List<String> xMultiValueHeaderParam = Arrays.asList(); // List<String> | 
-    try {
-      TestResponse result = apiInstance.operationOne(param1, param2, param3, pathParam, xHeaderParam, testRequest)
-            .param4(param4)
-            .xMultiValueHeaderParam(xMultiValueHeaderParam)
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#operationOne");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **param1** | **String**| This is parameter 1 | |
-| **param2** | [**List&lt;String&gt;**](String.md)| This is parameter 2 | |
-| **param3** | **BigDecimal**|  | |
-| **pathParam** | **String**|  | |
-| **xHeaderParam** | **String**| This is a header parameter | |
-| **testRequest** | [**TestRequest**](TestRequest.md)|  | |
-| **param4** | **String**|  | [optional] |
-| **xMultiValueHeaderParam** | [**List&lt;String&gt;**](String.md)|  | [optional] |
-
-### Return type
-
-[**TestResponse**](TestResponse.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Successful response |  -  |
-| **400** | Error response |  -  |
-
-<a name="withoutOperationIdDelete"></a>
-# **withoutOperationIdDelete**
-> TestResponse withoutOperationIdDelete().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      TestResponse result = apiInstance.withoutOperationIdDelete()
-            .execute();
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#withoutOperationIdDelete");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**TestResponse**](TestResponse.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Successful response |  -  |
-
-",
-  "docs/MapResponse.md": "
-
-# MapResponse
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**mapProperty** | [**Map&lt;String, MapResponseMapPropertyValue&gt;**](MapResponseMapPropertyValue.md) |  |  |
-
-
-
-",
-  "docs/MapResponseMapPropertyValue.md": "
-
-# MapResponseMapPropertyValue
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**a** | **String** |  |  |
-|**b** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/TestRequest.md": "
-
-# TestRequest
-
-This is a test request
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**myInput** | **BigDecimal** |  |  [optional] |
-
-
-
-",
-  "docs/TestResponse.md": "
-
-# TestResponse
-
-This is a test response
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**messages** | [**List&lt;TestResponseMessagesInner&gt;**](TestResponseMessagesInner.md) |  |  |
-
-
-
-",
-  "docs/TestResponseMessagesInner.md": "
-
-# TestResponseMessagesInner
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**message** | **String** | This is a message |  [optional] |
-|**id** | **Integer** |  |  |
-
-
-
-",
-  "openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
+src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java
+src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
+src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
+src/main/java/test/test/runtime/api/operation_config/Operations.java
+src/main/java/test/test/runtime/api/DefaultApi.java
+src/main/java/test/test/runtime/auth/ApiKeyAuth.java
+src/main/java/test/test/runtime/auth/Authentication.java
+src/main/java/test/test/runtime/auth/HttpBasicAuth.java
+src/main/java/test/test/runtime/auth/HttpBearerAuth.java
+src/main/java/test/test/runtime/ApiCallback.java
+src/main/java/test/test/runtime/ApiClient.java
+src/main/java/test/test/runtime/ApiException.java
+src/main/java/test/test/runtime/ApiResponse.java
+src/main/java/test/test/runtime/Configuration.java
+src/main/java/test/test/runtime/GzipRequestInterceptor.java
+src/main/java/test/test/runtime/JSON.java
+src/main/java/test/test/runtime/Pair.java
+src/main/java/test/test/runtime/ProgressRequestBody.java
+src/main/java/test/test/runtime/ProgressResponseBody.java
+src/main/java/test/test/runtime/ServerConfiguration.java
+src/main/java/test/test/runtime/ServerVariable.java
+src/main/java/test/test/runtime/StringUtil.java
+src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
+src/main/java/test/test/runtime/model/ApiError.java
+src/main/java/test/test/runtime/model/MapResponse.java
+src/main/java/test/test/runtime/model/MapResponseMapPropertyValue.java
+src/main/java/test/test/runtime/model/TestRequest.java
+src/main/java/test/test/runtime/model/TestResponse.java
+src/main/java/test/test/runtime/model/TestResponseMessagesInner.java",
   "src/main/java/test/test/runtime/ApiCallback.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -54014,13 +49419,12 @@ public interface ApiCallback<T> {
 ",
   "src/main/java/test/test/runtime/ApiClient.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -54152,7 +49556,7 @@ public class ApiClient {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/1.0.0/java");
+        setUserAgent("OpenAPI-Generator/0.0.0/java");
 
         authentications = new HashMap<String, Authentication>();
     }
@@ -55404,10 +50808,10 @@ public class ApiClient {
     /**
      * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
      *
-     * @param mpBuilder MultipartBody.Builder 
+     * @param mpBuilder MultipartBody.Builder
      * @param key The key of the Header element
      * @param file The file to add to the Header
-     */ 
+     */
     private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
         Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\\"" + key + "\\"; filename=\\"" + file.getName() + "\\"");
         MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
@@ -55561,13 +50965,12 @@ public class ApiClient {
 ",
   "src/main/java/test/test/runtime/ApiException.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -55583,12 +50986,11 @@ import javax.ws.rs.core.GenericType;
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
- 
+
     /**
      * <p>Constructor for ApiException.</p>
      */
@@ -55728,13 +51130,12 @@ public class ApiException extends Exception {
 ",
   "src/main/java/test/test/runtime/ApiResponse.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -55787,7 +51188,7 @@ public class ApiResponse<T> {
     /**
      * <p>Get the <code>headers</code>.</p>
      *
-     * @return a {@link java.util.Map} of headers 
+     * @return a {@link java.util.Map} of headers
      */
     public Map<String, List<String>> getHeaders() {
         return headers;
@@ -55805,20 +51206,18 @@ public class ApiResponse<T> {
 ",
   "src/main/java/test/test/runtime/Configuration.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
@@ -55845,13 +51244,12 @@ public class Configuration {
 ",
   "src/main/java/test/test/runtime/GzipRequestInterceptor.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -55931,13 +51329,12 @@ class GzipRequestInterceptor implements Interceptor {
 ",
   "src/main/java/test/test/runtime/JSON.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -56338,20 +51735,18 @@ public class JSON {
 ",
   "src/main/java/test/test/runtime/Pair.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
@@ -56396,13 +51791,12 @@ public class Pair {
 ",
   "src/main/java/test/test/runtime/ProgressRequestBody.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -56470,13 +51864,12 @@ public class ProgressRequestBody extends RequestBody {
 ",
   "src/main/java/test/test/runtime/ProgressResponseBody.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -56624,13 +52017,12 @@ public class ServerVariable {
 ",
   "src/main/java/test/test/runtime/StringUtil.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -56640,7 +52032,6 @@ package test.test.runtime;
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -56708,13 +52099,12 @@ public class StringUtil {
 ",
   "src/main/java/test/test/runtime/api/DefaultApi.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -56735,9 +52125,9 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 
-import test.test.runtime.model.ApiError;
 import java.math.BigDecimal;
 import java.io.File;
+import test.test.runtime.model.ApiError;
 import test.test.runtime.model.MapResponse;
 import test.test.runtime.model.TestRequest;
 import test.test.runtime.model.TestResponse;
@@ -56831,19 +52221,20 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call anyRequestResponseValidateBeforeCall(Object body, final ApiCallback _callback) throws ApiException {
         return anyRequestResponseCall(body, _callback);
 
     }
 
-
     private ApiResponse<Object> anyRequestResponseWithHttpInfo(Object body) throws ApiException {
         okhttp3.Call localVarCall = anyRequestResponseValidateBeforeCall(body, null);
         Type localVarReturnType = new TypeToken<Object>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call anyRequestResponseAsync(Object body, final ApiCallback<Object> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = anyRequestResponseValidateBeforeCall(body, _callback);
@@ -56938,6 +52329,7 @@ public class DefaultApi {
         <tr><td> 200 </td><td> Any response </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIanyRequestResponseRequest anyRequestResponse() {
         return new APIanyRequestResponseRequest();
     }
@@ -56984,18 +52376,19 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call emptyValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return emptyCall(_callback);
 
     }
 
-
     private ApiResponse<Void> emptyWithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = emptyValidateBeforeCall(null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call emptyAsync(final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = emptyValidateBeforeCall(_callback);
@@ -57076,6 +52469,7 @@ public class DefaultApi {
         <tr><td> 204 </td><td> No response body! </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIemptyRequest empty() {
         return new APIemptyRequest();
     }
@@ -57123,19 +52517,20 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call mapResponseValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return mapResponseCall(_callback);
 
     }
 
-
     private ApiResponse<MapResponse> mapResponseWithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = mapResponseValidateBeforeCall(null);
         Type localVarReturnType = new TypeToken<MapResponse>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call mapResponseAsync(final ApiCallback<MapResponse> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = mapResponseValidateBeforeCall(_callback);
@@ -57219,6 +52614,7 @@ public class DefaultApi {
         <tr><td> 200 </td><td> Successful response </td><td>  -  </td></tr>
      </table>
      */
+    
     public APImapResponseRequest mapResponse() {
         return new APImapResponseRequest();
     }
@@ -57267,6 +52663,7 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call mediaTypesValidateBeforeCall(File body, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'body' is set
@@ -57278,13 +52675,13 @@ public class DefaultApi {
 
     }
 
-
     private ApiResponse<String> mediaTypesWithHttpInfo(File body) throws ApiException {
         okhttp3.Call localVarCall = mediaTypesValidateBeforeCall(body, null);
         Type localVarReturnType = new TypeToken<String>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call mediaTypesAsync(File body, final ApiCallback<String> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = mediaTypesValidateBeforeCall(body, _callback);
@@ -57371,6 +52768,7 @@ public class DefaultApi {
         <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
      </table>
      */
+    
     public APImediaTypesRequest mediaTypes(File body) {
         return new APImediaTypesRequest(body);
     }
@@ -57420,6 +52818,7 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call multipleContentTypesValidateBeforeCall(TestRequest testRequest, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'testRequest' is set
@@ -57431,13 +52830,13 @@ public class DefaultApi {
 
     }
 
-
     private ApiResponse<String> multipleContentTypesWithHttpInfo(TestRequest testRequest) throws ApiException {
         okhttp3.Call localVarCall = multipleContentTypesValidateBeforeCall(testRequest, null);
         Type localVarReturnType = new TypeToken<String>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call multipleContentTypesAsync(TestRequest testRequest, final ApiCallback<String> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = multipleContentTypesValidateBeforeCall(testRequest, _callback);
@@ -57524,6 +52923,7 @@ public class DefaultApi {
         <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
      </table>
      */
+    
     public APImultipleContentTypesRequest multipleContentTypes(TestRequest testRequest) {
         return new APImultipleContentTypesRequest(testRequest);
     }
@@ -57597,6 +52997,7 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call operationOneValidateBeforeCall(String param1, List<String> param2, BigDecimal param3, String pathParam, String xHeaderParam, TestRequest testRequest, String param4, List<String> xMultiValueHeaderParam, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'param1' is set
@@ -57633,13 +53034,13 @@ public class DefaultApi {
 
     }
 
-
     private ApiResponse<TestResponse> operationOneWithHttpInfo(String param1, List<String> param2, BigDecimal param3, String pathParam, String xHeaderParam, TestRequest testRequest, String param4, List<String> xMultiValueHeaderParam) throws ApiException {
         okhttp3.Call localVarCall = operationOneValidateBeforeCall(param1, param2, param3, pathParam, xHeaderParam, testRequest, param4, xMultiValueHeaderParam, null);
         Type localVarReturnType = new TypeToken<TestResponse>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call operationOneAsync(String param1, List<String> param2, BigDecimal param3, String pathParam, String xHeaderParam, TestRequest testRequest, String param4, List<String> xMultiValueHeaderParam, final ApiCallback<TestResponse> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = operationOneValidateBeforeCall(param1, param2, param3, pathParam, xHeaderParam, testRequest, param4, xMultiValueHeaderParam, _callback);
@@ -57768,6 +53169,7 @@ public class DefaultApi {
         <tr><td> 400 </td><td> Error response </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIoperationOneRequest operationOne(String param1, List<String> param2, BigDecimal param3, String pathParam, String xHeaderParam, TestRequest testRequest) {
         return new APIoperationOneRequest(param1, param2, param3, pathParam, xHeaderParam, testRequest);
     }
@@ -57815,19 +53217,20 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "DELETE", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call withoutOperationIdDeleteValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return withoutOperationIdDeleteCall(_callback);
 
     }
 
-
     private ApiResponse<TestResponse> withoutOperationIdDeleteWithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = withoutOperationIdDeleteValidateBeforeCall(null);
         Type localVarReturnType = new TypeToken<TestResponse>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
+
     private okhttp3.Call withoutOperationIdDeleteAsync(final ApiCallback<TestResponse> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = withoutOperationIdDeleteValidateBeforeCall(_callback);
@@ -57911,10 +53314,12 @@ public class DefaultApi {
         <tr><td> 200 </td><td> Successful response </td><td>  -  </td></tr>
      </table>
      */
+    
     public APIwithoutOperationIdDeleteRequest withoutOperationIdDelete() {
         return new APIwithoutOperationIdDeleteRequest();
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/handlers/ApiResponse.java": "
 package test.test.runtime.api.handlers;
@@ -58148,16 +53553,8 @@ import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-import test.test.runtime.model.ApiError;
-import java.math.BigDecimal;
-import java.io.File;
-import test.test.runtime.model.MapResponse;
-import test.test.runtime.model.TestRequest;
-import test.test.runtime.model.TestResponse;
-
 import test.test.runtime.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Handlers {
 
     static {
@@ -59154,8 +54551,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the AnyRequestResponse operation
  */
@@ -59555,8 +54955,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the Empty operation
  */
@@ -59959,8 +55362,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the MapResponse operation
  */
@@ -60368,8 +55774,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the MediaTypes operation
  */
@@ -60781,8 +56190,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the MultipleContentTypes operation
  */
@@ -61276,8 +56688,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the OperationOne operation
  */
@@ -61715,8 +57130,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the WithoutOperationIdDelete operation
  */
@@ -62095,18 +57513,10 @@ public class TracingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.ApiError;
-import java.math.BigDecimal;
-import java.io.File;
-import test.test.runtime.model.MapResponse;
-import test.test.runtime.model.TestRequest;
-import test.test.runtime.model.TestResponse;
-
 import java.util.HashMap;
 import java.util.Map;
 
 // Generic type for object "keyed" by operation names
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @lombok.Builder @lombok.Getter
 public class OperationConfig<T> {
     private T anyRequestResponse;
@@ -62134,13 +57544,6 @@ public class OperationConfig<T> {
 
 import test.test.runtime.model.*;
 
-import test.test.runtime.model.ApiError;
-import java.math.BigDecimal;
-import java.io.File;
-import test.test.runtime.model.MapResponse;
-import test.test.runtime.model.TestRequest;
-import test.test.runtime.model.TestResponse;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
@@ -62148,7 +57551,6 @@ import java.util.Arrays;
 
 
 // Look up path and http method for a given operation name
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OperationLookup {
     @lombok.Builder @lombok.Getter
     public static class OperationLookupEntry {
@@ -62205,7 +57607,6 @@ public class OperationLookup {
 ",
   "src/main/java/test/test/runtime/api/operation_config/Operations.java": "package test.test.runtime.api.operation_config;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Operations {
     /**
      * Returns an OperationConfig Builder with all values populated with the given value.
@@ -62227,13 +57628,12 @@ public class Operations {
 ",
   "src/main/java/test/test/runtime/auth/ApiKeyAuth.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -62247,7 +57647,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -62308,13 +57707,12 @@ public class ApiKeyAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/Authentication.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -62345,13 +57743,12 @@ public interface Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBasicAuth.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -62403,13 +57800,12 @@ public class HttpBasicAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBearerAuth.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -62423,7 +57819,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
@@ -62467,13 +57862,12 @@ public class HttpBearerAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -62492,7 +57886,6 @@ import javax.ws.rs.core.GenericType;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -62618,13 +58011,12 @@ public abstract class AbstractOpenApiSchema {
 ",
   "src/main/java/test/test/runtime/model/ApiError.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -62640,24 +58032,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -62665,7 +58079,6 @@ import test.test.runtime.JSON;
  * ApiError
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiError {
   public static final String SERIALIZED_NAME_ERROR_MESSAGE = "errorMessage";
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
@@ -62675,7 +58088,7 @@ public class ApiError {
   }
 
   public ApiError errorMessage(String errorMessage) {
-    
+
     this.errorMessage = errorMessage;
     return this;
   }
@@ -62685,7 +58098,6 @@ public class ApiError {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-
   public String getErrorMessage() {
     return errorMessage;
   }
@@ -62696,7 +58108,6 @@ public class ApiError {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -62707,6 +58118,7 @@ public class ApiError {
     }
     ApiError apiError = (ApiError) o;
     return Objects.equals(this.errorMessage, apiError.errorMessage);
+        
   }
 
   @Override
@@ -62829,17 +58241,15 @@ public class ApiError {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/MapResponse.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -62848,34 +58258,54 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.MapResponseMapPropertyValue;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
-import test.test.runtime.model.MapResponseMapPropertyValue;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -62883,7 +58313,6 @@ import test.test.runtime.JSON;
  * MapResponse
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapResponse {
   public static final String SERIALIZED_NAME_MAP_PROPERTY = "mapProperty";
   @SerializedName(SERIALIZED_NAME_MAP_PROPERTY)
@@ -62893,7 +58322,7 @@ public class MapResponse {
   }
 
   public MapResponse mapProperty(Map<String, MapResponseMapPropertyValue> mapProperty) {
-    
+
     this.mapProperty = mapProperty;
     return this;
   }
@@ -62908,7 +58337,6 @@ public class MapResponse {
    * @return mapProperty
   **/
   @javax.annotation.Nonnull
-
   public Map<String, MapResponseMapPropertyValue> getMapProperty() {
     return mapProperty;
   }
@@ -62919,7 +58347,6 @@ public class MapResponse {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -62930,6 +58357,7 @@ public class MapResponse {
     }
     MapResponse mapResponse = (MapResponse) o;
     return Objects.equals(this.mapProperty, mapResponse.mapProperty);
+        
   }
 
   @Override
@@ -63049,17 +58477,15 @@ public class MapResponse {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/MapResponseMapPropertyValue.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -63075,24 +58501,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -63100,7 +58548,6 @@ import test.test.runtime.JSON;
  * MapResponseMapPropertyValue
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapResponseMapPropertyValue {
   public static final String SERIALIZED_NAME_A = "a";
   @SerializedName(SERIALIZED_NAME_A)
@@ -63114,7 +58561,7 @@ public class MapResponseMapPropertyValue {
   }
 
   public MapResponseMapPropertyValue a(String a) {
-    
+
     this.a = a;
     return this;
   }
@@ -63124,7 +58571,6 @@ public class MapResponseMapPropertyValue {
    * @return a
   **/
   @javax.annotation.Nonnull
-
   public String getA() {
     return a;
   }
@@ -63134,9 +58580,8 @@ public class MapResponseMapPropertyValue {
     this.a = a;
   }
 
-
   public MapResponseMapPropertyValue b(String b) {
-    
+
     this.b = b;
     return this;
   }
@@ -63146,7 +58591,6 @@ public class MapResponseMapPropertyValue {
    * @return b
   **/
   @javax.annotation.Nullable
-
   public String getB() {
     return b;
   }
@@ -63157,7 +58601,6 @@ public class MapResponseMapPropertyValue {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -63169,6 +58612,7 @@ public class MapResponseMapPropertyValue {
     MapResponseMapPropertyValue mapResponseMapPropertyValue = (MapResponseMapPropertyValue) o;
     return Objects.equals(this.a, mapResponseMapPropertyValue.a) &&
         Objects.equals(this.b, mapResponseMapPropertyValue.b);
+        
   }
 
   @Override
@@ -63296,17 +58740,15 @@ public class MapResponseMapPropertyValue {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/TestRequest.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -63321,26 +58763,47 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
 import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -63348,7 +58811,6 @@ import test.test.runtime.JSON;
  * This is a test request
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TestRequest {
   public static final String SERIALIZED_NAME_MY_INPUT = "myInput";
   @SerializedName(SERIALIZED_NAME_MY_INPUT)
@@ -63358,7 +58820,7 @@ public class TestRequest {
   }
 
   public TestRequest myInput(BigDecimal myInput) {
-    
+
     this.myInput = myInput;
     return this;
   }
@@ -63368,7 +58830,6 @@ public class TestRequest {
    * @return myInput
   **/
   @javax.annotation.Nullable
-
   public BigDecimal getMyInput() {
     return myInput;
   }
@@ -63379,7 +58840,6 @@ public class TestRequest {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -63390,6 +58850,7 @@ public class TestRequest {
     }
     TestRequest testRequest = (TestRequest) o;
     return Objects.equals(this.myInput, testRequest.myInput);
+        
   }
 
   @Override
@@ -63501,17 +58962,15 @@ public class TestRequest {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/TestResponse.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -63520,34 +58979,54 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.TestResponseMessagesInner;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.List;
-import test.test.runtime.model.TestResponseMessagesInner;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -63555,7 +59034,6 @@ import test.test.runtime.JSON;
  * This is a test response
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TestResponse {
   public static final String SERIALIZED_NAME_MESSAGES = "messages";
   @SerializedName(SERIALIZED_NAME_MESSAGES)
@@ -63565,7 +59043,7 @@ public class TestResponse {
   }
 
   public TestResponse messages(List<TestResponseMessagesInner> messages) {
-    
+
     this.messages = messages;
     return this;
   }
@@ -63580,7 +59058,6 @@ public class TestResponse {
    * @return messages
   **/
   @javax.annotation.Nonnull
-
   public List<TestResponseMessagesInner> getMessages() {
     return messages;
   }
@@ -63591,7 +59068,6 @@ public class TestResponse {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -63602,6 +59078,7 @@ public class TestResponse {
     }
     TestResponse testResponse = (TestResponse) o;
     return Objects.equals(this.messages, testResponse.messages);
+        
   }
 
   @Override
@@ -63731,17 +59208,15 @@ public class TestResponse {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/TestResponseMessagesInner.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -63757,24 +59232,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -63782,7 +59279,6 @@ import test.test.runtime.JSON;
  * TestResponseMessagesInner
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TestResponseMessagesInner {
   public static final String SERIALIZED_NAME_MESSAGE = "message";
   @SerializedName(SERIALIZED_NAME_MESSAGE)
@@ -63796,7 +59292,7 @@ public class TestResponseMessagesInner {
   }
 
   public TestResponseMessagesInner message(String message) {
-    
+
     this.message = message;
     return this;
   }
@@ -63806,7 +59302,6 @@ public class TestResponseMessagesInner {
    * @return message
   **/
   @javax.annotation.Nullable
-
   public String getMessage() {
     return message;
   }
@@ -63816,9 +59311,8 @@ public class TestResponseMessagesInner {
     this.message = message;
   }
 
-
   public TestResponseMessagesInner id(Integer id) {
-    
+
     this.id = id;
     return this;
   }
@@ -63828,7 +59322,6 @@ public class TestResponseMessagesInner {
    * @return id
   **/
   @javax.annotation.Nonnull
-
   public Integer getId() {
     return id;
   }
@@ -63839,7 +59332,6 @@ public class TestResponseMessagesInner {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -63851,6 +59343,7 @@ public class TestResponseMessagesInner {
     TestResponseMessagesInner testResponseMessagesInner = (TestResponseMessagesInner) o;
     return Objects.equals(this.message, testResponseMessagesInner.message) &&
         Objects.equals(this.id, testResponseMessagesInner.id);
+        
   }
 
   @Override
@@ -63975,7 +59468,6 @@ public class TestResponseMessagesInner {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
 }
 `;
diff --git a/packages/type-safe-api/test/scripts/generators/__snapshots__/python.test.ts.snap b/packages/type-safe-api/test/scripts/generators/__snapshots__/python.test.ts.snap
index c34629b0e..2cabeef82 100644
--- a/packages/type-safe-api/test/scripts/generators/__snapshots__/python.test.ts.snap
+++ b/packages/type-safe-api/test/scripts/generators/__snapshots__/python.test.ts.snap
@@ -17479,15 +17479,16 @@ with test_project.ApiClient(configuration) as api_client:
     api_instance = test_project.DefaultApi(api_client)
     my_string_array_request_params = [] # List[str] |  (optional)
     my_enum_array_request_params = [] # List[MyEnum] |  (optional)
-    my_integer_array_request_params = [8791794678497280] # List[int] |  (optional)
-    my_long_array_request_params = [2769288930787328,1038297876922368] # List[int] |  (optional)
-    my_int32_array_request_params = [857015102472192] # List[int] |  (optional)
-    my_number_array_request_params = [0.12505792127922177] # List[float] |  (optional)
-    my_float_array_request_params = [0.1599486346822232,0.4432248624507338,0.8626475473865867] # List[float] |  (optional)
-    my_double_array_request_params = [0.7941185790114105,0.005342561984434724,0.36126157245598733] # List[float] |  (optional)
+    my_integer_array_request_params = [2436284417048576,6600606720458752,2769288930787328] # List[int] |  (optional)
+    my_long_array_request_params = [3479256564760576,857015102472192,5661035377721344] # List[int] |  (optional)
+    my_int32_array_request_params = [] # List[int] |  (optional)
+    my_number_array_request_params = [0.1599486346822232,0.4432248624507338,0.8626475473865867] # List[float] |  (optional)
+    my_float_array_request_params = [0.7941185790114105,0.005342561984434724,0.36126157245598733] # List[float] |  (optional)
+    my_double_array_request_params = [0.3810686601791531] # List[float] |  (optional)
+    my_enum_request_param = test_project.MyEnum() # MyEnum |  (optional)
 
     try:
-        api_instance.array_request_parameters(my_string_array_request_params=my_string_array_request_params, my_enum_array_request_params=my_enum_array_request_params, my_integer_array_request_params=my_integer_array_request_params, my_long_array_request_params=my_long_array_request_params, my_int32_array_request_params=my_int32_array_request_params, my_number_array_request_params=my_number_array_request_params, my_float_array_request_params=my_float_array_request_params, my_double_array_request_params=my_double_array_request_params)
+        api_instance.array_request_parameters(my_string_array_request_params=my_string_array_request_params, my_enum_array_request_params=my_enum_array_request_params, my_integer_array_request_params=my_integer_array_request_params, my_long_array_request_params=my_long_array_request_params, my_int32_array_request_params=my_int32_array_request_params, my_number_array_request_params=my_number_array_request_params, my_float_array_request_params=my_float_array_request_params, my_double_array_request_params=my_double_array_request_params, my_enum_request_param=my_enum_request_param)
     except ApiException as e:
         print("Exception when calling DefaultApi->array_request_parameters: %s\\n" % e)
 \`\`\`
@@ -17515,7 +17516,7 @@ Method | HTTP request | Description
 [**reserved_keywords**](DefaultApi.md#reserved_keywords) | **GET** /reserved-keywords | 
 
 # **array_request_parameters**
-> array_request_parameters(my_string_array_request_params=my_string_array_request_params, my_enum_array_request_params=my_enum_array_request_params, my_integer_array_request_params=my_integer_array_request_params, my_long_array_request_params=my_long_array_request_params, my_int32_array_request_params=my_int32_array_request_params, my_number_array_request_params=my_number_array_request_params, my_float_array_request_params=my_float_array_request_params, my_double_array_request_params=my_double_array_request_params)
+> array_request_parameters(my_string_array_request_params=my_string_array_request_params, my_enum_array_request_params=my_enum_array_request_params, my_integer_array_request_params=my_integer_array_request_params, my_long_array_request_params=my_long_array_request_params, my_int32_array_request_params=my_int32_array_request_params, my_number_array_request_params=my_number_array_request_params, my_float_array_request_params=my_float_array_request_params, my_double_array_request_params=my_double_array_request_params, my_enum_request_param=my_enum_request_param)
 
 
 ### Example
@@ -17538,15 +17539,16 @@ with test_project.ApiClient(configuration) as api_client:
     api_instance = test_project.DefaultApi(api_client)
     my_string_array_request_params = [] # List[str] |  (optional)
     my_enum_array_request_params = [] # List[MyEnum] |  (optional)
-    my_integer_array_request_params = [8791794678497280] # List[int] |  (optional)
-    my_long_array_request_params = [2769288930787328,1038297876922368] # List[int] |  (optional)
-    my_int32_array_request_params = [857015102472192] # List[int] |  (optional)
-    my_number_array_request_params = [0.12505792127922177] # List[float] |  (optional)
-    my_float_array_request_params = [0.1599486346822232,0.4432248624507338,0.8626475473865867] # List[float] |  (optional)
-    my_double_array_request_params = [0.7941185790114105,0.005342561984434724,0.36126157245598733] # List[float] |  (optional)
+    my_integer_array_request_params = [2436284417048576,6600606720458752,2769288930787328] # List[int] |  (optional)
+    my_long_array_request_params = [3479256564760576,857015102472192,5661035377721344] # List[int] |  (optional)
+    my_int32_array_request_params = [] # List[int] |  (optional)
+    my_number_array_request_params = [0.1599486346822232,0.4432248624507338,0.8626475473865867] # List[float] |  (optional)
+    my_float_array_request_params = [0.7941185790114105,0.005342561984434724,0.36126157245598733] # List[float] |  (optional)
+    my_double_array_request_params = [0.3810686601791531] # List[float] |  (optional)
+    my_enum_request_param = test_project.MyEnum() # MyEnum |  (optional)
 
     try:
-        api_instance.array_request_parameters(my_string_array_request_params=my_string_array_request_params, my_enum_array_request_params=my_enum_array_request_params, my_integer_array_request_params=my_integer_array_request_params, my_long_array_request_params=my_long_array_request_params, my_int32_array_request_params=my_int32_array_request_params, my_number_array_request_params=my_number_array_request_params, my_float_array_request_params=my_float_array_request_params, my_double_array_request_params=my_double_array_request_params)
+        api_instance.array_request_parameters(my_string_array_request_params=my_string_array_request_params, my_enum_array_request_params=my_enum_array_request_params, my_integer_array_request_params=my_integer_array_request_params, my_long_array_request_params=my_long_array_request_params, my_int32_array_request_params=my_int32_array_request_params, my_number_array_request_params=my_number_array_request_params, my_float_array_request_params=my_float_array_request_params, my_double_array_request_params=my_double_array_request_params, my_enum_request_param=my_enum_request_param)
     except ApiException as e:
         print("Exception when calling DefaultApi->array_request_parameters: %s\\n" % e)
 \`\`\`
@@ -17562,6 +17564,7 @@ Name | Type | Description  | Notes
  **my_number_array_request_params** | **List[float]** |  | [optional] 
  **my_float_array_request_params** | **List[float]** |  | [optional] 
  **my_double_array_request_params** | **List[float]** |  | [optional] 
+ **my_enum_request_param** | [**MyEnum**](MyEnum.md) |  | [optional] 
 
 ### Return type
 
@@ -17861,6 +17864,7 @@ class DefaultApi:
         my_number_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]] = None,
         my_float_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]] = None,
         my_double_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]] = None,
+        my_enum_request_param: Optional[MyEnum] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -17891,6 +17895,8 @@ class DefaultApi:
         :type my_float_array_request_params: List[float], optional
         :param my_double_array_request_params: (optional)
         :type my_double_array_request_params: List[float], optional
+        :param my_enum_request_param: (optional)
+        :type my_enum_request_param: MyEnum, optional
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -17922,6 +17928,7 @@ class DefaultApi:
             my_number_array_request_params=my_number_array_request_params,
             my_float_array_request_params=my_float_array_request_params,
             my_double_array_request_params=my_double_array_request_params,
+            my_enum_request_param=my_enum_request_param,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -17953,6 +17960,7 @@ class DefaultApi:
         my_number_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]] = None,
         my_float_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]] = None,
         my_double_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]] = None,
+        my_enum_request_param: Optional[MyEnum] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -17983,6 +17991,8 @@ class DefaultApi:
         :type my_float_array_request_params: List[float], optional
         :param my_double_array_request_params: (optional)
         :type my_double_array_request_params: List[float], optional
+        :param my_enum_request_param: (optional)
+        :type my_enum_request_param: MyEnum, optional
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -18014,6 +18024,7 @@ class DefaultApi:
             my_number_array_request_params=my_number_array_request_params,
             my_float_array_request_params=my_float_array_request_params,
             my_double_array_request_params=my_double_array_request_params,
+            my_enum_request_param=my_enum_request_param,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -18045,6 +18056,7 @@ class DefaultApi:
         my_number_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]] = None,
         my_float_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]] = None,
         my_double_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]] = None,
+        my_enum_request_param: Optional[MyEnum] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -18075,6 +18087,8 @@ class DefaultApi:
         :type my_float_array_request_params: List[float], optional
         :param my_double_array_request_params: (optional)
         :type my_double_array_request_params: List[float], optional
+        :param my_enum_request_param: (optional)
+        :type my_enum_request_param: MyEnum, optional
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -18106,6 +18120,7 @@ class DefaultApi:
             my_number_array_request_params=my_number_array_request_params,
             my_float_array_request_params=my_float_array_request_params,
             my_double_array_request_params=my_double_array_request_params,
+            my_enum_request_param=my_enum_request_param,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -18132,6 +18147,7 @@ class DefaultApi:
         my_number_array_request_params,
         my_float_array_request_params,
         my_double_array_request_params,
+        my_enum_request_param,
         _request_auth,
         _content_type,
         _headers,
@@ -18176,6 +18192,8 @@ class DefaultApi:
             _query_params.append(('my-float-array-request-params', my_float_array_request_params))
         if my_double_array_request_params is not None:
             _query_params.append(('my-double-array-request-params', my_double_array_request_params))
+        if my_enum_request_param is not None:
+            _query_params.append(('my-enum-request-param', my_enum_request_param))
         # process the header parameters
         # process the form parameters
         # process the body parameter
@@ -18926,6 +18944,7 @@ class ArrayRequestParametersRequestParameters(BaseModel):
     my_number_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]]
     my_float_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]]
     my_double_array_request_params: Optional[List[Union[StrictFloat, StrictInt]]]
+    my_enum_request_param: Optional[MyEnum]
 
     class Config:
         """Pydantic configuration"""
@@ -19000,6 +19019,7 @@ def array_request_parameters_handler(_handler: ArrayRequestParametersHandlerFunc
                     "my_number_array_request_params": coerce_parameter("my-number-array-request-params", "List[float]", raw_string_parameters, raw_string_array_parameters, False),
                     "my_float_array_request_params": coerce_parameter("my-float-array-request-params", "List[float]", raw_string_parameters, raw_string_array_parameters, False),
                     "my_double_array_request_params": coerce_parameter("my-double-array-request-params", "List[float]", raw_string_parameters, raw_string_array_parameters, False),
+                    "my_enum_request_param": coerce_parameter("my-enum-request-param", "MyEnum", raw_string_parameters, raw_string_array_parameters, False),
                 })
             except Exception as e:
                 return {
diff --git a/packages/type-safe-api/test/scripts/generators/__snapshots__/typescript.test.ts.snap b/packages/type-safe-api/test/scripts/generators/__snapshots__/typescript.test.ts.snap
index 4c013aa32..94763aefe 100644
--- a/packages/type-safe-api/test/scripts/generators/__snapshots__/typescript.test.ts.snap
+++ b/packages/type-safe-api/test/scripts/generators/__snapshots__/typescript.test.ts.snap
@@ -8274,6 +8274,7 @@ export interface ArrayRequestParametersRequest {
     myNumberArrayRequestParams?: Array<number>;
     myFloatArrayRequestParams?: Array<number>;
     myDoubleArrayRequestParams?: Array<number>;
+    myEnumRequestParam?: MyEnum;
 }
 
 
@@ -8325,6 +8326,10 @@ export class DefaultApi extends runtime.BaseAPI {
             queryParameters['my-double-array-request-params'] = requestParameters.myDoubleArrayRequestParams;
         }
 
+        if (requestParameters.myEnumRequestParam !== undefined) {
+            queryParameters['my-enum-request-param'] = requestParameters.myEnumRequestParam;
+        }
+
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -8668,6 +8673,7 @@ export interface ArrayRequestParametersRequestParameters {
     readonly myNumberArrayRequestParams?: Array<number>;
     readonly myFloatArrayRequestParams?: Array<number>;
     readonly myDoubleArrayRequestParams?: Array<number>;
+    readonly myEnumRequestParam?: MyEnum;
 }
 
 /**
@@ -8737,6 +8743,7 @@ export const arrayRequestParametersHandler = (
           myNumberArrayRequestParams: coerceParameter("my-number-array-request-params", "Array<number>", false || false || false, rawSingleValueParameters, rawMultiValueParameters, false) as Array<number> | undefined,
           myFloatArrayRequestParams: coerceParameter("my-float-array-request-params", "Array<number>", false || false || false, rawSingleValueParameters, rawMultiValueParameters, false) as Array<number> | undefined,
           myDoubleArrayRequestParams: coerceParameter("my-double-array-request-params", "Array<number>", false || false || false, rawSingleValueParameters, rawMultiValueParameters, false) as Array<number> | undefined,
+          myEnumRequestParam: coerceParameter("my-enum-request-param", "MyEnum", false || false || false, rawSingleValueParameters, rawMultiValueParameters, false) as MyEnum | undefined,
 
       };
     } catch (e: any) {
diff --git a/packages/type-safe-api/test/scripts/generators/async/__snapshots__/java.test.ts.snap b/packages/type-safe-api/test/scripts/generators/async/__snapshots__/java.test.ts.snap
index 5424c5aeb..8889d6c47 100644
--- a/packages/type-safe-api/test/scripts/generators/async/__snapshots__/java.test.ts.snap
+++ b/packages/type-safe-api/test/scripts/generators/async/__snapshots__/java.test.ts.snap
@@ -2,122 +2,7 @@
 
 exports[`Java Async Runtime Code Generation Script Unit Tests Generates With single.yaml 1`] = `
 {
-  ".github/workflows/maven.yml": "# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-#
-# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  build:
-    name: Build Example API
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8' ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: \${{ matrix.java }}
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
-",
-  ".openapi-generator-ignore": "# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
-",
-  ".openapi-generator/FILES": ".github/workflows/maven.yml
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/ApiError.md
-docs/DefaultApi.md
-docs/MapRequest.md
-docs/MapRequestMapPropertyValue.md
-docs/TestRequest.md
-docs/TestResponse.md
-docs/TestResponseMessagesInner.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
-src/main/java/test/test/runtime/ApiCallback.java
-src/main/java/test/test/runtime/ApiClient.java
-src/main/java/test/test/runtime/ApiException.java
-src/main/java/test/test/runtime/ApiResponse.java
-src/main/java/test/test/runtime/Configuration.java
-src/main/java/test/test/runtime/GzipRequestInterceptor.java
-src/main/java/test/test/runtime/JSON.java
-src/main/java/test/test/runtime/Pair.java
-src/main/java/test/test/runtime/ProgressRequestBody.java
-src/main/java/test/test/runtime/ProgressResponseBody.java
-src/main/java/test/test/runtime/ServerConfiguration.java
-src/main/java/test/test/runtime/ServerVariable.java
-src/main/java/test/test/runtime/StringUtil.java
-src/main/java/test/test/runtime/__handlers.java
-src/main/java/test/test/runtime/__interceptors.java
-src/main/java/test/test/runtime/api/DefaultApi.java
-src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
-src/main/java/test/test/runtime/api/operation_config/Operations.java
-src/main/java/test/test/runtime/auth/ApiKeyAuth.java
-src/main/java/test/test/runtime/auth/Authentication.java
-src/main/java/test/test/runtime/auth/HttpBasicAuth.java
-src/main/java/test/test/runtime/auth/HttpBearerAuth.java
-src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
-src/main/java/test/test/runtime/model/ApiError.java
-src/main/java/test/test/runtime/model/MapRequest.java
-src/main/java/test/test/runtime/model/MapRequestMapPropertyValue.java
-src/main/java/test/test/runtime/model/TestRequest.java
-src/main/java/test/test/runtime/model/TestResponse.java
-src/main/java/test/test/runtime/model/TestResponseMessagesInner.java
-src/test/java/test/test/runtime/api/DefaultApiTest.java
-src/test/java/test/test/runtime/model/ApiErrorTest.java
-src/test/java/test/test/runtime/model/MapRequestMapPropertyValueTest.java
-src/test/java/test/test/runtime/model/MapRequestTest.java
-src/test/java/test/test/runtime/model/TestRequestTest.java
-src/test/java/test/test/runtime/model/TestResponseMessagesInnerTest.java
-src/test/java/test/test/runtime/model/TestResponseTest.java
-src/main/java/test/test/runtime/api/handlers/Handlers.java
+  ".tsapi-manifest": "src/main/java/test/test/runtime/api/handlers/Handlers.java
 src/main/java/test/test/runtime/api/handlers/Response.java
 src/main/java/test/test/runtime/api/handlers/ApiResponse.java
 src/main/java/test/test/runtime/api/handlers/Interceptor.java
@@ -178,994 +63,43 @@ src/main/java/test/test/runtime/api/interceptors/ResponseHeadersInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/LoggingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/TracingInterceptor.java
 src/main/java/test/test/runtime/api/interceptors/powertools/MetricsInterceptor.java
-src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java",
-  ".openapi-generator/VERSION": "6.3.0",
-  ".pdk/dynamic-files/openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
-  "README.md": "# com.aws.pdk.test
-
-Example API
-- API version: 1.0.0
-
-No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
-
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
-
-## Requirements
-
-Building the API client library requires:
-1. Java 1.8+
-2. Maven (3.8.3+)/Gradle (7.2+)
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-\`\`\`shell
-mvn clean install
-\`\`\`
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-\`\`\`shell
-mvn clean deploy
-\`\`\`
-
-Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-\`\`\`xml
-<dependency>
-  <groupId>test</groupId>
-  <artifactId>com.aws.pdk.test</artifactId>
-  <version>1.0.0</version>
-  <scope>compile</scope>
-</dependency>
-\`\`\`
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-\`\`\`groovy
-  repositories {
-    mavenCentral()     // Needed if the 'com.aws.pdk.test' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'com.aws.pdk.test' jar has been published to the local maven repo.
-  }
-
-  dependencies {
-     implementation "test:com.aws.pdk.test:1.0.0"
-  }
-\`\`\`
-
-### Others
-
-At first generate the JAR by executing:
-
-\`\`\`shell
-mvn clean package
-\`\`\`
-
-Then manually install the following JARs:
-
-* \`target/com.aws.pdk.test-1.0.0.jar\`
-* \`target/lib/*.jar\`
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following Java code:
-
-\`\`\`java
-
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    Object body = null; // Object | 
-    try {
-      apiInstance.anyRequest()
-            .body(body)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#anyRequest");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-
-\`\`\`
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://localhost*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*DefaultApi* | [**anyRequest**](docs/DefaultApi.md#anyRequest) | **PUT** /any-request | 
-*DefaultApi* | [**bidirectional**](docs/DefaultApi.md#bidirectional) | **POST** /bidirectional | 
-*DefaultApi* | [**clientToServer**](docs/DefaultApi.md#clientToServer) | **POST** /client-to-server | 
-*DefaultApi* | [**empty**](docs/DefaultApi.md#empty) | **PUT** /empty-request | 
-*DefaultApi* | [**mapRequest**](docs/DefaultApi.md#mapRequest) | **POST** /map-request | 
-*DefaultApi* | [**mediaTypes**](docs/DefaultApi.md#mediaTypes) | **POST** /different-media-type | 
-*DefaultApi* | [**multipleContentTypes**](docs/DefaultApi.md#multipleContentTypes) | **POST** /multiple-content-types | 
-*DefaultApi* | [**serverToClient**](docs/DefaultApi.md#serverToClient) | **POST** /server-to-client | 
-*DefaultApi* | [**withoutOperationIdPost**](docs/DefaultApi.md#withoutOperationIdPost) | **POST** /without-operation-id | 
-
-
-## Documentation for Models
-
- - [ApiError](docs/ApiError.md)
- - [MapRequest](docs/MapRequest.md)
- - [MapRequestMapPropertyValue](docs/MapRequestMapPropertyValue.md)
- - [TestRequest](docs/TestRequest.md)
- - [TestResponse](docs/TestResponse.md)
- - [TestResponseMessagesInner](docs/TestResponseMessagesInner.md)
-
-
-## Documentation for Authorization
-
-All endpoints do not require authorization.
-Authentication schemes defined for the API:
-
-## Recommendation
-
-It's recommended to create an instance of \`ApiClient\` per thread in a multithreaded environment to avoid any potential issues.
-
-## Author
-
-
-
-",
-  "api/openapi.yaml": "openapi: 3.0.3
-info:
-  title: Example API
-  version: 1.0.0
-servers:
-- url: /
-paths:
-  /server-to-client:
-    post:
-      operationId: serverToClient
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TestRequest'
-        required: true
-      responses: {}
-      x-async:
-        direction: server_to_client
-      x-async-to-client: true
-      x-content-type: application/json
-      x-accepts: application/json
-  /client-to-server:
-    post:
-      operationId: clientToServer
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TestRequest'
-        required: true
-      responses: {}
-      x-async:
-        direction: client_to_server
-      x-async-to-server: true
-      x-content-type: application/json
-      x-accepts: application/json
-  /bidirectional:
-    post:
-      operationId: bidirectional
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TestRequest'
-        required: true
-      responses: {}
-      x-async:
-        direction: bidirectional
-      x-async-to-server: true
-      x-async-to-client: true
-      x-content-type: application/json
-      x-accepts: application/json
-  /without-operation-id:
-    post:
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TestRequest'
-        required: true
-      responses: {}
-      x-async:
-        direction: bidirectional
-      x-async-to-server: true
-      x-async-to-client: true
-      x-content-type: application/json
-      x-accepts: application/json
-  /empty-request:
-    put:
-      operationId: empty
-      responses: {}
-      x-async:
-        direction: bidirectional
-      x-async-to-server: true
-      x-async-to-client: true
-      x-accepts: application/json
-  /map-request:
-    post:
-      operationId: mapRequest
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/MapRequest'
-      responses: {}
-      x-async:
-        direction: bidirectional
-      x-async-to-server: true
-      x-async-to-client: true
-      x-content-type: application/json
-      x-accepts: application/json
-  /any-request:
-    put:
-      operationId: anyRequest
-      requestBody:
-        content:
-          application/json:
-            schema: {}
-      responses: {}
-      x-async:
-        direction: bidirectional
-      x-async-to-server: true
-      x-async-to-client: true
-      x-content-type: application/json
-      x-accepts: application/json
-  /different-media-type:
-    post:
-      operationId: mediaTypes
-      requestBody:
-        content:
-          application/pdf:
-            schema:
-              format: binary
-              type: string
-        required: true
-      responses: {}
-      x-async:
-        direction: bidirectional
-      x-async-to-server: true
-      x-async-to-client: true
-      x-content-type: application/pdf
-      x-accepts: application/json
-  /multiple-content-types:
-    post:
-      operationId: multipleContentTypes
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TestRequest'
-          application/pdf:
-            schema:
-              format: binary
-              type: string
-        required: true
-      responses: {}
-      x-async:
-        direction: bidirectional
-      x-async-to-server: true
-      x-async-to-client: true
-      x-content-type: application/json
-      x-accepts: application/json
-components:
-  schemas:
-    ApiError:
-      properties:
-        errorMessage:
-          type: string
-      required:
-      - errorMessage
-      type: object
-    TestRequest:
-      description: This is a test request
-      properties:
-        myInput:
-          type: number
-      type: object
-    TestResponse:
-      description: This is a test response
-      properties:
-        messages:
-          items:
-            $ref: '#/components/schemas/TestResponse_messages_inner'
-          type: array
-      required:
-      - messages
-      type: object
-    MapRequest:
-      properties:
-        mapProperty:
-          additionalProperties:
-            $ref: '#/components/schemas/MapRequest_mapProperty_value'
-          type: object
-      required:
-      - mapProperty
-      type: object
-    TestResponse_messages_inner:
-      properties:
-        message:
-          description: This is a message
-          type: string
-        id:
-          type: integer
-      required:
-      - id
-      type: object
-    MapRequest_mapProperty_value:
-      properties:
-        a:
-          type: string
-        b:
-          type: string
-      required:
-      - a
-      type: object
-
-",
-  "docs/ApiError.md": "
-
-# ApiError
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**errorMessage** | **String** |  |  |
-
-
-
-",
-  "docs/DefaultApi.md": "# DefaultApi
-
-All URIs are relative to *http://localhost*
-
-| Method | HTTP request | Description |
-|------------- | ------------- | -------------|
-| [**anyRequest**](DefaultApi.md#anyRequest) | **PUT** /any-request |  |
-| [**bidirectional**](DefaultApi.md#bidirectional) | **POST** /bidirectional |  |
-| [**clientToServer**](DefaultApi.md#clientToServer) | **POST** /client-to-server |  |
-| [**empty**](DefaultApi.md#empty) | **PUT** /empty-request |  |
-| [**mapRequest**](DefaultApi.md#mapRequest) | **POST** /map-request |  |
-| [**mediaTypes**](DefaultApi.md#mediaTypes) | **POST** /different-media-type |  |
-| [**multipleContentTypes**](DefaultApi.md#multipleContentTypes) | **POST** /multiple-content-types |  |
-| [**serverToClient**](DefaultApi.md#serverToClient) | **POST** /server-to-client |  |
-| [**withoutOperationIdPost**](DefaultApi.md#withoutOperationIdPost) | **POST** /without-operation-id |  |
-
-
-<a name="anyRequest"></a>
-# **anyRequest**
-> anyRequest().body(body).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    Object body = null; // Object | 
-    try {
-      apiInstance.anyRequest()
-            .body(body)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#anyRequest");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **body** | **Object**|  | [optional] |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: Not defined
-
-
-<a name="bidirectional"></a>
-# **bidirectional**
-> bidirectional(testRequest).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    TestRequest testRequest = new TestRequest(); // TestRequest | 
-    try {
-      apiInstance.bidirectional(testRequest)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#bidirectional");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **testRequest** | [**TestRequest**](TestRequest.md)|  | |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: Not defined
-
-
-<a name="clientToServer"></a>
-# **clientToServer**
-> clientToServer(testRequest).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    TestRequest testRequest = new TestRequest(); // TestRequest | 
-    try {
-      apiInstance.clientToServer(testRequest)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#clientToServer");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **testRequest** | [**TestRequest**](TestRequest.md)|  | |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: Not defined
-
-
-<a name="empty"></a>
-# **empty**
-> empty().execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    try {
-      apiInstance.empty()
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#empty");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-
-<a name="mapRequest"></a>
-# **mapRequest**
-> mapRequest().mapRequest(mapRequest).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    MapRequest mapRequest = new MapRequest(); // MapRequest | 
-    try {
-      apiInstance.mapRequest()
-            .mapRequest(mapRequest)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#mapRequest");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **mapRequest** | [**MapRequest**](MapRequest.md)|  | [optional] |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: Not defined
-
-
-<a name="mediaTypes"></a>
-# **mediaTypes**
-> mediaTypes(body).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    File body = new File("/path/to/file"); // File | 
-    try {
-      apiInstance.mediaTypes(body)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#mediaTypes");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **body** | **File**|  | |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/pdf
- - **Accept**: Not defined
-
-
-<a name="multipleContentTypes"></a>
-# **multipleContentTypes**
-> multipleContentTypes(testRequest).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    TestRequest testRequest = new TestRequest(); // TestRequest | 
-    try {
-      apiInstance.multipleContentTypes(testRequest)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#multipleContentTypes");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **testRequest** | [**TestRequest**](TestRequest.md)|  | |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json, application/pdf
- - **Accept**: Not defined
-
-
-<a name="serverToClient"></a>
-# **serverToClient**
-> serverToClient(testRequest).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    TestRequest testRequest = new TestRequest(); // TestRequest | 
-    try {
-      apiInstance.serverToClient(testRequest)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#serverToClient");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **testRequest** | [**TestRequest**](TestRequest.md)|  | |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: Not defined
-
-
-<a name="withoutOperationIdPost"></a>
-# **withoutOperationIdPost**
-> withoutOperationIdPost(testRequest).execute();
-
-
-
-### Example
-\`\`\`java
-// Import classes:
-import test.test.runtime.ApiClient;
-import test.test.runtime.ApiException;
-import test.test.runtime.Configuration;
-import test.test.runtime.models.*;
-import test.test.runtime.api.DefaultApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://localhost");
-
-    DefaultApi apiInstance = new DefaultApi(defaultClient);
-    TestRequest testRequest = new TestRequest(); // TestRequest | 
-    try {
-      apiInstance.withoutOperationIdPost(testRequest)
-            .execute();
-    } catch (ApiException e) {
-      System.err.println("Exception when calling DefaultApi#withoutOperationIdPost");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
-\`\`\`
-
-### Parameters
-
-| Name | Type | Description  | Notes |
-|------------- | ------------- | ------------- | -------------|
-| **testRequest** | [**TestRequest**](TestRequest.md)|  | |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: Not defined
-
-
-",
-  "docs/MapRequest.md": "
-
-# MapRequest
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**mapProperty** | [**Map&lt;String, MapRequestMapPropertyValue&gt;**](MapRequestMapPropertyValue.md) |  |  |
-
-
-
-",
-  "docs/MapRequestMapPropertyValue.md": "
-
-# MapRequestMapPropertyValue
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**a** | **String** |  |  |
-|**b** | **String** |  |  [optional] |
-
-
-
-",
-  "docs/TestRequest.md": "
-
-# TestRequest
-
-This is a test request
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**myInput** | **BigDecimal** |  |  [optional] |
-
-
-
-",
-  "docs/TestResponse.md": "
-
-# TestResponse
-
-This is a test response
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**messages** | [**List&lt;TestResponseMessagesInner&gt;**](TestResponseMessagesInner.md) |  |  |
-
-
-
-",
-  "docs/TestResponseMessagesInner.md": "
-
-# TestResponseMessagesInner
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**message** | **String** | This is a message |  [optional] |
-|**id** | **Integer** |  |  |
-
-
-
-",
-  "openapitools.json": "{
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.3.0",
-    "storageDir": "~/.open-api-generator-cli"
-  },
-  "//": "~~ Generated by projen. To modify, edit src/test/java/projenrc.java and run \\"npx projen\\"."
-}
-",
+src/main/java/test/test/runtime/api/interceptors/DefaultInterceptors.java
+src/main/java/test/test/runtime/api/operation_config/OperationConfig.java
+src/main/java/test/test/runtime/api/operation_config/OperationLookup.java
+src/main/java/test/test/runtime/api/operation_config/Operations.java
+src/main/java/test/test/runtime/api/DefaultApi.java
+src/main/java/test/test/runtime/auth/ApiKeyAuth.java
+src/main/java/test/test/runtime/auth/Authentication.java
+src/main/java/test/test/runtime/auth/HttpBasicAuth.java
+src/main/java/test/test/runtime/auth/HttpBearerAuth.java
+src/main/java/test/test/runtime/ApiCallback.java
+src/main/java/test/test/runtime/ApiClient.java
+src/main/java/test/test/runtime/ApiException.java
+src/main/java/test/test/runtime/ApiResponse.java
+src/main/java/test/test/runtime/Configuration.java
+src/main/java/test/test/runtime/GzipRequestInterceptor.java
+src/main/java/test/test/runtime/JSON.java
+src/main/java/test/test/runtime/Pair.java
+src/main/java/test/test/runtime/ProgressRequestBody.java
+src/main/java/test/test/runtime/ProgressResponseBody.java
+src/main/java/test/test/runtime/ServerConfiguration.java
+src/main/java/test/test/runtime/ServerVariable.java
+src/main/java/test/test/runtime/StringUtil.java
+src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java
+src/main/java/test/test/runtime/model/ApiError.java
+src/main/java/test/test/runtime/model/MapRequest.java
+src/main/java/test/test/runtime/model/MapRequestMapPropertyValue.java
+src/main/java/test/test/runtime/model/TestRequest.java
+src/main/java/test/test/runtime/model/TestResponse.java
+src/main/java/test/test/runtime/model/TestResponseMessagesInner.java",
   "src/main/java/test/test/runtime/ApiCallback.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -1222,13 +156,12 @@ public interface ApiCallback<T> {
 ",
   "src/main/java/test/test/runtime/ApiClient.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -1360,7 +293,7 @@ public class ApiClient {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/1.0.0/java");
+        setUserAgent("OpenAPI-Generator/0.0.0/java");
 
         authentications = new HashMap<String, Authentication>();
     }
@@ -2612,10 +1545,10 @@ public class ApiClient {
     /**
      * Add a Content-Disposition Header for the given key and file to the MultipartBody Builder.
      *
-     * @param mpBuilder MultipartBody.Builder 
+     * @param mpBuilder MultipartBody.Builder
      * @param key The key of the Header element
      * @param file The file to add to the Header
-     */ 
+     */
     private void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
         Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\\"" + key + "\\"; filename=\\"" + file.getName() + "\\"");
         MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
@@ -2769,13 +1702,12 @@ public class ApiClient {
 ",
   "src/main/java/test/test/runtime/ApiException.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -2791,12 +1723,11 @@ import javax.ws.rs.core.GenericType;
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
     private String responseBody = null;
- 
+
     /**
      * <p>Constructor for ApiException.</p>
      */
@@ -2936,13 +1867,12 @@ public class ApiException extends Exception {
 ",
   "src/main/java/test/test/runtime/ApiResponse.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -2995,7 +1925,7 @@ public class ApiResponse<T> {
     /**
      * <p>Get the <code>headers</code>.</p>
      *
-     * @return a {@link java.util.Map} of headers 
+     * @return a {@link java.util.Map} of headers
      */
     public Map<String, List<String>> getHeaders() {
         return headers;
@@ -3013,20 +1943,18 @@ public class ApiResponse<T> {
 ",
   "src/main/java/test/test/runtime/Configuration.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
@@ -3053,13 +1981,12 @@ public class Configuration {
 ",
   "src/main/java/test/test/runtime/GzipRequestInterceptor.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -3139,13 +2066,12 @@ class GzipRequestInterceptor implements Interceptor {
 ",
   "src/main/java/test/test/runtime/JSON.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -3546,20 +2472,18 @@ public class JSON {
 ",
   "src/main/java/test/test/runtime/Pair.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
@@ -3604,13 +2528,12 @@ public class Pair {
 ",
   "src/main/java/test/test/runtime/ProgressRequestBody.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -3678,13 +2601,12 @@ public class ProgressRequestBody extends RequestBody {
 ",
   "src/main/java/test/test/runtime/ProgressResponseBody.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -3832,13 +2754,12 @@ public class ServerVariable {
 ",
   "src/main/java/test/test/runtime/StringUtil.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -3848,7 +2769,6 @@ package test.test.runtime;
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -3916,13 +2836,12 @@ public class StringUtil {
 ",
   "src/main/java/test/test/runtime/api/DefaultApi.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -3943,6 +2862,7 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 
+import java.math.BigDecimal;
 import java.io.File;
 import test.test.runtime.model.MapRequest;
 import test.test.runtime.model.TestRequest;
@@ -4035,18 +2955,19 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call anyRequestValidateBeforeCall(Object body, final ApiCallback _callback) throws ApiException {
         return anyRequestCall(body, _callback);
 
     }
 
-
     private ApiResponse<Void> anyRequestWithHttpInfo(Object body) throws ApiException {
         okhttp3.Call localVarCall = anyRequestValidateBeforeCall(body, null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call anyRequestAsync(Object body, final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = anyRequestValidateBeforeCall(body, _callback);
@@ -4113,6 +3034,7 @@ public class DefaultApi {
      * 
      * @return APIanyRequestRequest
      */
+    
     public APIanyRequestRequest anyRequest() {
         return new APIanyRequestRequest();
     }
@@ -4160,6 +3082,7 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call bidirectionalValidateBeforeCall(TestRequest testRequest, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'testRequest' is set
@@ -4171,12 +3094,12 @@ public class DefaultApi {
 
     }
 
-
     private ApiResponse<Void> bidirectionalWithHttpInfo(TestRequest testRequest) throws ApiException {
         okhttp3.Call localVarCall = bidirectionalValidateBeforeCall(testRequest, null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call bidirectionalAsync(TestRequest testRequest, final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = bidirectionalValidateBeforeCall(testRequest, _callback);
@@ -4235,6 +3158,7 @@ public class DefaultApi {
      * @param testRequest  (required)
      * @return APIbidirectionalRequest
      */
+    
     public APIbidirectionalRequest bidirectional(TestRequest testRequest) {
         return new APIbidirectionalRequest(testRequest);
     }
@@ -4282,6 +3206,7 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call clientToServerValidateBeforeCall(TestRequest testRequest, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'testRequest' is set
@@ -4293,12 +3218,12 @@ public class DefaultApi {
 
     }
 
-
     private ApiResponse<Void> clientToServerWithHttpInfo(TestRequest testRequest) throws ApiException {
         okhttp3.Call localVarCall = clientToServerValidateBeforeCall(testRequest, null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call clientToServerAsync(TestRequest testRequest, final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = clientToServerValidateBeforeCall(testRequest, _callback);
@@ -4357,6 +3282,7 @@ public class DefaultApi {
      * @param testRequest  (required)
      * @return APIclientToServerRequest
      */
+    
     public APIclientToServerRequest clientToServer(TestRequest testRequest) {
         return new APIclientToServerRequest(testRequest);
     }
@@ -4403,18 +3329,19 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call emptyValidateBeforeCall(final ApiCallback _callback) throws ApiException {
         return emptyCall(_callback);
 
     }
 
-
     private ApiResponse<Void> emptyWithHttpInfo() throws ApiException {
         okhttp3.Call localVarCall = emptyValidateBeforeCall(null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call emptyAsync(final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = emptyValidateBeforeCall(_callback);
@@ -4470,6 +3397,7 @@ public class DefaultApi {
      * 
      * @return APIemptyRequest
      */
+    
     public APIemptyRequest empty() {
         return new APIemptyRequest();
     }
@@ -4517,18 +3445,19 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call mapRequestValidateBeforeCall(MapRequest mapRequest, final ApiCallback _callback) throws ApiException {
         return mapRequestCall(mapRequest, _callback);
 
     }
 
-
     private ApiResponse<Void> mapRequestWithHttpInfo(MapRequest mapRequest) throws ApiException {
         okhttp3.Call localVarCall = mapRequestValidateBeforeCall(mapRequest, null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call mapRequestAsync(MapRequest mapRequest, final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = mapRequestValidateBeforeCall(mapRequest, _callback);
@@ -4595,6 +3524,7 @@ public class DefaultApi {
      * 
      * @return APImapRequestRequest
      */
+    
     public APImapRequestRequest mapRequest() {
         return new APImapRequestRequest();
     }
@@ -4642,6 +3572,7 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call mediaTypesValidateBeforeCall(File body, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'body' is set
@@ -4653,12 +3584,12 @@ public class DefaultApi {
 
     }
 
-
     private ApiResponse<Void> mediaTypesWithHttpInfo(File body) throws ApiException {
         okhttp3.Call localVarCall = mediaTypesValidateBeforeCall(body, null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call mediaTypesAsync(File body, final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = mediaTypesValidateBeforeCall(body, _callback);
@@ -4717,6 +3648,7 @@ public class DefaultApi {
      * @param body  (required)
      * @return APImediaTypesRequest
      */
+    
     public APImediaTypesRequest mediaTypes(File body) {
         return new APImediaTypesRequest(body);
     }
@@ -4765,6 +3697,7 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call multipleContentTypesValidateBeforeCall(TestRequest testRequest, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'testRequest' is set
@@ -4776,12 +3709,12 @@ public class DefaultApi {
 
     }
 
-
     private ApiResponse<Void> multipleContentTypesWithHttpInfo(TestRequest testRequest) throws ApiException {
         okhttp3.Call localVarCall = multipleContentTypesValidateBeforeCall(testRequest, null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call multipleContentTypesAsync(TestRequest testRequest, final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = multipleContentTypesValidateBeforeCall(testRequest, _callback);
@@ -4840,6 +3773,7 @@ public class DefaultApi {
      * @param testRequest  (required)
      * @return APImultipleContentTypesRequest
      */
+    
     public APImultipleContentTypesRequest multipleContentTypes(TestRequest testRequest) {
         return new APImultipleContentTypesRequest(testRequest);
     }
@@ -4887,6 +3821,7 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call serverToClientValidateBeforeCall(TestRequest testRequest, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'testRequest' is set
@@ -4898,12 +3833,12 @@ public class DefaultApi {
 
     }
 
-
     private ApiResponse<Void> serverToClientWithHttpInfo(TestRequest testRequest) throws ApiException {
         okhttp3.Call localVarCall = serverToClientValidateBeforeCall(testRequest, null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call serverToClientAsync(TestRequest testRequest, final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = serverToClientValidateBeforeCall(testRequest, _callback);
@@ -4962,6 +3897,7 @@ public class DefaultApi {
      * @param testRequest  (required)
      * @return APIserverToClientRequest
      */
+    
     public APIserverToClientRequest serverToClient(TestRequest testRequest) {
         return new APIserverToClientRequest(testRequest);
     }
@@ -5009,6 +3945,7 @@ public class DefaultApi {
         return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
     }
 
+    
     @SuppressWarnings("rawtypes")
     private okhttp3.Call withoutOperationIdPostValidateBeforeCall(TestRequest testRequest, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'testRequest' is set
@@ -5020,12 +3957,12 @@ public class DefaultApi {
 
     }
 
-
     private ApiResponse<Void> withoutOperationIdPostWithHttpInfo(TestRequest testRequest) throws ApiException {
         okhttp3.Call localVarCall = withoutOperationIdPostValidateBeforeCall(testRequest, null);
         return localVarApiClient.execute(localVarCall);
     }
 
+
     private okhttp3.Call withoutOperationIdPostAsync(TestRequest testRequest, final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = withoutOperationIdPostValidateBeforeCall(testRequest, _callback);
@@ -5084,10 +4021,12 @@ public class DefaultApi {
      * @param testRequest  (required)
      * @return APIwithoutOperationIdPostRequest
      */
+    
     public APIwithoutOperationIdPostRequest withoutOperationIdPost(TestRequest testRequest) {
         return new APIwithoutOperationIdPostRequest(testRequest);
     }
 }
+
 ",
   "src/main/java/test/test/runtime/api/handlers/ApiResponse.java": "
 package test.test.runtime.api.handlers;
@@ -5349,13 +4288,8 @@ import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-import java.io.File;
-import test.test.runtime.model.MapRequest;
-import test.test.runtime.model.TestRequest;
-
 import test.test.runtime.JSON;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Handlers {
 
     static {
@@ -6273,8 +5207,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the AnyRequest operation
  */
@@ -6607,8 +5544,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the Bidirectional operation
  */
@@ -6941,8 +5881,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the ClientToServer operation
  */
@@ -7266,8 +6209,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the Empty operation
  */
@@ -7600,8 +6546,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the MapRequest operation
  */
@@ -7930,8 +6879,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the MediaTypes operation
  */
@@ -8264,8 +7216,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the MultipleContentTypes operation
  */
@@ -8598,8 +7553,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the ServerToClient operation
  */
@@ -8932,8 +7890,11 @@ import java.util.HashMap;
 import java.time.OffsetDateTime;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 
+import test.test.runtime.model.*;
+
 /**
  * Query, path and header parameters for the WithoutOperationIdPost operation
  */
@@ -9312,15 +8273,10 @@ public class TracingInterceptor<Input> extends InterceptorWithWarmup<Input> {
 
 import test.test.runtime.model.*;
 
-import java.io.File;
-import test.test.runtime.model.MapRequest;
-import test.test.runtime.model.TestRequest;
-
 import java.util.HashMap;
 import java.util.Map;
 
 // Generic type for object "keyed" by operation names
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @lombok.Builder @lombok.Getter
 public class OperationConfig<T> {
     private T anyRequest;
@@ -9347,10 +8303,84 @@ public class OperationConfig<T> {
         return map;
     }
 }
+",
+  "src/main/java/test/test/runtime/api/operation_config/OperationLookup.java": "package test.test.runtime.api.operation_config;
+
+import test.test.runtime.model.*;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+import java.util.Arrays;
+
+
+// Look up path and http method for a given operation name
+public class OperationLookup {
+    @lombok.Builder @lombok.Getter
+    public static class OperationLookupEntry {
+        private String method;
+        private String path;
+        private List<String> contentTypes;
+    }
+
+    /**
+     * Returns the operation lookup information for the TypeSafeRestApi construct
+     */
+    public static Map<String, OperationLookupEntry> getOperationLookup() {
+        final Map<String, OperationLookupEntry> config = new HashMap<>();
+
+        config.put("anyRequest", OperationLookupEntry.builder()
+            .path("/any-request")
+            .method("PUT")
+            .contentTypes(Arrays.asList("application/json"))
+            .build());
+        config.put("bidirectional", OperationLookupEntry.builder()
+            .path("/bidirectional")
+            .method("POST")
+            .contentTypes(Arrays.asList("application/json"))
+            .build());
+        config.put("clientToServer", OperationLookupEntry.builder()
+            .path("/client-to-server")
+            .method("POST")
+            .contentTypes(Arrays.asList("application/json"))
+            .build());
+        config.put("empty", OperationLookupEntry.builder()
+            .path("/empty-request")
+            .method("PUT")
+            .contentTypes(Arrays.asList("application/json"))
+            .build());
+        config.put("mapRequest", OperationLookupEntry.builder()
+            .path("/map-request")
+            .method("POST")
+            .contentTypes(Arrays.asList("application/json"))
+            .build());
+        config.put("mediaTypes", OperationLookupEntry.builder()
+            .path("/different-media-type")
+            .method("POST")
+            .contentTypes(Arrays.asList("application/pdf"))
+            .build());
+        config.put("multipleContentTypes", OperationLookupEntry.builder()
+            .path("/multiple-content-types")
+            .method("POST")
+            .contentTypes(Arrays.asList("application/json","application/pdf"))
+            .build());
+        config.put("serverToClient", OperationLookupEntry.builder()
+            .path("/server-to-client")
+            .method("POST")
+            .contentTypes(Arrays.asList("application/json"))
+            .build());
+        config.put("withoutOperationIdPost", OperationLookupEntry.builder()
+            .path("/without-operation-id")
+            .method("POST")
+            .contentTypes(Arrays.asList("application/json"))
+            .build());
+
+        return config;
+    }
+}
 ",
   "src/main/java/test/test/runtime/api/operation_config/Operations.java": "package test.test.runtime.api.operation_config;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Operations {
     /**
      * Returns an OperationConfig Builder with all values populated with the given value.
@@ -9374,13 +8404,12 @@ public class Operations {
 ",
   "src/main/java/test/test/runtime/auth/ApiKeyAuth.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9394,7 +8423,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -9455,13 +8483,12 @@ public class ApiKeyAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/Authentication.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9492,13 +8519,12 @@ public interface Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBasicAuth.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9550,13 +8576,12 @@ public class HttpBasicAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/auth/HttpBearerAuth.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9570,7 +8595,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
@@ -9614,13 +8638,12 @@ public class HttpBearerAuth implements Authentication {
 ",
   "src/main/java/test/test/runtime/model/AbstractOpenApiSchema.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9639,7 +8662,6 @@ import javax.ws.rs.core.GenericType;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -9765,46 +8787,67 @@ public abstract class AbstractOpenApiSchema {
 ",
   "src/main/java/test/test/runtime/model/ApiError.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
 
 package test.test.runtime.model;
 
-import java.util.Objects;
-import java.util.Arrays;
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -9812,7 +8855,6 @@ import test.test.runtime.JSON;
  * ApiError
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiError {
   public static final String SERIALIZED_NAME_ERROR_MESSAGE = "errorMessage";
   @SerializedName(SERIALIZED_NAME_ERROR_MESSAGE)
@@ -9822,7 +8864,7 @@ public class ApiError {
   }
 
   public ApiError errorMessage(String errorMessage) {
-    
+
     this.errorMessage = errorMessage;
     return this;
   }
@@ -9832,7 +8874,6 @@ public class ApiError {
    * @return errorMessage
   **/
   @javax.annotation.Nonnull
-
   public String getErrorMessage() {
     return errorMessage;
   }
@@ -9843,7 +8884,6 @@ public class ApiError {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -9854,6 +8894,7 @@ public class ApiError {
     }
     ApiError apiError = (ApiError) o;
     return Objects.equals(this.errorMessage, apiError.errorMessage);
+        
   }
 
   @Override
@@ -9976,17 +9017,15 @@ public class ApiError {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/MapRequest.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -9995,34 +9034,54 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.MapRequestMapPropertyValue;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
-import test.test.runtime.model.MapRequestMapPropertyValue;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -10030,7 +9089,6 @@ import test.test.runtime.JSON;
  * MapRequest
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapRequest {
   public static final String SERIALIZED_NAME_MAP_PROPERTY = "mapProperty";
   @SerializedName(SERIALIZED_NAME_MAP_PROPERTY)
@@ -10040,7 +9098,7 @@ public class MapRequest {
   }
 
   public MapRequest mapProperty(Map<String, MapRequestMapPropertyValue> mapProperty) {
-    
+
     this.mapProperty = mapProperty;
     return this;
   }
@@ -10055,7 +9113,6 @@ public class MapRequest {
    * @return mapProperty
   **/
   @javax.annotation.Nonnull
-
   public Map<String, MapRequestMapPropertyValue> getMapProperty() {
     return mapProperty;
   }
@@ -10066,7 +9123,6 @@ public class MapRequest {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -10077,6 +9133,7 @@ public class MapRequest {
     }
     MapRequest mapRequest = (MapRequest) o;
     return Objects.equals(this.mapProperty, mapRequest.mapProperty);
+        
   }
 
   @Override
@@ -10196,17 +9253,15 @@ public class MapRequest {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/MapRequestMapPropertyValue.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -10222,24 +9277,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -10247,7 +9324,6 @@ import test.test.runtime.JSON;
  * MapRequestMapPropertyValue
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapRequestMapPropertyValue {
   public static final String SERIALIZED_NAME_A = "a";
   @SerializedName(SERIALIZED_NAME_A)
@@ -10261,7 +9337,7 @@ public class MapRequestMapPropertyValue {
   }
 
   public MapRequestMapPropertyValue a(String a) {
-    
+
     this.a = a;
     return this;
   }
@@ -10271,7 +9347,6 @@ public class MapRequestMapPropertyValue {
    * @return a
   **/
   @javax.annotation.Nonnull
-
   public String getA() {
     return a;
   }
@@ -10281,9 +9356,8 @@ public class MapRequestMapPropertyValue {
     this.a = a;
   }
 
-
   public MapRequestMapPropertyValue b(String b) {
-    
+
     this.b = b;
     return this;
   }
@@ -10293,7 +9367,6 @@ public class MapRequestMapPropertyValue {
    * @return b
   **/
   @javax.annotation.Nullable
-
   public String getB() {
     return b;
   }
@@ -10304,7 +9377,6 @@ public class MapRequestMapPropertyValue {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -10316,6 +9388,7 @@ public class MapRequestMapPropertyValue {
     MapRequestMapPropertyValue mapRequestMapPropertyValue = (MapRequestMapPropertyValue) o;
     return Objects.equals(this.a, mapRequestMapPropertyValue.a) &&
         Objects.equals(this.b, mapRequestMapPropertyValue.b);
+        
   }
 
   @Override
@@ -10443,17 +9516,15 @@ public class MapRequestMapPropertyValue {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/TestRequest.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -10468,26 +9539,47 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
 import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -10495,7 +9587,6 @@ import test.test.runtime.JSON;
  * This is a test request
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TestRequest {
   public static final String SERIALIZED_NAME_MY_INPUT = "myInput";
   @SerializedName(SERIALIZED_NAME_MY_INPUT)
@@ -10505,7 +9596,7 @@ public class TestRequest {
   }
 
   public TestRequest myInput(BigDecimal myInput) {
-    
+
     this.myInput = myInput;
     return this;
   }
@@ -10515,7 +9606,6 @@ public class TestRequest {
    * @return myInput
   **/
   @javax.annotation.Nullable
-
   public BigDecimal getMyInput() {
     return myInput;
   }
@@ -10526,7 +9616,6 @@ public class TestRequest {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -10537,6 +9626,7 @@ public class TestRequest {
     }
     TestRequest testRequest = (TestRequest) o;
     return Objects.equals(this.myInput, testRequest.myInput);
+        
   }
 
   @Override
@@ -10648,17 +9738,15 @@ public class TestRequest {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/TestResponse.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -10667,34 +9755,54 @@ package test.test.runtime.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import test.test.runtime.model.TestResponseMessagesInner;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.List;
-import test.test.runtime.model.TestResponseMessagesInner;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -10702,7 +9810,6 @@ import test.test.runtime.JSON;
  * This is a test response
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TestResponse {
   public static final String SERIALIZED_NAME_MESSAGES = "messages";
   @SerializedName(SERIALIZED_NAME_MESSAGES)
@@ -10712,7 +9819,7 @@ public class TestResponse {
   }
 
   public TestResponse messages(List<TestResponseMessagesInner> messages) {
-    
+
     this.messages = messages;
     return this;
   }
@@ -10727,7 +9834,6 @@ public class TestResponse {
    * @return messages
   **/
   @javax.annotation.Nonnull
-
   public List<TestResponseMessagesInner> getMessages() {
     return messages;
   }
@@ -10738,7 +9844,6 @@ public class TestResponse {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -10749,6 +9854,7 @@ public class TestResponse {
     }
     TestResponse testResponse = (TestResponse) o;
     return Objects.equals(this.messages, testResponse.messages);
+        
   }
 
   @Override
@@ -10878,17 +9984,15 @@ public class TestResponse {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
   "src/main/java/test/test/runtime/model/TestResponseMessagesInner.java": "/*
  * Example API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ * 
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ *
+ * NOTE: This class is auto generated.
  * Do not edit the class manually.
  */
 
@@ -10904,24 +10008,46 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
+import javax.ws.rs.core.GenericType;
+
+import java.io.IOException;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.List;
+import java.util.Set;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import test.test.runtime.JSON;
 
@@ -10929,7 +10055,6 @@ import test.test.runtime.JSON;
  * TestResponseMessagesInner
  */
 @lombok.AllArgsConstructor @lombok.experimental.SuperBuilder
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TestResponseMessagesInner {
   public static final String SERIALIZED_NAME_MESSAGE = "message";
   @SerializedName(SERIALIZED_NAME_MESSAGE)
@@ -10943,7 +10068,7 @@ public class TestResponseMessagesInner {
   }
 
   public TestResponseMessagesInner message(String message) {
-    
+
     this.message = message;
     return this;
   }
@@ -10953,7 +10078,6 @@ public class TestResponseMessagesInner {
    * @return message
   **/
   @javax.annotation.Nullable
-
   public String getMessage() {
     return message;
   }
@@ -10963,9 +10087,8 @@ public class TestResponseMessagesInner {
     this.message = message;
   }
 
-
   public TestResponseMessagesInner id(Integer id) {
-    
+
     this.id = id;
     return this;
   }
@@ -10975,7 +10098,6 @@ public class TestResponseMessagesInner {
    * @return id
   **/
   @javax.annotation.Nonnull
-
   public Integer getId() {
     return id;
   }
@@ -10986,7 +10108,6 @@ public class TestResponseMessagesInner {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -10998,6 +10119,7 @@ public class TestResponseMessagesInner {
     TestResponseMessagesInner testResponseMessagesInner = (TestResponseMessagesInner) o;
     return Objects.equals(this.message, testResponseMessagesInner.message) &&
         Objects.equals(this.id, testResponseMessagesInner.id);
+        
   }
 
   @Override
@@ -11122,7 +10244,6 @@ public class TestResponseMessagesInner {
     return JSON.getGson().toJson(this);
   }
 }
-
 ",
 }
 `;
diff --git a/packages/type-safe-api/test/scripts/generators/async/java-lambda-handlers.test.ts b/packages/type-safe-api/test/scripts/generators/async/java-lambda-handlers.test.ts
index e16fc3b53..9216e4a47 100644
--- a/packages/type-safe-api/test/scripts/generators/async/java-lambda-handlers.test.ts
+++ b/packages/type-safe-api/test/scripts/generators/async/java-lambda-handlers.test.ts
@@ -51,7 +51,6 @@ describe("Java Async Handlers Code Generation Script Unit Tests", () => {
         );
       },
       {
-        excludeGlobs: GeneratedJavaAsyncRuntimeProject.openApiIgnorePatterns,
         parseJson: false,
       }
     );
diff --git a/packages/type-safe-api/test/scripts/generators/async/java.test.ts b/packages/type-safe-api/test/scripts/generators/async/java.test.ts
index 763d2e412..00d480995 100644
--- a/packages/type-safe-api/test/scripts/generators/async/java.test.ts
+++ b/packages/type-safe-api/test/scripts/generators/async/java.test.ts
@@ -3,7 +3,6 @@ SPDX-License-Identifier: Apache-2.0 */
 import os from "os";
 import * as path from "path";
 import { exec } from "projen/lib/util";
-import { OpenApiToolsJsonFile } from "../../../../src/project/codegen/components/open-api-tools-json-file";
 import { GeneratedJavaAsyncRuntimeProject } from "../../../../src/project/codegen/runtime/generated-java-async-runtime-project";
 import { withTmpDirSnapshot } from "../../../project/snapshot-utils";
 
@@ -27,26 +26,17 @@ describe("Java Async Runtime Code Generation Script Unit Tests", () => {
           outdir,
           specPath: "spec.yaml",
         });
-        // Synth the openapitools.json since it's used by the generate command
-        OpenApiToolsJsonFile.of(project)!.synthesize();
-        exec(
-          project.tasks.tryFind("create-openapitools.json")!.steps[0].exec!,
-          { cwd: outdir }
-        );
         exec(
           `${path.resolve(
             __dirname,
-            "../../../../scripts/type-safe-api/generators/generate"
+            "../../../../scripts/type-safe-api/run.js generate"
           )} ${project.buildGenerateCommandArgs()}`,
           {
             cwd: outdir,
           }
         );
         return {
-          excludeGlobs: [
-            ...(project as any).openapiGeneratorIgnore._patterns,
-            "spec.yaml",
-          ],
+          excludeGlobs: ["spec.yaml"],
           parseJson: false,
         };
       })
diff --git a/packages/type-safe-api/test/scripts/generators/java-cdk-infrastructure.test.ts b/packages/type-safe-api/test/scripts/generators/java-cdk-infrastructure.test.ts
index b07f2de3b..1fdbf928c 100644
--- a/packages/type-safe-api/test/scripts/generators/java-cdk-infrastructure.test.ts
+++ b/packages/type-safe-api/test/scripts/generators/java-cdk-infrastructure.test.ts
@@ -114,7 +114,6 @@ describe("Java Infrastructure Code Generation Script Unit Tests", () => {
         );
       },
       {
-        excludeGlobs: GeneratedJavaRuntimeProject.openApiIgnorePatterns,
         parseJson: false,
       }
     );
diff --git a/packages/type-safe-api/test/scripts/generators/java-lambda-handlers.test.ts b/packages/type-safe-api/test/scripts/generators/java-lambda-handlers.test.ts
index 86e4f4588..f203a0c43 100644
--- a/packages/type-safe-api/test/scripts/generators/java-lambda-handlers.test.ts
+++ b/packages/type-safe-api/test/scripts/generators/java-lambda-handlers.test.ts
@@ -48,7 +48,6 @@ describe("Java Handlers Code Generation Script Unit Tests", () => {
         );
       },
       {
-        excludeGlobs: GeneratedJavaRuntimeProject.openApiIgnorePatterns,
         parseJson: false,
       }
     );
diff --git a/packages/type-safe-api/test/scripts/generators/java.test.ts b/packages/type-safe-api/test/scripts/generators/java.test.ts
index dda868d8c..073c5dae6 100644
--- a/packages/type-safe-api/test/scripts/generators/java.test.ts
+++ b/packages/type-safe-api/test/scripts/generators/java.test.ts
@@ -3,7 +3,6 @@ SPDX-License-Identifier: Apache-2.0 */
 import os from "os";
 import * as path from "path";
 import { exec } from "projen/lib/util";
-import { OpenApiToolsJsonFile } from "../../../src/project/codegen/components/open-api-tools-json-file";
 import { GeneratedJavaRuntimeProject } from "../../../src/project/codegen/runtime/generated-java-runtime-project";
 import { withTmpDirSnapshot } from "../../project/snapshot-utils";
 
@@ -35,16 +34,10 @@ describe("Java Client Code Generation Script Unit Tests", () => {
             outdir,
             specPath: "spec.yaml",
           });
-          // Synth the openapitools.json since it's used by the generate command
-          OpenApiToolsJsonFile.of(project)!.synthesize();
-          exec(
-            project.tasks.tryFind("create-openapitools.json")!.steps[0].exec!,
-            { cwd: outdir }
-          );
           exec(
             `${path.resolve(
               __dirname,
-              "../../../scripts/type-safe-api/generators/generate"
+              "../../../scripts/type-safe-api/run.js generate"
             )} ${project.buildGenerateCommandArgs()}`,
             {
               cwd: outdir,
@@ -52,10 +45,7 @@ describe("Java Client Code Generation Script Unit Tests", () => {
           );
         },
         {
-          excludeGlobs: [
-            ...GeneratedJavaRuntimeProject.openApiIgnorePatterns,
-            "spec.yaml",
-          ],
+          excludeGlobs: ["spec.yaml"],
           parseJson: false,
         }
       )