Support additional props (#133)

* Basic support for additional properties

* review

* add back the else branch

* fix

Author: andreaTP

core/src/main/java/io/apicurio/hub/api/codegen/OpenApi2JaxRs.java

@@ -125,7 +125,7 @@ public boolean isIncludeHashcodeAndEquals() {
 
         @Override
         public boolean isIncludeAdditionalProperties() {
-            return false;
+            return true;
         }
 
         @Override

core/src/main/java/io/apicurio/hub/api/codegen/pre/DocumentPreProcessor.java

@@ -33,6 +33,7 @@ public class DocumentPreProcessor {
             new OpenApiDateTimeSimpleTypeProcessor(),
             new OpenApiByteSimpleTypeProcessor(),
             new OpenApiMapDataTypeProcessor(),
+            new OpenApiAdditionalPropertiesDataTypeProcessor(),
             new OpenApiTypeInliner(),
             new OpenApiInlinedSchemaRemover(),
             new OpenApiParameterInliner(),

core/src/main/java/io/apicurio/hub/api/codegen/pre/OpenApiAdditionalPropertiesDataTypeProcessor.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.apicurio.hub.api.codegen.pre;
+
+import io.apicurio.datamodels.models.Schema;
+import io.apicurio.datamodels.models.openapi.v31.OpenApi31Schema;
+import io.apicurio.datamodels.models.union.BooleanUnionValueImpl;
+import io.apicurio.hub.api.codegen.jaxrs.TraversingOpenApi31VisitorAdapter;
+
+/**
+ * @author [email protected]
+ */
+public class OpenApiAdditionalPropertiesDataTypeProcessor extends TraversingOpenApi31VisitorAdapter {
+
+    /**
+     * @see io.apicurio.datamodels.models.openapi.v31.visitors.OpenApi31VisitorAdapter#visitSchema(io.apicurio.datamodels.models.Schema)
+     */
+    @Override
+    public void visitSchema(Schema node) {
+        OpenApi31Schema schema = (OpenApi31Schema) node;
+        if (schema.getAdditionalProperties() != null && (schema.getAdditionalProperties().isSchema() ||
+                (schema.getAdditionalProperties().isBoolean() && schema.getAdditionalProperties().asBoolean()))) {
+            // WORKAROUND: https://github.com/joelittlejohn/jsonschema2pojo/pull/1515
+            schema.setAdditionalProperties(new BooleanUnionValueImpl(Boolean.TRUE));
+        } else {
+            schema.setAdditionalProperties(new BooleanUnionValueImpl(Boolean.FALSE));
+        }
+    }
+}

core/src/test/resources/OpenApi2JaxRsTest/_expected-simple-type/generated-api/pom.xml

@@ -0,0 +1,33 @@
+
+package org.example.api.beans;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+
+})
+@Generated("jsonschema2pojo")
+public class MySimpleAdditionalProperties {
+
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}

core/src/test/resources/OpenApi2JaxRsTest/_expected-simple-type/generated-api/src/main/java/org/example/api/JaxRsApplication.java

@@ -0,0 +1,33 @@
+
+package org.example.api.beans;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+
+})
+@Generated("jsonschema2pojo")
+public class MyStructuredAdditionalProperties {
+
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}

core/src/test/resources/OpenApi2JaxRsTest/_expected-simple-type/generated-api/src/main/java/org/example/api/WidgetsResource.java

@@ -22,7 +22,9 @@
     "mydate",
     "mymap",
     "id",
-    "mybytearray"
+    "mybytearray",
+    "mysimpleap",
+    "mystructuredap"
 })
 @Generated("jsonschema2pojo")
 public class SampleDataType {
@@ -46,6 +48,10 @@ public class SampleDataType {
     private String id;
     @JsonProperty("mybytearray")
     private byte[] mybytearray;
+    @JsonProperty("mysimpleap")
+    private MySimpleAdditionalProperties mysimpleap;
+    @JsonProperty("mystructuredap")
+    private MyStructuredAdditionalProperties mystructuredap;
 
     @JsonProperty("name")
     public String getName() {
@@ -123,4 +129,24 @@ public void setMybytearray(byte[] mybytearray) {
         this.mybytearray = mybytearray;
     }
 
+    @JsonProperty("mysimpleap")
+    public MySimpleAdditionalProperties getMysimpleap() {
+        return mysimpleap;
+    }
+
+    @JsonProperty("mysimpleap")
+    public void setMysimpleap(MySimpleAdditionalProperties mysimpleap) {
+        this.mysimpleap = mysimpleap;
+    }
+
+    @JsonProperty("mystructuredap")
+    public MyStructuredAdditionalProperties getMystructuredap() {
+        return mystructuredap;
+    }
+
+    @JsonProperty("mystructuredap")
+    public void setMystructuredap(MyStructuredAdditionalProperties mystructuredap) {
+        this.mystructuredap = mystructuredap;
+    }
+
 }