Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

resteasy: fix string comparison #134

Merged
merged 4 commits into from
May 23, 2018
Merged

resteasy: fix string comparison #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2280270
Run 'bin/jaxrs-resteasy-eap-petstore-server.sh'
jmini May 23, 2018
18a2b9e
Fix StringUtils.isEmpty(..)
jmini May 23, 2018
93acdbc
Run bin/jaxrs-resteasy-eap-petstore-server.sh
jmini May 23, 2018
e3af4cd
Update all JaxRS examples
jmini May 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions ...erator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)) {
Expand Down
2 changes: 2 additions & 0 deletions ...erver/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

public class Category {


private Long id = null;

private String name = null;

/**
Expand Down
3 changes: 3 additions & 0 deletions ...tstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/ModelApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@

public class ModelApiResponse {


private Integer code = null;

private String type = null;

private String message = null;

/**
Expand Down
6 changes: 6 additions & 0 deletions ...s/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@

public class Order {


private Long id = null;

private Long petId = null;

private Integer quantity = null;

private OffsetDateTime shipDate = null;

/**
Expand All @@ -41,7 +45,9 @@ public String toString() {
}
}


private StatusEnum status = null;

private Boolean complete = false;

/**
Expand Down
6 changes: 6 additions & 0 deletions ...les/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();

/**
Expand All @@ -44,6 +49,7 @@ public String toString() {
}
}


private StatusEnum status = null;

/**
Expand Down
2 changes: 2 additions & 0 deletions ...les/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

public class Tag {


private Long id = null;

private String name = null;

/**
Expand Down
8 changes: 8 additions & 0 deletions ...es/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 2 additions & 0 deletions ...server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

public class Category {


private Long id = null;

private String name = null;

/**
Expand Down
3 changes: 3 additions & 0 deletions ...etstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/ModelApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@

public class ModelApiResponse {


private Integer code = null;

private String type = null;

private String message = null;

/**
Expand Down
6 changes: 6 additions & 0 deletions ...es/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@

public class Order {


private Long id = null;

private Long petId = null;

private Integer quantity = null;

private DateTime shipDate = null;

/**
Expand All @@ -41,7 +45,9 @@ public String toString() {
}
}


private StatusEnum status = null;

private Boolean complete = false;

/**
Expand Down
6 changes: 6 additions & 0 deletions samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();

/**
Expand All @@ -44,6 +49,7 @@ public String toString() {
}
}


private StatusEnum status = null;

/**
Expand Down
2 changes: 2 additions & 0 deletions samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

public class Tag {


private Long id = null;

private String name = null;

/**
Expand Down
8 changes: 8 additions & 0 deletions ...les/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 2 additions & 0 deletions samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

public class Category {


private Long id = null;

private String name = null;

/**
Expand Down
3 changes: 3 additions & 0 deletions ...ver/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/ModelApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@

public class ModelApiResponse {


private Integer code = null;

private String type = null;

private String message = null;

/**
Expand Down
6 changes: 6 additions & 0 deletions samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@

public class Order {


private Long id = null;

private Long petId = null;

private Integer quantity = null;

private Date shipDate = null;

/**
Expand All @@ -41,7 +45,9 @@ public String toString() {
}
}


private StatusEnum status = null;

private Boolean complete = false;

/**
Expand Down
6 changes: 6 additions & 0 deletions samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();

/**
Expand All @@ -44,6 +49,7 @@ public String toString() {
}
}


private StatusEnum status = null;

/**
Expand Down
2 changes: 2 additions & 0 deletions samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

public class Tag {


private Long id = null;

private String name = null;

/**
Expand Down
8 changes: 8 additions & 0 deletions samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down