diff --git a/.github/workflows/samples-java-play-framework.yaml b/.github/workflows/samples-java-play-framework.yaml
index fd1c6b014e90..7ce841395cac 100644
--- a/.github/workflows/samples-java-play-framework.yaml
+++ b/.github/workflows/samples-java-play-framework.yaml
@@ -23,7 +23,7 @@ jobs:
           - samples/server/petstore/java-play-framework-fake-endpoints
           - samples/server/petstore/java-play-framework-fake-endpoints-with-security
           - samples/server/petstore/java-play-framework-no-bean-validation
-          - samples/server/petstore/java-play-framework-no-exception-handling
+          - samples/server/petstore/java-play-framework-no-excp-handling
           - samples/server/petstore/java-play-framework-no-interface
           - samples/server/petstore/java-play-framework-no-nullable
           - samples/server/petstore/java-play-framework-no-swagger-ui
diff --git a/.github/workflows/samples-spring.yaml b/.github/workflows/samples-spring.yaml
index 9bc148dda40a..7f0a903ace3d 100644
--- a/.github/workflows/samples-spring.yaml
+++ b/.github/workflows/samples-spring.yaml
@@ -42,7 +42,7 @@ jobs:
           - samples/openapi3/server/petstore/springboot-delegate
           - samples/openapi3/server/petstore/spring-boot-oneof
           - samples/server/petstore/spring-boot-nullable-set
-          - samples/server/petstore/spring-boot-defaultInterface-unhandledException
+          - samples/server/petstore/spring-boot-defaultInterface-unhandledExcp
           - samples/server/petstore/springboot
           - samples/server/petstore/springboot-beanvalidation
           - samples/server/petstore/springboot-builtin-validation
diff --git a/bin/configs/java-play-framework-no-exception-handling.yaml b/bin/configs/java-play-framework-no-excp-handling-.yaml
similarity index 77%
rename from bin/configs/java-play-framework-no-exception-handling.yaml
rename to bin/configs/java-play-framework-no-excp-handling-.yaml
index f231fbb9607c..982b1d94a843 100644
--- a/bin/configs/java-play-framework-no-exception-handling.yaml
+++ b/bin/configs/java-play-framework-no-excp-handling-.yaml
@@ -1,5 +1,5 @@
 generatorName: java-play-framework
-outputDir: samples/server/petstore/java-play-framework-no-exception-handling
+outputDir: samples/server/petstore/java-play-framework-no-excp-handling
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
 additionalProperties:
diff --git a/bin/configs/spring-boot-defaultInterface-unhandledException.yaml b/bin/configs/spring-boot-defaultInterface-unhandledExcp.yaml
similarity index 96%
rename from bin/configs/spring-boot-defaultInterface-unhandledException.yaml
rename to bin/configs/spring-boot-defaultInterface-unhandledExcp.yaml
index 9e0960628839..18608bd41adf 100644
--- a/bin/configs/spring-boot-defaultInterface-unhandledException.yaml
+++ b/bin/configs/spring-boot-defaultInterface-unhandledExcp.yaml
@@ -1,5 +1,5 @@
 generatorName: spring
-outputDir: samples/server/petstore/spring-boot-defaultInterface-unhandledException
+outputDir: samples/server/petstore/spring-boot-defaultInterface-unhandledExcp
 inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
diff --git a/bin/generate-samples.sh b/bin/generate-samples.sh
index 3f88859f9779..1adcab12e5c1 100755
--- a/bin/generate-samples.sh
+++ b/bin/generate-samples.sh
@@ -60,6 +60,14 @@ else
 
     # shellcheck disable=SC2086
     # shellcheck disable=SC2068
-    java ${JAVA_OPTS} -jar "$executable" batch ${BATCH_OPTS} --includes-base-dir "${root}" --fail-fast  -- ${files[@]}
+    if java ${JAVA_OPTS} -jar "$executable" batch ${BATCH_OPTS} --includes-base-dir "${root}" --fail-fast  -- ${files[@]} 2>&1 | tee /dev/pts/0 | grep -q -i "exception"; then
+      echo "Found exception(s) when running the generator(s) to update the samples."
+      export GENERATE_ERROR=1
+    fi
 fi
 
+if [[ -n "$GENERATE_ERROR" ]]; then
+  echo "Found exception(s) when running the generator(s) to update the samples."
+  # UNCOMMENT LATER
+  #exit 1
+fi
diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml
index 8828ce072268..a9b5c4924a67 100644
--- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml
@@ -2798,9 +2798,8 @@ components:
               format: float32
             - type: object
               $ref: '#/components/schemas/MixedSubId'
-              
           description:  Mixed anyOf types for testing
     MixedSubId:
       properties:
         id:
-          type: string
\ No newline at end of file
+          type: string
diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index a9b677c1740b..1c9e901ad0dd 100644
--- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -2856,7 +2856,6 @@ components:
               format: float32
             - type: object
               $ref: '#/components/schemas/MixedSubId'
-              
           description:  Mixed anyOf types for testing
     MixedSubId:
       properties:
diff --git a/modules/openapi-generator/src/test/resources/3_0/enum-implements.yaml b/modules/openapi-generator/src/test/resources/3_0/enum-implements.yaml
index 98f6de72ecca..131f715ef16f 100644
--- a/modules/openapi-generator/src/test/resources/3_0/enum-implements.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/enum-implements.yaml
@@ -17,6 +17,64 @@ paths:
                 type: array
                 items:
                   $ref: '#/components/schemas/Pony'
+  /fake/null-request-body:
+    get:
+      summary: to ensure null request body wont' throw exception
+      operationId: null-request-body
+      parameters:
+        - name: Accept-Language
+          in: header
+          schema:
+            type: string
+            example: application/json
+      requestBody:
+        content:
+          text/plain:
+            examples:
+              Generar Orden por External ID:
+                value: |-
+                  {
+                      "external_reference": "{{external_order_ref}}",
+                      "notification_url": "www.yourserver.com/yourendpoint",
+                      "sponsor_id": 446566691,
+                      "items": [
+                          {
+                              "title": "Papas frita",
+                              "currency_id": "{{currency_id}}",
+                              "unit_price": 6000,
+                              "quantity": 1
+                          },
+                          {
+                              "title": "Gaseosa",
+                              "currency_id": "{{currency_id}}",
+                              "unit_price": 3000,
+                              "quantity": 1
+                          }
+                      ]/*,
+                      "taxes": [
+                          {
+                              "value": 0,
+                              "type": "IVA"
+                          }
+                      ]*/
+                  }
+      responses:
+        '200':
+          description: ''
+  /myExample:
+    get:
+      responses:
+        '200':
+          description: Response
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - type: array
+                    items:
+                      "$ref": "#/components/schemas/OneOf1"
+                  - type: object
+                    "$ref": "#/components/schemas/OneOf1"
 components:
   schemas:
     Pony:
@@ -30,4 +88,9 @@ components:
       enum:
         - Earth
         - Pegasi
-        - Unicorn
\ No newline at end of file
+        - Unicorn
+    OneOf1:
+      type: object
+      properties:
+        message1:
+          type: string
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
index c2d90ddd2672..9cf24ac86351 100644
--- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
@@ -1297,52 +1297,6 @@ paths:
       responses:
         200:
           description: OK
-  /fake/null-request-body:
-    get:
-      tags:
-        - another_fake
-      summary: null request body
-      operationId: null-request-body
-      parameters:
-        - name: Accept-Language
-          in: header
-          schema:
-            type: string
-            example: application/json
-      requestBody:
-        content:
-          text/plain:
-            examples:
-              Generar Orden por External ID:
-                value: |-
-                  {
-                      "external_reference": "{{external_order_ref}}",
-                      "notification_url": "www.yourserver.com/yourendpoint",
-                      "sponsor_id": 446566691,
-                      "items": [
-                          {
-                              "title": "Papas frita",
-                              "currency_id": "{{currency_id}}",
-                              "unit_price": 6000,
-                              "quantity": 1
-                          },
-                          {
-                              "title": "Gaseosa",
-                              "currency_id": "{{currency_id}}",
-                              "unit_price": 3000,
-                              "quantity": 1
-                          }
-                      ]/*,
-                      "taxes": [
-                          {
-                              "value": 0,
-                              "type": "IVA"
-                          }
-                      ]*/
-                  }
-      responses:
-        '200':
-          description: ''
   '/fake/pet/{petId}/uploadImage':
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/3_0/oneOf_array.yaml b/modules/openapi-generator/src/test/resources/3_0/oneOf_array.yaml
index 72adee84e763..48d94a9cc7b4 100644
--- a/modules/openapi-generator/src/test/resources/3_0/oneOf_array.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/oneOf_array.yaml
@@ -15,12 +15,11 @@ paths:
                   - type: array
                     items:
                       "$ref": "#/components/schemas/OneOf1"
-                  - type: object
-                    "$ref": "#/components/schemas/OneOf1"
+                  - "$ref": "#/components/schemas/OneOf1"
 components:
   schemas:
     OneOf1:
       type: object
       properties:
         message1:
-          type: string
+          type: string
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson/README.md b/samples/client/petstore/java/okhttp-gson/README.md
index 25f42fe4574d..38d6a8c6a451 100644
--- a/samples/client/petstore/java/okhttp-gson/README.md
+++ b/samples/client/petstore/java/okhttp-gson/README.md
@@ -117,7 +117,6 @@ Class | Method | HTTP request | Description
 *AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 *AnotherFakeApi* | [**getParameterArrayNumber**](docs/AnotherFakeApi.md#getParameterArrayNumber) | **GET** /fake/parameter-array-number | parameter array number default value
 *AnotherFakeApi* | [**getParameterStringNumber**](docs/AnotherFakeApi.md#getParameterStringNumber) | **GET** /fake/parameter-string-number | parameter string number
-*AnotherFakeApi* | [**nullRequestBody**](docs/AnotherFakeApi.md#nullRequestBody) | **GET** /fake/null-request-body | null request body
 *DefaultApi* | [**fakeAnyOfWIthSameErasureGet**](docs/DefaultApi.md#fakeAnyOfWIthSameErasureGet) | **GET** /fake/anyOfWIthSameErasure | 
 *DefaultApi* | [**fakeFreeFormQueryParametersGet**](docs/DefaultApi.md#fakeFreeFormQueryParametersGet) | **GET** /fake/free-form-query-parameters | 
 *DefaultApi* | [**fakeOneOfWIthSameErasureGet**](docs/DefaultApi.md#fakeOneOfWIthSameErasureGet) | **GET** /fake/oneOfWIthSameErasure | 
diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
index 1b963a699a5f..5d897fbe1465 100644
--- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
+++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
@@ -1404,57 +1404,6 @@ paths:
       - another_fake
       x-accepts:
       - application/json
-  /fake/null-request-body:
-    get:
-      operationId: null-request-body
-      parameters:
-      - explode: false
-        in: header
-        name: Accept-Language
-        required: false
-        schema:
-          example: application/json
-          type: string
-        style: simple
-      requestBody:
-        content:
-          text/plain:
-            examples:
-              Generar Orden por External ID:
-                value: |-
-                  {
-                      "external_reference": "{{external_order_ref}}",
-                      "notification_url": "www.yourserver.com/yourendpoint",
-                      "sponsor_id": 446566691,
-                      "items": [
-                          {
-                              "title": "Papas frita",
-                              "currency_id": "{{currency_id}}",
-                              "unit_price": 6000,
-                              "quantity": 1
-                          },
-                          {
-                              "title": "Gaseosa",
-                              "currency_id": "{{currency_id}}",
-                              "unit_price": 3000,
-                              "quantity": 1
-                          }
-                      ]/*,
-                      "taxes": [
-                          {
-                              "value": 0,
-                              "type": "IVA"
-                          }
-                      ]*/
-                  }
-      responses:
-        "200":
-          description: ""
-      summary: null request body
-      tags:
-      - another_fake
-      x-accepts:
-      - application/json
   /fake/pet/{petId}/uploadImage:
     post:
       description: ""
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md
index d21e29ab0926..6cca209c72b1 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md
@@ -7,7 +7,6 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 | [**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags |
 | [**getParameterArrayNumber**](AnotherFakeApi.md#getParameterArrayNumber) | **GET** /fake/parameter-array-number | parameter array number default value |
 | [**getParameterStringNumber**](AnotherFakeApi.md#getParameterStringNumber) | **GET** /fake/parameter-string-number | parameter string number |
-| [**nullRequestBody**](AnotherFakeApi.md#nullRequestBody) | **GET** /fake/null-request-body | null request body |
 
 
 <a id="call123testSpecialTags"></a>
@@ -190,62 +189,3 @@ No authorization required
 |-------------|-------------|------------------|
 | **200** | OK |  -  |
 
-<a id="nullRequestBody"></a>
-# **nullRequestBody**
-> nullRequestBody(acceptLanguage)
-
-null request body
-
-### Example
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.AnotherFakeApi;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-    AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-    String acceptLanguage = "application/json"; // String | 
-    try {
-      apiInstance.nullRequestBody(acceptLanguage);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling AnotherFakeApi#nullRequestBody");
-      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 |
-|------------- | ------------- | ------------- | -------------|
-| **acceptLanguage** | **String**|  | [optional] |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: text/plain
- - **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** |  |  -  |
-
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index c56456266c04..3c8950a4d1ab 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -452,126 +452,4 @@ public class AnotherFakeApi {
         localVarApiClient.executeAsync(localVarCall, _callback);
         return localVarCall;
     }
-    /**
-     * Build call for nullRequestBody
-     * @param acceptLanguage  (optional)
-     * @param _callback Callback for upload/download progress
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     * @http.response.details
-     <table border="1">
-       <caption>Response Details</caption>
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td>  </td><td>  -  </td></tr>
-     </table>
-     */
-    public okhttp3.Call nullRequestBodyCall(@javax.annotation.Nullable String acceptLanguage, 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 = null;
-
-        // create path and map variables
-        String localVarPath = "/fake/null-request-body";
-
-        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>();
-
-        final String[] localVarAccepts = {
-        };
-        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) {
-            localVarHeaderParams.put("Accept", localVarAccept);
-        }
-
-        final String[] localVarContentTypes = {
-            "text/plain"
-        };
-        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
-        if (localVarContentType != null) {
-            localVarHeaderParams.put("Content-Type", localVarContentType);
-        }
-
-        if (acceptLanguage != null) {
-            localVarHeaderParams.put("Accept-Language", localVarApiClient.parameterToString(acceptLanguage));
-        }
-
-
-        String[] localVarAuthNames = new String[] {  };
-        return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
-    }
-
-    @SuppressWarnings("rawtypes")
-    private okhttp3.Call nullRequestBodyValidateBeforeCall(@javax.annotation.Nullable String acceptLanguage, final ApiCallback _callback) throws ApiException {
-        return nullRequestBodyCall(acceptLanguage, _callback);
-
-    }
-
-    /**
-     * null request body
-     * 
-     * @param acceptLanguage  (optional)
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     * @http.response.details
-     <table border="1">
-       <caption>Response Details</caption>
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td>  </td><td>  -  </td></tr>
-     </table>
-     */
-    public void nullRequestBody(@javax.annotation.Nullable String acceptLanguage) throws ApiException {
-        nullRequestBodyWithHttpInfo(acceptLanguage);
-    }
-
-    /**
-     * null request body
-     * 
-     * @param acceptLanguage  (optional)
-     * @return ApiResponse&lt;Void&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     * @http.response.details
-     <table border="1">
-       <caption>Response Details</caption>
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td>  </td><td>  -  </td></tr>
-     </table>
-     */
-    public ApiResponse<Void> nullRequestBodyWithHttpInfo(@javax.annotation.Nullable String acceptLanguage) throws ApiException {
-        okhttp3.Call localVarCall = nullRequestBodyValidateBeforeCall(acceptLanguage, null);
-        return localVarApiClient.execute(localVarCall);
-    }
-
-    /**
-     * null request body (asynchronously)
-     * 
-     * @param acceptLanguage  (optional)
-     * @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
-     * @http.response.details
-     <table border="1">
-       <caption>Response Details</caption>
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td>  </td><td>  -  </td></tr>
-     </table>
-     */
-    public okhttp3.Call nullRequestBodyAsync(@javax.annotation.Nullable String acceptLanguage, final ApiCallback<Void> _callback) throws ApiException {
-
-        okhttp3.Call localVarCall = nullRequestBodyValidateBeforeCall(acceptLanguage, _callback);
-        localVarApiClient.executeAsync(localVarCall, _callback);
-        return localVarCall;
-    }
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
index 9f059948f816..face3d9b785e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
@@ -70,16 +70,4 @@ public class AnotherFakeApiTest {
         // TODO: test validations
     }
 
-    /**
-     * null request body
-     *
-     * @throws ApiException if the Api call fails
-     */
-    @Test
-    public void nullRequestBodyTest() throws ApiException {
-        String acceptLanguage = null;
-        api.nullRequestBody(acceptLanguage);
-        // TODO: test validations
-    }
-
 }
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator-ignore b/samples/server/petstore/java-play-framework-no-excp-handling/.openapi-generator-ignore
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator-ignore
rename to samples/server/petstore/java-play-framework-no-excp-handling/.openapi-generator-ignore
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/FILES b/samples/server/petstore/java-play-framework-no-excp-handling/.openapi-generator/FILES
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/FILES
rename to samples/server/petstore/java-play-framework-no-excp-handling/.openapi-generator/FILES
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-excp-handling/.openapi-generator/VERSION
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION
rename to samples/server/petstore/java-play-framework-no-excp-handling/.openapi-generator/VERSION
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/LICENSE b/samples/server/petstore/java-play-framework-no-excp-handling/LICENSE
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/LICENSE
rename to samples/server/petstore/java-play-framework-no-excp-handling/LICENSE
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/README b/samples/server/petstore/java-play-framework-no-excp-handling/README
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/README
rename to samples/server/petstore/java-play-framework-no-excp-handling/README
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/Module.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/Module.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/Module.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/Module.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/Category.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Category.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/Category.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/ModelApiResponse.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/ModelApiResponse.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/ModelApiResponse.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/Order.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Order.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/Order.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/Pet.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/Pet.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/Tag.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Tag.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/Tag.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/User.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/User.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/User.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/apimodels/User.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/ApiDocController.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/ApiDocController.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/ApiDocController.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/ApiDocController.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/PetApiController.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/PetApiController.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/PetApiControllerImp.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/PetApiControllerImp.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/PetApiControllerImpInterface.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/PetApiControllerImpInterface.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/StoreApiController.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/StoreApiController.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/StoreApiControllerImp.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/StoreApiControllerImp.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/StoreApiControllerImpInterface.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/StoreApiControllerImpInterface.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/UserApiController.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/UserApiController.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/UserApiControllerImp.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/UserApiControllerImp.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/UserApiControllerImpInterface.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/controllers/UserApiControllerImpInterface.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/openapitools/ApiCall.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/openapitools/ApiCall.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/openapitools/ApiCall.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/openapitools/OpenAPIUtils.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/openapitools/OpenAPIUtils.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/openapitools/OpenAPIUtils.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/openapitools/OpenAPIUtils.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/openapitools/SecurityAPIUtils.java b/samples/server/petstore/java-play-framework-no-excp-handling/app/openapitools/SecurityAPIUtils.java
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/app/openapitools/SecurityAPIUtils.java
rename to samples/server/petstore/java-play-framework-no-excp-handling/app/openapitools/SecurityAPIUtils.java
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/build.sbt b/samples/server/petstore/java-play-framework-no-excp-handling/build.sbt
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/build.sbt
rename to samples/server/petstore/java-play-framework-no-excp-handling/build.sbt
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/conf/application.conf b/samples/server/petstore/java-play-framework-no-excp-handling/conf/application.conf
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/conf/application.conf
rename to samples/server/petstore/java-play-framework-no-excp-handling/conf/application.conf
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/conf/logback.xml b/samples/server/petstore/java-play-framework-no-excp-handling/conf/logback.xml
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/conf/logback.xml
rename to samples/server/petstore/java-play-framework-no-excp-handling/conf/logback.xml
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/conf/routes b/samples/server/petstore/java-play-framework-no-excp-handling/conf/routes
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/conf/routes
rename to samples/server/petstore/java-play-framework-no-excp-handling/conf/routes
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/pom.xml b/samples/server/petstore/java-play-framework-no-excp-handling/pom.xml
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/pom.xml
rename to samples/server/petstore/java-play-framework-no-excp-handling/pom.xml
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/project/build.properties b/samples/server/petstore/java-play-framework-no-excp-handling/project/build.properties
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/project/build.properties
rename to samples/server/petstore/java-play-framework-no-excp-handling/project/build.properties
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-excp-handling/project/plugins.sbt
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt
rename to samples/server/petstore/java-play-framework-no-excp-handling/project/plugins.sbt
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json b/samples/server/petstore/java-play-framework-no-excp-handling/public/openapi.json
similarity index 100%
rename from samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json
rename to samples/server/petstore/java-play-framework-no-excp-handling/public/openapi.json
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator-ignore b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/.openapi-generator-ignore
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator-ignore
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/.openapi-generator-ignore
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/.openapi-generator/FILES
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/.openapi-generator/FILES
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/.openapi-generator/VERSION
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/.openapi-generator/VERSION
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/README.md b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/README.md
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/README.md
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/README.md
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/pom.xml b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/pom.xml
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/pom.xml
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/pom.xml
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/AnotherFakeApi.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/AnotherFakeApi.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/ApiUtil.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/ApiUtil.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/ApiUtil.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/ApiUtil.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeApi.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeApi.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/PetApi.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/PetApi.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/StoreApi.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/StoreApi.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/UserApi.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/UserApi.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Animal.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Animal.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayTest.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayTest.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/BigCat.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/BigCat.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Capitalization.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Capitalization.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Cat.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Cat.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Category.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Category.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ChildWithNullable.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ChildWithNullable.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ChildWithNullable.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ClassModel.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ClassModel.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Client.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Client.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Dog.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Dog.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumArrays.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumArrays.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumClass.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumClass.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumClass.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumTest.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumTest.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/File.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/File.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FileSchemaTestClass.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FileSchemaTestClass.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FormatTest.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FormatTest.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MapTest.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MapTest.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Model200Response.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Model200Response.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelApiResponse.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelApiResponse.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelList.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelList.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelReturn.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelReturn.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Name.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Name.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NullableMapProperty.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NumberOnly.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NumberOnly.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Order.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Order.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/OuterComposite.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/OuterComposite.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/OuterEnum.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterEnum.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/OuterEnum.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ParentWithNullable.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ParentWithNullable.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ParentWithNullable.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ReadOnlyFirst.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ReadOnlyFirst.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/SpecialModelName.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/SpecialModelName.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Tag.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Tag.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/User.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/User.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/XmlItem.java
similarity index 100%
rename from samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java
rename to samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/XmlItem.java