better exception handling when updating samples

Author: wing328

bin/generate-samples.sh

@@ -60,6 +60,13 @@ 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/tty | 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."
+  exit 1
+fi

modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types-localhost.yaml

@@ -2783,8 +2783,7 @@ components:
             # JsonReader will give back C# System.Double regardless of format.
             - type: number
               format: float32
-            - type: object
-              $ref: '#/components/schemas/MixedSubId'
+            - $ref: '#/components/schemas/MixedSubId'
           description: Mixed oneOf types for testing
     MixedAnyOf:
       properties:
@@ -2798,8 +2797,7 @@ components:
             # JsonReader will give back C# System.Double regardless of format.
             - type: number
               format: float32
-            - type: object
-              $ref: '#/components/schemas/MixedSubId'
+            - $ref: '#/components/schemas/MixedSubId'
 
           description:  Mixed anyOf types for testing
     MixedSubId:

modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml

@@ -2781,8 +2781,7 @@ components:
             # JsonReader will give back C# System.Double regardless of format.
             - type: number
               format: float32
-            - type: object
-              $ref: '#/components/schemas/MixedSubId'
+            - $ref: '#/components/schemas/MixedSubId'
           description: Mixed oneOf types for testing
     MixedAnyOf:
       properties:
@@ -2796,8 +2795,7 @@ components:
             # JsonReader will give back C# System.Double regardless of format.
             - type: number
               format: float32
-            - type: object
-              $ref: '#/components/schemas/MixedSubId'
+            - $ref: '#/components/schemas/MixedSubId'
 
           description:  Mixed anyOf types for testing
     MixedSubId:

modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml

@@ -2839,8 +2839,7 @@ components:
             # JsonReader will give back C# System.Double regardless of format.
             - type: number
               format: float32
-            - type: object
-              $ref: '#/components/schemas/MixedSubId'
+            - $ref: '#/components/schemas/MixedSubId'
           description: Mixed oneOf types for testing
     MixedAnyOf:
       properties:
@@ -2854,9 +2853,7 @@ components:
             # JsonReader will give back C# System.Double regardless of format.
             - type: number
               format: float32
-            - type: object
-              $ref: '#/components/schemas/MixedSubId'
-              
+            - $ref: '#/components/schemas/MixedSubId'
           description:  Mixed anyOf types for testing
     MixedSubId:
       properties:

modules/openapi-generator/src/test/resources/3_0/oneOf_array.yaml

@@ -22,4 +22,4 @@ components:
       type: object
       properties:
         message1:
-          type: string
+          type: string