[java resteasy] fix string comparison (#134)

* Fix StringUtils.isEmpty(..) * Update all JaxRS samples
OpenAPITools · May 23, 2018 · 3f81378 · 3f81378
1 parent 27426f7
commit 3f81378
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 9 deletions.
diff --git a/...erator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java b/...erator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java
@@ -17,19 +17,20 @@
 
 package org.openapitools.codegen.languages;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import io.swagger.v3.oas.models.Operation;
 
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.features.BeanValidationFeatures;
 import org.openapitools.codegen.languages.features.JbossFeature;
 import org.openapitools.codegen.languages.features.SwaggerFeatures;
-import io.swagger.v3.oas.models.*;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class JavaResteasyEapServerCodegen extends AbstractJavaJAXRSServerCodegen
         implements JbossFeature, BeanValidationFeatures, SwaggerFeatures {
@@ -126,7 +127,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
             basePath = basePath.substring(0, pos);
         }
 
-        if (StringUtils.isEmpty("")) {
+        if (StringUtils.isEmpty(basePath)) {
             basePath = "default";
         } else {
             if (co.path.startsWith("/" + basePath)) {

diff --git a/...erver/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Category.java b/...erver/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Category.java
@@ -12,7 +12,9 @@
 
 public class Category   {
 
+
   private Long id = null;
+
   private String name = null;
 
   /**

diff --git a/...tstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/ModelApiResponse.java b/...tstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -12,8 +12,11 @@
 
 public class ModelApiResponse   {
 
+
   private Integer code = null;
+
   private String type = null;
+
   private String message = null;
 
   /**

diff --git a/...s/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Order.java b/...s/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Order.java
@@ -14,9 +14,13 @@
 
 public class Order   {
 
+
   private Long id = null;
+
   private Long petId = null;
+
   private Integer quantity = null;
+
   private OffsetDateTime shipDate = null;
 
   /**
@@ -41,7 +45,9 @@ public String toString() {
     }
   }
 
+
   private StatusEnum status = null;
+
   private Boolean complete = false;
 
   /**

diff --git a/...les/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java b/...les/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java
@@ -16,10 +16,15 @@
 
 public class Pet   {
 
+
   private Long id = null;
+
   private Category category = null;
+
   private String name = null;
+
   private List<String> photoUrls = new ArrayList<>();
+
   private List<Tag> tags = new ArrayList<>();
 
   /**
@@ -44,6 +49,7 @@ public String toString() {
     }
   }
 
+
   private StatusEnum status = null;
 
   /**

diff --git a/...les/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Tag.java b/...les/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Tag.java
@@ -12,7 +12,9 @@
 
 public class Tag   {
 
+
   private Long id = null;
+
   private String name = null;
 
   /**

diff --git a/...es/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/User.java b/...es/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/User.java
@@ -12,13 +12,21 @@
 
 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;
 
   /**

diff --git a/...server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Category.java b/...server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Category.java
@@ -12,7 +12,9 @@
 
 public class Category   {
 
+
   private Long id = null;
+
   private String name = null;
 
   /**

diff --git a/...etstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/ModelApiResponse.java b/...etstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -12,8 +12,11 @@
 
 public class ModelApiResponse   {
 
+
   private Integer code = null;
+
   private String type = null;
+
   private String message = null;
 
   /**

diff --git a/...es/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Order.java b/...es/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Order.java
@@ -14,9 +14,13 @@
 
 public class Order   {
 
+
   private Long id = null;
+
   private Long petId = null;
+
   private Integer quantity = null;
+
   private DateTime shipDate = null;
 
   /**
@@ -41,7 +45,9 @@ public String toString() {
     }
   }
 
+
   private StatusEnum status = null;
+
   private Boolean complete = false;
 
   /**

diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java
@@ -16,10 +16,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>();
 
   /**
@@ -44,6 +49,7 @@ public String toString() {
     }
   }
 
+
   private StatusEnum status = null;
 
   /**

diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Tag.java
@@ -12,7 +12,9 @@
 
 public class Tag   {
 
+
   private Long id = null;
+
   private String name = null;
 
   /**

diff --git a/...les/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/User.java b/...les/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/User.java
@@ -12,13 +12,21 @@
 
 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;
 
   /**

diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Category.java
@@ -12,7 +12,9 @@
 
 public class Category   {
 
+
   private Long id = null;
+
   private String name = null;
 
   /**

diff --git a/...ver/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/ModelApiResponse.java b/...ver/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -12,8 +12,11 @@
 
 public class ModelApiResponse   {
 
+
   private Integer code = null;
+
   private String type = null;
+
   private String message = null;
 
   /**

diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Order.java
@@ -14,9 +14,13 @@
 
 public class Order   {
 
+
   private Long id = null;
+
   private Long petId = null;
+
   private Integer quantity = null;
+
   private Date shipDate = null;
 
   /**
@@ -41,7 +45,9 @@ public String toString() {
     }
   }
 
+
   private StatusEnum status = null;
+
   private Boolean complete = false;
 
   /**

diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java
@@ -16,10 +16,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>();
 
   /**
@@ -44,6 +49,7 @@ public String toString() {
     }
   }
 
+
   private StatusEnum status = null;
 
   /**

diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Tag.java
@@ -12,7 +12,9 @@
 
 public class Tag   {
 
+
   private Long id = null;
+
   private String name = null;
 
   /**

diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/User.java
@@ -12,13 +12,21 @@
 
 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;
 
   /**