[JaxRS-Java] issue with implFolder on windows, and required fields ge…

…neration for containers (#88) * Fix implFolder issue with jaxrs-cxf-cdi generator This fix is for the issue: swagger-api/swagger-codegen#8113 When using jaxrs-cxf-cdi and other JaxRS generators, the implFolder config is not honored by hte generator on windows. * jaxrs-cxf-cdi: containers with no default init Change similar to https://github.com/swagger-api/swagger-codegen/pull/5363/files for jax-rs-cdi generator. When a property that is a contained is not declared as required, it is initialized to `null`, and not to the empty container. This makes apio mich more easy to use, since one can differentiate when an input list in json has been set to the empty array or simply not set.
OpenAPITools · May 17, 2018 · d890d73 · d890d73
1 parent 4889103
commit d890d73
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 4 deletions.
diff --git a/...ator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/...ator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java
@@ -33,6 +33,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.net.URL;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -240,11 +241,11 @@ public String apiFilename(String templateName, String tag) {
         String result = super.apiFilename(templateName, tag);
 
         if (templateName.endsWith("Impl.mustache")) {
-            int ix = result.lastIndexOf('/');
+            int ix = result.lastIndexOf(File.separator);
             result = result.substring(0, ix) + "/impl" + result.substring(ix, result.length() - 5) + "ServiceImpl.java";
             result = result.replace(apiFileFolder(), implFileFolder(implFolder));
         } else if (templateName.endsWith("Factory.mustache")) {
-            int ix = result.lastIndexOf('/');
+            int ix = result.lastIndexOf(File.separator);
             result = result.substring(0, ix) + "/factories" + result.substring(ix, result.length() - 5) + "ServiceFactory.java";
             result = result.replace(apiFileFolder(), implFileFolder(implFolder));
         } else if (templateName.endsWith("Service.mustache")) {

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
@@ -11,7 +11,12 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 {{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
 
 {{>enumClass}}{{/items}}{{/items.isEnum}}
-  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
+{{#isContainer}}
+  private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}};
+{{/isContainer}}
+{{^isContainer}}
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};
+{{/isContainer}}{{/vars}}
 
   {{#vars}}
   /**
@@ -39,6 +44,31 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
     this.{{name}} = {{name}};
   }
+  {{#isListContainer}}
+
+  public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
+    this.{{name}}.add({{name}}Item);
+    return this;
+  }
+  {{/isListContainer}}
+
+  {{#isMapContainer}}
+
+  public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
+    this.{{name}}.put(key, {{name}}Item);
+    return this;
+  }
+  {{/isMapContainer}}
 
   {{/vars}}
 

diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java
@@ -19,8 +19,10 @@
 public class Category   {
 
   private Long id = null;
+
   private String name = null;
 
+
   /**
    **/
   public Category id(Long id) {
@@ -38,6 +40,7 @@ public void setId(Long id) {
     this.id = id;
   }
 
+
   /**
    **/
   public Category name(String name) {
@@ -56,6 +59,7 @@ public void setName(String name) {
   }
 
 
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {

diff --git a/...s/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java b/...s/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -19,9 +19,12 @@
 public class ModelApiResponse   {
 
   private Integer code = null;
+
   private String type = null;
+
   private String message = null;
 
+
   /**
    **/
   public ModelApiResponse code(Integer code) {
@@ -39,6 +42,7 @@ public void setCode(Integer code) {
     this.code = code;
   }
 
+
   /**
    **/
   public ModelApiResponse type(String type) {
@@ -56,6 +60,7 @@ public void setType(String type) {
     this.type = type;
   }
 
+
   /**
    **/
   public ModelApiResponse message(String message) {
@@ -74,6 +79,7 @@ public void setMessage(String message) {
   }
 
 
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {

diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java
@@ -19,10 +19,14 @@
 public class Order   {
 
   private Long id = null;
+
   private Long petId = null;
+
   private Integer quantity = null;
+
   private java.util.Date shipDate = null;
 
+
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
 public enum StatusEnum {
@@ -56,8 +60,10 @@ public static StatusEnum fromValue(String v) {
 }
 
   private StatusEnum status = null;
+
   private Boolean complete = false;
 
+
   /**
    **/
   public Order id(Long id) {
@@ -75,6 +81,7 @@ public void setId(Long id) {
     this.id = id;
   }
 
+
   /**
    **/
   public Order petId(Long petId) {
@@ -92,6 +99,7 @@ public void setPetId(Long petId) {
     this.petId = petId;
   }
 
+
   /**
    **/
   public Order quantity(Integer quantity) {
@@ -109,6 +117,7 @@ public void setQuantity(Integer quantity) {
     this.quantity = quantity;
   }
 
+
   /**
    **/
   public Order shipDate(java.util.Date shipDate) {
@@ -126,6 +135,7 @@ public void setShipDate(java.util.Date shipDate) {
     this.shipDate = shipDate;
   }
 
+
   /**
    * Order Status
    **/
@@ -144,6 +154,7 @@ public void setStatus(StatusEnum status) {
     this.status = status;
   }
 
+
   /**
    **/
   public Order complete(Boolean complete) {
@@ -162,6 +173,7 @@ public void setComplete(Boolean complete) {
   }
 
 
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {

diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java
@@ -23,10 +23,15 @@
 public class Pet   {
 
   private Long id = null;
+
   private Category category = null;
+
   private String name = null;
+
   private List<String> photoUrls = new ArrayList<String>();
-  private List<Tag> tags = new ArrayList<Tag>();
+
+  private List<Tag> tags = null;
+
 
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
@@ -62,6 +67,7 @@ public static StatusEnum fromValue(String v) {
 
   private StatusEnum status = null;
 
+
   /**
    **/
   public Pet id(Long id) {
@@ -79,6 +85,7 @@ public void setId(Long id) {
     this.id = id;
   }
 
+
   /**
    **/
   public Pet category(Category category) {
@@ -96,6 +103,7 @@ public void setCategory(Category category) {
     this.category = category;
   }
 
+
   /**
    **/
   public Pet name(String name) {
@@ -114,6 +122,7 @@ public void setName(String name) {
     this.name = name;
   }
 
+
   /**
    **/
   public Pet photoUrls(List<String> photoUrls) {
@@ -132,6 +141,12 @@ public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
 
+  public Pet addPhotoUrlsItem(String photoUrlsItem) {
+    this.photoUrls.add(photoUrlsItem);
+    return this;
+  }
+
+
   /**
    **/
   public Pet tags(List<Tag> tags) {
@@ -149,6 +164,15 @@ public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
 
+  public Pet addTagsItem(Tag tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<Tag>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+
   /**
    * pet status in the store
    **/
@@ -168,6 +192,7 @@ public void setStatus(StatusEnum status) {
   }
 
 
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {

diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java
@@ -19,8 +19,10 @@
 public class Tag   {
 
   private Long id = null;
+
   private String name = null;
 
+
   /**
    **/
   public Tag id(Long id) {
@@ -38,6 +40,7 @@ public void setId(Long id) {
     this.id = id;
   }
 
+
   /**
    **/
   public Tag name(String name) {
@@ -56,6 +59,7 @@ public void setName(String name) {
   }
 
 
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {