Skip to content

Additionalpropertiesfalse generates invalid java code with mapstring #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jemacineiras wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Additionalpropertiesfalse generates invalid java code with mapstring #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e804ae
Fix: Handle additionalProperties false correctly - do not generate Ma…
jemacineiras Dec 11, 2025
ee51629
Merge remote-tracking branch 'origin' into 367-additionalpropertiesfa…
jemacineiras Dec 11, 2025
947f744
Add testing
jemacineiras Dec 15, 2025
2b7d196
fix case issue on tests
jemacineiras Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion multiapi-engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.sngular</groupId>
<artifactId>multiapi-engine</artifactId>
<version>6.3.1</version>
<version>6.3.2</version>
<packaging>jar</packaging>

<properties>
Expand Down
40 changes: 26 additions & 14 deletions ...iapi-engine/src/main/java/com/sngular/api/generator/plugin/common/tools/ModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,13 +539,17 @@ private static List<SchemaFieldObject> processAdditionalProperties(
final var fieldObjectArrayList = new ArrayList<SchemaFieldObject>();

final var addPropObj = ApiTool.getAdditionalProperties(schema);
if (TypeConstants.isBoolean(addPropObj.asText())) {
fieldObjectArrayList
.add(SchemaFieldObject
.builder()
.baseName(fieldName)
.dataType(SchemaFieldObjectType.fromTypeList(TypeConstants.MAP, TypeConstants.OBJECT))
.build());
if (Objects.nonNull(addPropObj) && addPropObj.isBoolean()) {
if (addPropObj.asBoolean()) {
fieldObjectArrayList
.add(SchemaFieldObject
.builder()
.baseName(fieldName)
.dataType(SchemaFieldObjectType.fromTypeList(TypeConstants.MAP, TypeConstants.OBJECT))
.build());
} else {
return fieldObjectArrayList;
}
} else if (ApiTool.hasRef(addPropObj)) {
final String refSchemaName = MapperUtil.getPojoNameFromRef(addPropObj, specFile, null);
fieldObjectArrayList.add(processRef(fieldName, addPropObj,
Expand Down Expand Up @@ -633,12 +637,20 @@ private static void setFieldType(
field.setDataType(SchemaFieldObjectType.fromTypeList(TypeConstants.ARRAY, typeArray));
field.setImportClass(getImportClass(typeArray));
} else if (ApiTool.hasAdditionalProperties(schemaProperty)) {
final String typeObject = getMapTypeObject(schemaProperty, specFile);
field.setDataType(SchemaFieldObjectType.fromTypeList(TypeConstants.MAP, typeObject));
field.setImportClass(getImportClass(typeObject));

final JsonNode apNode = ApiTool.getAdditionalProperties(schemaProperty);
if (Objects.nonNull(apNode) && apNode.isBoolean()) {
if (apNode.asBoolean()) {
final String typeObject = TypeConstants.OBJECT;
field.setDataType(SchemaFieldObjectType.fromTypeList(TypeConstants.MAP, typeObject));
field.setImportClass(getImportClass(typeObject));
} // if boolean false -> do not set map type
} else {
final String typeObject = getMapTypeObject(schemaProperty, specFile);
field.setDataType(SchemaFieldObjectType.fromTypeList(TypeConstants.MAP, typeObject));
field.setImportClass(getImportClass(typeObject));
}
} else if (ApiTool.isObject(schemaProperty)) {
var typeObject = ApiTool.getType(schemaProperty);
String typeObject = ApiTool.getType(schemaProperty);
if (ApiTool.hasRef(schemaProperty)) {
typeObject = MapperUtil.getPojoNameFromRef(schema, specFile, null);
}
Expand All @@ -649,10 +661,10 @@ private static void setFieldType(

private static String getMapTypeObject(final JsonNode schema, final CommonSpecFile specFile) {
final String type;
if (ApiTool.isBoolean(ApiTool.getAdditionalProperties(schema))) {
final JsonNode additionalProperties = ApiTool.getAdditionalProperties(schema);
if (Objects.nonNull(additionalProperties) && additionalProperties.isBoolean()) {
type = TypeConstants.OBJECT;
} else {
final JsonNode additionalProperties = ApiTool.getAdditionalProperties(schema);
if (ApiTool.hasRef(additionalProperties)) {
type = MapperUtil.getPojoNameFromRef(additionalProperties, specFile, null);
} else if (ApiTool.isObject(schema)) {
Expand Down
Loading
Loading