[JAXRS] use contextPath variable for @ApplicationPath in RestApplication (#850)

* Use contextPath variable for RestApplication templates
* Update generated RestApplication.java files, as they are skipped by default otherwise
* Update Petstore sample for jaxrs so that CIs can verify the change

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
 }

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 {
 
 }

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}}

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 {
 
 }

samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION

@@ -1 +1 @@
-3.2.0-SNAPSHOT
+3.2.2-SNAPSHOT

samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/RestApplication.java

@@ -3,7 +3,7 @@ package org.openapitools.api;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
   // Add implementation-specific details here
 }

samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/RestApplication.java

@@ -3,7 +3,7 @@ package org.openapitools.api;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 }

samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/RestApplication.java

@@ -10,7 +10,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 

samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/RestApplication.java

@@ -10,7 +10,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 

samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/RestApplication.java

@@ -10,7 +10,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 

samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/RestApplication.java

@@ -3,7 +3,7 @@ package org.openapitools.api;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 }

samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION

@@ -1 +1 @@
-3.2.0-SNAPSHOT
+3.2.2-SNAPSHOT

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;

samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java

@@ -2,6 +2,8 @@ package org.openapitools.model;
 
 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;

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;

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;

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;

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;

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.*;

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;

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;

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;

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.*;

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;

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.*;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.*;

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.*;

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.*;

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;

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;

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;

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;

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;

samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java

@@ -3,7 +3,7 @@ package org.openapitools.api;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 }