fix

OpenAPITools · Apr 7, 2024 · af6a82d · af6a82d
1 parent 36ffe1f
commit af6a82d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 322 deletions.
diff --git a/modules/openapi-generator/src/test/resources/3_1/java/petstore.yaml b/modules/openapi-generator/src/test/resources/3_1/java/petstore.yaml
@@ -909,14 +909,15 @@ components:
       properties: {}
       type: object
       title: HTTPValidationError
-    AnyOfArray:
-      anyOf:
-        - type: array
-          items:
-            type: string
-        - type: array
-          items:
-            type: integer
+    # okhttp-gson doesnot support array of string
+    #AnyOfArray:
+    #  anyOf:
+    #    - type: array
+    #      items:
+    #        type: string
+    #    - type: array
+    #      items:
+    #        type: integer
     ArrayPrefixItems:
       type: array
       description: |

diff --git a/samples/client/petstore/java/okhttp-gson-3.1/.openapi-generator/FILES b/samples/client/petstore/java/okhttp-gson-3.1/.openapi-generator/FILES
@@ -6,7 +6,6 @@ api/openapi.yaml
 build.gradle
 build.sbt
 docs/Animal.md
-docs/AnyOfArray.md
 docs/AnyTypeTest.md
 docs/ArrayOfSameRef.md
 docs/Cat.md
@@ -63,7 +62,6 @@ src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java
 src/main/java/org/openapitools/client/auth/RetryingOAuth.java
 src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
 src/main/java/org/openapitools/client/model/Animal.java
-src/main/java/org/openapitools/client/model/AnyOfArray.java
 src/main/java/org/openapitools/client/model/AnyTypeTest.java
 src/main/java/org/openapitools/client/model/ArrayOfSameRef.java
 src/main/java/org/openapitools/client/model/Cat.java

diff --git a/samples/client/petstore/java/okhttp-gson-3.1/README.md b/samples/client/petstore/java/okhttp-gson-3.1/README.md
@@ -145,7 +145,6 @@ Class | Method | HTTP request | Description
 ## Documentation for Models
 
  - [Animal](docs/Animal.md)
- - [AnyOfArray](docs/AnyOfArray.md)
  - [AnyTypeTest](docs/AnyTypeTest.md)
  - [ArrayOfSameRef](docs/ArrayOfSameRef.md)
  - [Cat](docs/Cat.md)

diff --git a/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml
@@ -1022,12 +1022,6 @@ components:
       properties: {}
       title: HTTPValidationError
       type: object
-    AnyOfArray:
-      anyOf:
-      - items:
-          type: string
-      - items:
-          type: integer
     ArrayPrefixItems:
       description: |
         An item that was added to the queue.

diff --git a/samples/client/petstore/java/okhttp-gson-3.1/docs/AnyOfArray.md b/samples/client/petstore/java/okhttp-gson-3.1/docs/AnyOfArray.md
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/JSON.java
@@ -129,7 +129,6 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         gsonBuilder.registerTypeAdapter(OffsetDateTime.class, offsetDateTimeTypeAdapter);
         gsonBuilder.registerTypeAdapter(LocalDate.class, localDateTypeAdapter);
         gsonBuilder.registerTypeAdapter(byte[].class, byteArrayAdapter);
-        gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.AnyOfArray.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.AnyTypeTest.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfSameRef.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Cat.CustomTypeAdapterFactory());

diff --git a/...petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AnyOfArray.java b/...petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AnyOfArray.java
diff --git a/...tore/java/okhttp-gson-3.1/src/test/java/org/openapitools/client/model/AnyOfArrayTest.java b/...tore/java/okhttp-gson-3.1/src/test/java/org/openapitools/client/model/AnyOfArrayTest.java