From 01d0d238e06769aab9142dda4b0e9a41384ffd1b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 1 Aug 2026 23:45:23 +0800 Subject: [PATCH 1/6] add logic to handle any type (3.1) with additional properties --- .../org/openapitools/codegen/DefaultCodegen.java | 14 +------------- .../openapitools/codegen/OpenAPINormalizer.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 241b3f881ef0..33493a24e0bd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -2974,12 +2974,6 @@ protected void updateModelForObject(CodegenModel m, Schema schema) { } protected void updateModelForAnyType(CodegenModel m, Schema schema) { - // The 'null' value is allowed when the OAS schema is 'any type'. - // See https://github.com/OAI/OpenAPI-Specification/issues/1389 - if (Boolean.FALSE.equals(schema.getNullable())) { - LOGGER.error("Schema '{}' is any type, which includes the 'null' value. 'nullable' cannot be set to 'false'", m.name); - } - // m.isNullable = true; if (ModelUtils.isMapSchema(schema)) { // an object or anyType composed schema that has additionalProperties set addAdditionPropertiesToCodeGenModel(m, schema); @@ -3165,7 +3159,7 @@ public CodegenModel fromModel(String name, Schema schema) { if (!ModelUtils.isArraySchema(schema)) { m.dataType = getSchemaType(schema); } - if (!ModelUtils.isAnyType(schema) && Boolean.TRUE.equals(schema.getNullable())) { + if (ModelUtils.isNullable(schema)) { m.isNullable = Boolean.TRUE; } @@ -3714,12 +3708,6 @@ protected void updatePropertyForObject(CodegenProperty property, Schema p) { } protected void updatePropertyForAnyType(CodegenProperty property, Schema p) { - // The 'null' value is allowed when the OAS schema is 'any type'. - // See https://github.com/OAI/OpenAPI-Specification/issues/1389 - if (Boolean.FALSE.equals(p.getNullable())) { - LOGGER.warn("Schema '{}' is any type, which includes the 'null' value. 'nullable' cannot be set to 'false'", p.getName()); - } - property.isNullable = property.isNullable || !(ModelUtils.isComposedSchema(p)) || p.getAllOf() == null || diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java index d0b71a23d1c3..424fb3ea2d02 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java @@ -2182,13 +2182,19 @@ protected Schema processNormalize31Spec(Schema schema, Set visitedSchema normalizeExclusiveMinMax31(schema); if (schema instanceof JsonSchema && - schema.get$schema() == null && - schema.getTypes() == null && schema.getType() == null) { + schema.get$schema() == null && schema.getTypes() == null && schema.getType() == null) { // convert any type in v3.1 to empty schema (any type in v3.0 spec), any type example: // components: // schemas: // any_type: {} - return new Schema(); + Schema sc = new Schema<>(); + + // additional properties set? + if (schema.getAdditionalProperties() != null) { + sc.setAdditionalProperties(schema.getAdditionalProperties()); + } + + return sc; } // return schema if nothing in 3.1 spec types to normalize From 84735129be3ec3ee505a955d46fc45e61cd187f1 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 2 Aug 2026 00:22:04 +0800 Subject: [PATCH 2/6] add any type check --- .../src/main/java/org/openapitools/codegen/DefaultCodegen.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 33493a24e0bd..7b0cb9b21112 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -3159,7 +3159,8 @@ public CodegenModel fromModel(String name, Schema schema) { if (!ModelUtils.isArraySchema(schema)) { m.dataType = getSchemaType(schema); } - if (ModelUtils.isNullable(schema)) { + // nullable or any type (which is nullable by default in 3.1 spec) + if (ModelUtils.isNullable(schema) || ModelUtils.isAnyType(schema)) { m.isNullable = Boolean.TRUE; } From 008af19449306a58e9cee8cfdb1ec2ef94b5dca9 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 2 Aug 2026 00:29:58 +0800 Subject: [PATCH 3/6] revert --- .../src/main/java/org/openapitools/codegen/DefaultCodegen.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 7b0cb9b21112..bb92904b92c6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -3159,8 +3159,7 @@ public CodegenModel fromModel(String name, Schema schema) { if (!ModelUtils.isArraySchema(schema)) { m.dataType = getSchemaType(schema); } - // nullable or any type (which is nullable by default in 3.1 spec) - if (ModelUtils.isNullable(schema) || ModelUtils.isAnyType(schema)) { + if (!ModelUtils.isAnyType(schema) && Boolean.TRUE.equals(schema.getNullable())) { m.isNullable = Boolean.TRUE; } From 1393bcb0fb0b2a02ced0bc56b4592fffcc034e9d Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 2 Aug 2026 00:37:15 +0800 Subject: [PATCH 4/6] update null type --- .../main/java/org/openapitools/codegen/utils/ModelUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index 40058b1e90f2..669f98c7ccc7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -2620,8 +2620,8 @@ public static boolean isNullTypeSchema(OpenAPI openAPI, Schema schema) { return false; } - // schema with properties - if (schema.getProperties() != null) { + // schema with properties or additional properties + if (schema.getProperties() != null || schema.getAdditionalProperties() != null) { return false; } From 6e403be327816edd1fc90e36b2225cf35b669f50 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 2 Aug 2026 00:57:05 +0800 Subject: [PATCH 5/6] update --- .../main/java/org/openapitools/codegen/OpenAPINormalizer.java | 3 +++ .../main/java/org/openapitools/codegen/utils/ModelUtils.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java index 424fb3ea2d02..461311648c0c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java @@ -2189,6 +2189,9 @@ protected Schema processNormalize31Spec(Schema schema, Set visitedSchema // any_type: {} Schema sc = new Schema<>(); + // copy description, title, etc + ModelUtils.copyMetadata(schema, sc); + // additional properties set? if (schema.getAdditionalProperties() != null) { sc.setAdditionalProperties(schema.getAdditionalProperties()); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index 669f98c7ccc7..933804e88e8a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -2621,7 +2621,8 @@ public static boolean isNullTypeSchema(OpenAPI openAPI, Schema schema) { } // schema with properties or additional properties - if (schema.getProperties() != null || schema.getAdditionalProperties() != null) { + if (schema.getProperties() != null || + (schema.getAdditionalProperties() != null && !Boolean.FALSE.equals(schema.getBooleanSchemaValue()))) { return false; } From f832ba777df6c3a7b6dbce9b4efbcc7475c85921 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 2 Aug 2026 01:06:06 +0800 Subject: [PATCH 6/6] fix copy examples --- .../main/java/org/openapitools/codegen/utils/ModelUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index 933804e88e8a..cea929c90965 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -2727,7 +2727,7 @@ public static void copyMetadata(Schema from, Schema to) { to.setExample(from.getExample()); } if (from.getExamples() != null) { - to.setExample(from.getExamples()); + to.setExamples(from.getExamples()); } if (from.getReadOnly() != null) { to.setReadOnly(from.getReadOnly());