[java-generator] handle additionalProperties = true

Author: andreaTP

CHANGELOG.md

@@ -17,6 +17,11 @@
 * Fix #4911: Config/RequestConfig.websocketTimeout has been removed. Config/RequestConfig.requestTimeout will be used for websocket connection timeouts.
 * Fix #4911: HttpClient api/building changes - writeTimeout has been removed, readTimeout has moved to the HttpRequest
 
+### Unreleased
+
+#### Bugs
+Fix #5145: [java-generator] handle `additionalProperties: true` emitting a field of type `AnyType`
+
 ### 6.6.2 (2023-05-15)
 
 #### Bugs

java-generator/core/src/main/java/io/fabric8/java/generator/nodes/AbstractJSONSchema2Pojo.java

@@ -197,9 +197,11 @@ public static AbstractJSONSchema2Pojo fromJsonSchema(
         case STRING_CRD_TYPE:
           return fromJsonSchema.apply(JPrimitiveNameAndType.STRING);
         case OBJECT_CRD_TYPE:
-          if (prop.getAdditionalProperties() != null
-              && prop.getAdditionalProperties().getSchema() != null) {
+          if (prop.getAdditionalProperties() != null && prop.getAdditionalProperties().getSchema() != null) {
             return fromJsonSchema.apply(new JMapNameAndType(key));
+          } else if (prop.getAdditionalProperties() != null
+              && Boolean.TRUE.equals(prop.getAdditionalProperties().getAllows())) {
+            return fromJsonSchema.apply(JPrimitiveNameAndType.ANY_TYPE);
           } else {
             return fromJsonSchema.apply(new JObjectNameAndType(key));
           }

java-generator/core/src/test/java/io/fabric8/java/generator/GeneratorTest.java

@@ -28,6 +28,7 @@
 import io.fabric8.java.generator.exceptions.JavaGeneratorException;
 import io.fabric8.java.generator.nodes.*;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import org.junit.jupiter.api.Test;
 
@@ -697,6 +698,34 @@ void testObjectNullableFieldsManagement() {
     assertTrue(clzO1.isPresent());
   }
 
+  @Test
+  void testObjectWithAdditionalPropertiesTrue() {
+    // Arrange
+    Map<String, JSONSchemaProps> props = new HashMap<>();
+    JSONSchemaProps obj = new JSONSchemaProps();
+    obj.setType("object");
+    obj.setAdditionalProperties(new JSONSchemaPropsOrBool(true, null));
+    props.put("o1", obj);
+
+    JObject jobj = new JObject(null, "t", props, null, false, defaultConfig, null, Boolean.FALSE, null);
+
+    // Act
+    GeneratorResult res = jobj.generateJava();
+
+    // Assert
+    assertEquals(1, res.getTopLevelClasses().size());
+    assertEquals("T", res.getTopLevelClasses().get(0).getName());
+
+    Optional<ClassOrInterfaceDeclaration> clzT = res.getTopLevelClasses().get(0).getClassByName("T");
+    assertTrue(clzT.isPresent());
+    assertEquals(1, clzT.get().getFields().size());
+    Optional<FieldDeclaration> o1Field = clzT.get().getFieldByName("o1");
+    assertTrue(o1Field.isPresent());
+    FieldDeclaration actualO1Field = o1Field.get();
+    assertEquals("io.fabric8.kubernetes.api.model.AnyType",
+        actualO1Field.getElementType().asString());
+  }
+
   @Test
   void testClassNamesDisambiguationWithPackageNesting() {
     // Arrange