better type check for additoinal properties before casting (#18212)

OpenAPITools · Mar 23, 2024 · 420e49f · 420e49f
1 parent 4ca8f9c
commit 420e49f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/...pi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java b/...pi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java
@@ -277,8 +277,11 @@ public String getTypeDeclaration(Schema p) {
             Schema inner = ap.getItems();
             return "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
-            return getTypeDeclaration(inner);
+            Object ap = p.getAdditionalProperties();
+            // additionalProperties is either a Schema or a Boolean
+            if (ap instanceof Schema) {
+                return getTypeDeclaration((Schema) ap);
+            }
         }
 
         // Not using the supertype invocation, because we want to UpperCamelize

diff --git a/...napi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java b/...napi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java
@@ -171,10 +171,10 @@ public String getTypeDeclaration(Schema p) {
 
             return "(s/coll-of " + getTypeDeclaration(inner) + ")";
         } else if (ModelUtils.isMapSchema(p)) {
-            Object additionalProperties = p.getAdditionalProperties();
+            Object ap = p.getAdditionalProperties();
             // additionalProperties is either a Schema or a Boolean
-            if (additionalProperties instanceof Schema) {
-                Schema inner = (Schema) additionalProperties;
+            if (ap instanceof Schema) {
+                Schema inner = (Schema) ap;
                 return "(s/map-of string? " + getTypeDeclaration(inner) + ")";
             }
             return "(s/map-of string? s/any?)";

diff --git a/...r/src/main/java/org/openapitools/codegen/languages/GraphQLNodeJSExpressServerCodegen.java b/...r/src/main/java/org/openapitools/codegen/languages/GraphQLNodeJSExpressServerCodegen.java
@@ -132,9 +132,10 @@ public String getTypeDeclaration(Schema p) {
             // return "[" + getTypeDeclaration(inner) + "]";
             return getTypeDeclaration(inner);
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
-
-            return getTypeDeclaration(inner);
+            Object ap = p.getAdditionalProperties();
+            if (ap instanceof Schema) {
+                return getTypeDeclaration((Schema) ap);
+            }
         }
 
         // IMPORTANT NOTE Not using the supertype invocation, because we want to UpperCamelize the type: