From 6b4339bab5d30b62b7e94c936f434713e5c30350 Mon Sep 17 00:00:00 2001 From: Michael Kotten Date: Thu, 16 Aug 2018 08:29:57 +0200 Subject: [PATCH 1/5] use contextPath variable for RestApplication templates --- .../main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache | 2 +- .../main/resources/JavaJaxRS/resteasy/RestApplication.mustache | 2 +- .../resources/JavaJaxRS/resteasy/eap/RestApplication.mustache | 2 +- .../src/main/resources/JavaJaxRS/spec/RestApplication.mustache | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache index d3d8b238d726..784f227d7616 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache @@ -3,7 +3,7 @@ package {{invokerPackage}}; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("/") +@ApplicationPath("{{contextPath}}") public class RestApplication extends Application { // Add implementation-specific details here } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache index df9a31434b6a..0a7f9a266be9 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache @@ -3,7 +3,7 @@ package {{invokerPackage}}; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("/") +@ApplicationPath("{{contextPath}}") public class RestApplication extends Application { } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache index cdab3c0830be..87d9741afe6d 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache @@ -15,7 +15,7 @@ import {{package}}.impl.{{classname}}ServiceImpl; {{/apis}} {{/apiInfo}} -@ApplicationPath("/") +@ApplicationPath("{{contextPath}}") public class RestApplication extends Application { {{#useSwaggerFeature}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache index 82b8d9533e07..5aac196c1af5 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache @@ -3,7 +3,7 @@ package {{invokerPackage}}; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("/") +@ApplicationPath("{{contextPath}}") public class RestApplication extends Application { } From 40563c0eb2a2a8a77a08c0f209d4716a4334eea9 Mon Sep 17 00:00:00 2001 From: Michael Kotten Date: Thu, 16 Aug 2018 09:07:00 +0200 Subject: [PATCH 2/5] update Petstore sample for jaxrs so that CIs can verify the change --- .../petstore/jaxrs-cxf-client/.openapi-generator/VERSION | 2 +- .../src/gen/java/org/openapitools/model/Order.java | 5 ++--- .../src/gen/java/org/openapitools/model/Pet.java | 3 +-- .../src/main/java/org/openapitools/api/RestApplication.java | 2 +- .../src/main/java/org/openapitools/api/RestApplication.java | 2 +- .../src/main/java/org/openapitools/api/RestApplication.java | 2 +- .../jaxrs-spec-interface-response/.openapi-generator/VERSION | 2 +- .../org/openapitools/model/AdditionalPropertiesClass.java | 2 ++ .../src/gen/java/org/openapitools/model/Animal.java | 2 ++ .../org/openapitools/model/ArrayOfArrayOfNumberOnly.java | 2 ++ .../gen/java/org/openapitools/model/ArrayOfNumberOnly.java | 2 ++ .../src/gen/java/org/openapitools/model/ArrayTest.java | 2 ++ .../src/gen/java/org/openapitools/model/Capitalization.java | 2 ++ .../src/gen/java/org/openapitools/model/Cat.java | 2 ++ .../src/gen/java/org/openapitools/model/Category.java | 2 ++ .../src/gen/java/org/openapitools/model/ClassModel.java | 1 + .../src/gen/java/org/openapitools/model/Client.java | 2 ++ .../src/gen/java/org/openapitools/model/Dog.java | 2 ++ .../src/gen/java/org/openapitools/model/EnumArrays.java | 2 ++ .../src/gen/java/org/openapitools/model/EnumTest.java | 2 ++ .../gen/java/org/openapitools/model/FileSchemaTestClass.java | 2 ++ .../src/gen/java/org/openapitools/model/FormatTest.java | 2 ++ .../src/gen/java/org/openapitools/model/HasOnlyReadOnly.java | 2 ++ .../src/gen/java/org/openapitools/model/MapTest.java | 2 ++ .../model/MixedPropertiesAndAdditionalPropertiesClass.java | 2 ++ .../gen/java/org/openapitools/model/Model200Response.java | 1 + .../gen/java/org/openapitools/model/ModelApiResponse.java | 2 ++ .../src/gen/java/org/openapitools/model/ModelReturn.java | 1 + .../src/gen/java/org/openapitools/model/Name.java | 1 + .../src/gen/java/org/openapitools/model/NumberOnly.java | 2 ++ .../src/gen/java/org/openapitools/model/Order.java | 2 ++ .../src/gen/java/org/openapitools/model/OuterComposite.java | 2 ++ .../src/gen/java/org/openapitools/model/Pet.java | 2 ++ .../src/gen/java/org/openapitools/model/ReadOnlyFirst.java | 2 ++ .../gen/java/org/openapitools/model/SpecialModelName.java | 2 ++ .../src/gen/java/org/openapitools/model/Tag.java | 2 ++ .../src/gen/java/org/openapitools/model/User.java | 2 ++ 37 files changed, 64 insertions(+), 10 deletions(-) diff --git a/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION b/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION index 096bf47efe31..105bb87d77b3 100644 --- a/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION +++ b/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION @@ -1 +1 @@ -3.0.0-SNAPSHOT \ No newline at end of file +3.2.2-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java index 3aa2ec3d55c3..b2725e076bc9 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java @@ -31,7 +31,6 @@ public class Order { @ApiModelProperty(value = "") private Date shipDate = null; - @XmlType(name="StatusEnum") @XmlEnum(String.class) public enum StatusEnum { @@ -60,7 +59,7 @@ public static StatusEnum fromValue(String v) { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } @@ -170,7 +169,7 @@ public Order status(StatusEnum status) { * @return complete **/ @JsonProperty("complete") - public Boolean isComplete() { + public Boolean getComplete() { return complete; } diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java index c7e7cda691e2..f6faecaf750d 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java @@ -37,7 +37,6 @@ public class Pet { @ApiModelProperty(value = "") private List tags = null; - @XmlType(name="StatusEnum") @XmlEnum(String.class) public enum StatusEnum { @@ -66,7 +65,7 @@ public static StatusEnum fromValue(String v) { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/RestApplication.java index 14822d371798..4b18e7088cb1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/RestApplication.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/RestApplication.java @@ -10,7 +10,7 @@ import org.openapitools.api.impl.StoreApiServiceImpl; import org.openapitools.api.impl.UserApiServiceImpl; -@ApplicationPath("/") +@ApplicationPath("/v2") public class RestApplication extends Application { diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/RestApplication.java index 14822d371798..4b18e7088cb1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/RestApplication.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/RestApplication.java @@ -10,7 +10,7 @@ import org.openapitools.api.impl.StoreApiServiceImpl; import org.openapitools.api.impl.UserApiServiceImpl; -@ApplicationPath("/") +@ApplicationPath("/v2") public class RestApplication extends Application { diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/RestApplication.java index 14822d371798..4b18e7088cb1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/RestApplication.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/RestApplication.java @@ -10,7 +10,7 @@ import org.openapitools.api.impl.StoreApiServiceImpl; import org.openapitools.api.impl.UserApiServiceImpl; -@ApplicationPath("/") +@ApplicationPath("/v2") public class RestApplication extends Application { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION index 4395ff592326..105bb87d77b3 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION @@ -1 +1 @@ -3.2.0-SNAPSHOT \ No newline at end of file +3.2.2-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 9ffada31ae87..58abe9915cb2 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java index f5d49a3c4b21..3ea215fd3de3 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java @@ -2,6 +2,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 19b4fb8672a3..43d65d72f381 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 67f1a62787a7..f29bd99493ae 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java index 6c812b8b6844..249f75701bef 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.List; import org.openapitools.model.ReadOnlyFirst; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java index b2cc76b7b8d3..db53f3c49bd1 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java index 134779f46fcb..501e9c7d2c22 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; import java.io.Serializable; import javax.validation.constraints.*; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java index 4eb21f49a584..b31e9f551c84 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java index 373ea29aa253..87a1c546c192 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java @@ -1,6 +1,7 @@ package org.openapitools.model; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java index 83c5ac4e1821..56914b24020a 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java index 3cf495a7b151..79c4f948f92a 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; import java.io.Serializable; import javax.validation.constraints.*; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java index 7a93f0b748b9..a2003eef8b9b 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.List; import java.io.Serializable; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java index 42348dcdc918..ce852c9d3e0d 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.OuterEnum; import java.io.Serializable; import javax.validation.constraints.*; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 3acdf4471023..0ba22995c7a2 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.List; import java.io.Serializable; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java index 62bac3f66256..2d4ff70310f6 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.File; import java.math.BigDecimal; import java.util.Date; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 40af19634263..221814463303 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java index 2961088997d7..d0e0137e2107 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index cc446a6fce48..627a928a17b0 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.util.HashMap; import java.util.List; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java index c5fbe95d9f64..362ea187e754 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java @@ -1,6 +1,7 @@ package org.openapitools.model; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java index 339ae0912fdf..57705be9cd50 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java index e5585db2da5e..4d0ad8278e49 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java @@ -1,6 +1,7 @@ package org.openapitools.model; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java index 6fa1ec2f4c81..7dfe13b2cb9a 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java @@ -1,6 +1,7 @@ package org.openapitools.model; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java index 9aa6bc737497..bec8bbd4669f 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.io.Serializable; import javax.validation.constraints.*; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java index f2b772249aef..4351bf390984 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; import javax.validation.constraints.*; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java index c4c046c8953b..37d163744cbb 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.io.Serializable; import javax.validation.constraints.*; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java index bdb345ac05fd..6b669e30995a 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.List; import org.openapitools.model.Category; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index b7349f0a2567..02c8630a47f6 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java index 5668baa8c702..d57dd6da2b2e 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java index ced9e763c59e..3c8f6153974f 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java index 47bd2cde5d3c..2e0a3d033218 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; From f452b8bddb8b7ba1327526cf93c4d7a10a42dec0 Mon Sep 17 00:00:00 2001 From: Michael Kotten Date: Mon, 20 Aug 2018 07:54:01 +0200 Subject: [PATCH 3/5] Add additional curly braces to avoid escaping --- .../main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache | 2 +- .../main/resources/JavaJaxRS/resteasy/RestApplication.mustache | 2 +- .../resources/JavaJaxRS/resteasy/eap/RestApplication.mustache | 2 +- .../src/main/resources/JavaJaxRS/spec/RestApplication.mustache | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache index 784f227d7616..a7673c8f138c 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache @@ -3,7 +3,7 @@ package {{invokerPackage}}; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("{{contextPath}}") +@ApplicationPath("{{{contextPath}}}") public class RestApplication extends Application { // Add implementation-specific details here } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache index 0a7f9a266be9..99f572b54ff0 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache @@ -3,7 +3,7 @@ package {{invokerPackage}}; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("{{contextPath}}") +@ApplicationPath("{{{contextPath}}}") public class RestApplication extends Application { } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache index 87d9741afe6d..0f9c4b28e86b 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache @@ -15,7 +15,7 @@ import {{package}}.impl.{{classname}}ServiceImpl; {{/apis}} {{/apiInfo}} -@ApplicationPath("{{contextPath}}") +@ApplicationPath("{{{contextPath}}}") public class RestApplication extends Application { {{#useSwaggerFeature}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache index 5aac196c1af5..3dd570e9c35b 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache @@ -3,7 +3,7 @@ package {{invokerPackage}}; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("{{contextPath}}") +@ApplicationPath("{{{contextPath}}}") public class RestApplication extends Application { } From 591ab85c1d4924ef683980a4faf2e2388e32476d Mon Sep 17 00:00:00 2001 From: Michael Kotten Date: Tue, 21 Aug 2018 13:49:04 +0200 Subject: [PATCH 4/5] Update generated RestApplication.java files, as they are skipped by default otherwise --- .../src/main/java/org/openapitools/api/RestApplication.java | 2 +- .../src/gen/java/org/openapitools/api/RestApplication.java | 2 +- .../joda/src/gen/java/org/openapitools/api/RestApplication.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/RestApplication.java index 72dba3b836fc..96b916f7cdc9 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/RestApplication.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/RestApplication.java @@ -3,7 +3,7 @@ import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("/") +@ApplicationPath("/v2") public class RestApplication extends Application { // Add implementation-specific details here } \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/RestApplication.java index a82cb9c3fadd..05e478441455 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/RestApplication.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/RestApplication.java @@ -3,7 +3,7 @@ import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("/") +@ApplicationPath("/v2") public class RestApplication extends Application { } \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/RestApplication.java index a82cb9c3fadd..05e478441455 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/RestApplication.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/RestApplication.java @@ -3,7 +3,7 @@ import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("/") +@ApplicationPath("/v2") public class RestApplication extends Application { } \ No newline at end of file From 227dc4357b5f241354689af63b21a2ea14081cc8 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Wed, 22 Aug 2018 07:20:09 +0200 Subject: [PATCH 5/5] Run "bin/jaxrs-spec-petstore-server.sh" after having deleted "RestApplication" --- .../src/gen/java/org/openapitools/api/RestApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java index c9b3afbbf90b..b98d35a4e934 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java @@ -3,7 +3,7 @@ import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("/") +@ApplicationPath("/v2") public class RestApplication extends Application { }