[BUG] [Java] Invalid code generation for oneof types. (OpenAPITools#1…

…8517)
Bethibande · Apr 29, 2024 · 14a34b0 · 14a34b0
1 parent 5f13655
commit 14a34b0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache
@@ -49,7 +49,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
             {{#oneOf}}
             {{^isArray}}
             {{^vendorExtensions.x-duplicated-data-type}}
-            final TypeAdapter<{{{dataType}}}> adapter{{{dataType}}} = gson.getDelegateAdapter(this, TypeToken.get({{{dataType}}}.class));
+            final TypeAdapter<{{{dataType}}}> adapter{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}} = gson.getDelegateAdapter(this, new TypeToken<{{{dataType}}}>() {});
             {{/vendorExtensions.x-duplicated-data-type}}
             {{/isArray}}
             {{#isArray}}
@@ -71,8 +71,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
                     {{#composedSchemas}}
                     {{#oneOf}}
                     {{^vendorExtensions.x-duplicated-data-type}}
-                    // check if the actual instance is of the type `{{{dataType}}}`
-                    if (value.getActualInstance() instanceof {{#isArray}}List<?>{{/isArray}}{{^isArray}}{{{dataType}}}{{/isArray}}) {
+                    // check if the actual instance is of the type `{{{baseType}}}`
+                    if (value.getActualInstance() instanceof {{#isArray}}List<?>{{/isArray}}{{^isArray}}{{{baseType}}}{{/isArray}}) {
                     {{#isPrimitiveType}}
                         JsonPrimitive primitive = adapter{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}}.toJsonTree(({{{dataType}}})value.getActualInstance()).getAsJsonPrimitive();
                         elementAdapter.write(out, primitive);
@@ -280,7 +280,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         {{#composedSchemas}}
         {{#oneOf}}
         {{^vendorExtensions.x-duplicated-data-type}}
-        if (instance instanceof {{#isArray}}List<?>{{/isArray}}{{^isArray}}{{{dataType}}}{{/isArray}}) {
+        if (instance instanceof {{#isArray}}List<?>{{/isArray}}{{^isArray}}{{{baseType}}}{{/isArray}}) {
         {{#isArray}}
             List<?> list = (List<?>) instance;
             if (list.get(0) instanceof {{{items.dataType}}}) {
@@ -322,7 +322,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
      * @return The actual instance of `{{{dataType}}}`
      * @throws ClassCastException if the instance is not `{{{dataType}}}`
      */
-    public {{{dataType}}} get{{#isArray}}{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}}{{/isArray}}{{^isArray}}{{{dataType}}}{{/isArray}}() throws ClassCastException {
+    public {{{dataType}}} get{{#isArray}}{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}}{{/isArray}}{{^isArray}}{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}}{{/isArray}}() throws ClassCastException {
         return ({{{dataType}}})super.getActualInstance();
     }
     {{/vendorExtensions.x-duplicated-data-type}}