diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java
index b29afb7b16f..2ff9e0dac1a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java
@@ -33,6 +33,7 @@ import org.slf4j.Logger;
 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 abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen
         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
index 05543a0dd0e..aaf576fcdb0 100644
--- 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
index ab374c73586..041542fec46 100644
--- 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 @@ import javax.xml.bind.annotation.*;
 public class Category   {
   
   private Long id = null;
+
   private String name = null;
 
+
   /**
    **/
   public Category id(Long id) {
@@ -38,6 +40,7 @@ public class Category   {
     this.id = id;
   }
 
+
   /**
    **/
   public Category name(String name) {
@@ -56,6 +59,7 @@ public class Category   {
   }
 
 
+
   @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/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java
index fd2cca1cf78..26f2c5d849e 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -19,9 +19,12 @@ import javax.xml.bind.annotation.*;
 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 class ModelApiResponse   {
     this.code = code;
   }
 
+
   /**
    **/
   public ModelApiResponse type(String type) {
@@ -56,6 +60,7 @@ public class ModelApiResponse   {
     this.type = type;
   }
 
+
   /**
    **/
   public ModelApiResponse message(String message) {
@@ -74,6 +79,7 @@ public class ModelApiResponse   {
   }
 
 
+
   @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
index 523d105bef4..7bc6a61ecdb 100644
--- 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 @@ import javax.xml.bind.annotation.*;
 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 enum StatusEnum {
 }
 
   private StatusEnum status = null;
+
   private Boolean complete = false;
 
+
   /**
    **/
   public Order id(Long id) {
@@ -75,6 +81,7 @@ public enum StatusEnum {
     this.id = id;
   }
 
+
   /**
    **/
   public Order petId(Long petId) {
@@ -92,6 +99,7 @@ public enum StatusEnum {
     this.petId = petId;
   }
 
+
   /**
    **/
   public Order quantity(Integer quantity) {
@@ -109,6 +117,7 @@ public enum StatusEnum {
     this.quantity = quantity;
   }
 
+
   /**
    **/
   public Order shipDate(java.util.Date shipDate) {
@@ -126,6 +135,7 @@ public enum StatusEnum {
     this.shipDate = shipDate;
   }
 
+
   /**
    * Order Status
    **/
@@ -144,6 +154,7 @@ public enum StatusEnum {
     this.status = status;
   }
 
+
   /**
    **/
   public Order complete(Boolean complete) {
@@ -162,6 +173,7 @@ public enum StatusEnum {
   }
 
 
+
   @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
index 9c993d81738..32e0792a798 100644
--- 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 @@ import javax.xml.bind.annotation.*;
 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 enum StatusEnum {
 
   private StatusEnum status = null;
 
+
   /**
    **/
   public Pet id(Long id) {
@@ -79,6 +85,7 @@ public enum StatusEnum {
     this.id = id;
   }
 
+
   /**
    **/
   public Pet category(Category category) {
@@ -96,6 +103,7 @@ public enum StatusEnum {
     this.category = category;
   }
 
+
   /**
    **/
   public Pet name(String name) {
@@ -114,6 +122,7 @@ public enum StatusEnum {
     this.name = name;
   }
 
+
   /**
    **/
   public Pet photoUrls(List<String> photoUrls) {
@@ -132,6 +141,12 @@ public enum StatusEnum {
     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 enum StatusEnum {
     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 enum StatusEnum {
   }
 
 
+
   @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
index c39e15ac89b..3f27a3b2023 100644
--- 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 @@ import javax.xml.bind.annotation.*;
 public class Tag   {
   
   private Long id = null;
+
   private String name = null;
 
+
   /**
    **/
   public Tag id(Long id) {
@@ -38,6 +40,7 @@ public class Tag   {
     this.id = id;
   }
 
+
   /**
    **/
   public Tag name(String name) {
@@ -56,6 +59,7 @@ public class Tag   {
   }
 
 
+
   @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/User.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java
index 3b1d5e72076..f481ec8d0fb 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java
@@ -19,14 +19,22 @@ import javax.xml.bind.annotation.*;
 public class User   {
   
   private Long id = null;
+
   private String username = null;
+
   private String firstName = null;
+
   private String lastName = null;
+
   private String email = null;
+
   private String password = null;
+
   private String phone = null;
+
   private Integer userStatus = null;
 
+
   /**
    **/
   public User id(Long id) {
@@ -44,6 +52,7 @@ public class User   {
     this.id = id;
   }
 
+
   /**
    **/
   public User username(String username) {
@@ -61,6 +70,7 @@ public class User   {
     this.username = username;
   }
 
+
   /**
    **/
   public User firstName(String firstName) {
@@ -78,6 +88,7 @@ public class User   {
     this.firstName = firstName;
   }
 
+
   /**
    **/
   public User lastName(String lastName) {
@@ -95,6 +106,7 @@ public class User   {
     this.lastName = lastName;
   }
 
+
   /**
    **/
   public User email(String email) {
@@ -112,6 +124,7 @@ public class User   {
     this.email = email;
   }
 
+
   /**
    **/
   public User password(String password) {
@@ -129,6 +142,7 @@ public class User   {
     this.password = password;
   }
 
+
   /**
    **/
   public User phone(String phone) {
@@ -146,6 +160,7 @@ public class User   {
     this.phone = phone;
   }
 
+
   /**
    * User Status
    **/
@@ -165,6 +180,7 @@ public class User   {
   }
 
 
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {