diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java index 4e9241a91cf..6b59748e3be 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java @@ -23,7 +23,6 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im outputFolder = "generated-code/JavaJaxRS-Resteasy"; apiTemplateFiles.put("apiService.mustache", ".java"); apiTemplateFiles.put("apiServiceImpl.mustache", ".java"); - apiTemplateFiles.put("apiServiceFactory.mustache", ".java"); apiTestTemplateFiles.clear(); // TODO: add test template // clear model and api doc template as AbstractJavaJAXRSServerCodegen diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/api.mustache index 00740769465..ed602249c51 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/api.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/api.mustache @@ -2,7 +2,6 @@ package {{package}}; import {{modelPackage}}.*; import {{package}}.{{classname}}Service; -import {{package}}.factories.{{classname}}ServiceFactory; import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; @@ -20,6 +19,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.*; +import javax.inject.Inject; + {{#useBeanValidation}} import javax.validation.constraints.*; {{/useBeanValidation}} @@ -32,7 +33,8 @@ import javax.validation.constraints.*; {{>generatedAnnotation}} {{#operations}} public class {{classname}} { - private final {{classname}}Service delegate = {{classname}}ServiceFactory.get{{classname}}(); + + @Inject {{classname}}Service service; {{#operation}} @{{httpMethod}} @@ -51,7 +53,7 @@ public class {{classname}} { {{/hasMore}}{{/responses}} }) public Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{^isMultipart}}{{>formParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}@Context SecurityContext securityContext) throws NotFoundException { - return delegate.{{nickname}}({{#isMultipart}}input,{{/isMultipart}}{{#allParams}}{{^isMultipart}}{{paramName}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}}{{paramName}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}securityContext); + return service.{{nickname}}({{#isMultipart}}input,{{/isMultipart}}{{#allParams}}{{^isMultipart}}{{paramName}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}}{{paramName}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}securityContext); } {{/operation}} } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiService.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiService.mustache index 21915e68ebc..4eb59cbfc1a 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiService.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiService.mustache @@ -18,9 +18,9 @@ import javax.ws.rs.core.SecurityContext; {{>generatedAnnotation}} {{#operations}} -public abstract class {{classname}}Service { +public interface {{classname}}Service { {{#operation}} - public abstract Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{^isMultipart}}{{>serviceFormParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}SecurityContext securityContext) + Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{^isMultipart}}{{>serviceFormParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}SecurityContext securityContext) throws NotFoundException; {{/operation}} } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceFactory.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceFactory.mustache deleted file mode 100644 index 1bb63bc0775..00000000000 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceFactory.mustache +++ /dev/null @@ -1,15 +0,0 @@ -package {{package}}.factories; - -import {{package}}.{{classname}}Service; -import {{package}}.impl.{{classname}}ServiceImpl; - -{{>generatedAnnotation}} -public class {{classname}}ServiceFactory { - - private final static {{classname}}Service service = new {{classname}}ServiceImpl(); - - public static {{classname}}Service get{{classname}}() - { - return service; - } -} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache index bc7e896e4b0..0ca584a2053 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache @@ -13,14 +13,15 @@ import {{package}}.NotFoundException; import java.io.InputStream; +import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; +@RequestScoped {{>generatedAnnotation}} {{#operations}} -public class {{classname}}ServiceImpl extends {{classname}}Service { +public class {{classname}}ServiceImpl implements {{classname}}Service { {{#operation}} - @Override public Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{^isMultipart}}{{>serviceFormParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}SecurityContext securityContext) throws NotFoundException { // do some magic! diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache index 20dd8c939da..65d748762c2 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache @@ -13,13 +13,18 @@ dependencies { providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'javax:javaee-api:7.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.10' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' -{{#joda}} +{{#useBeanValidation}} + providedCompile 'javax.validation:validation-api:1.1.0.Final' +{{/useBeanValidation}} compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1' compile 'joda-time:joda-time:2.7' -{{/joda}} + //TODO: swaggerFeature + compile 'io.swagger:swagger-jaxrs:1.5.12' + testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache index 7e040124f4e..3c3b87cc4e8 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache @@ -58,6 +58,14 @@ + + + javax + javaee-api + 7.0 + provided + + io.swagger swagger-annotations @@ -103,6 +111,7 @@ org.jboss.resteasy resteasy-jackson2-provider ${resteasy-version} + provided javax.annotation diff --git a/samples/server/petstore/jaxrs-resteasy/default/build.gradle b/samples/server/petstore/jaxrs-resteasy/default/build.gradle index 4f8c85821c2..a568dc86c41 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/default/build.gradle @@ -13,9 +13,16 @@ dependencies { providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'javax:javaee-api:7.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.10' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' + providedCompile 'javax.validation:validation-api:1.1.0.Final' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1' + compile 'joda-time:joda-time:2.7' + //TODO: swaggerFeature + compile 'io.swagger:swagger-jaxrs:1.5.12' + testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' } diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/ApiException.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/ApiException.class new file mode 100644 index 00000000000..532edd306d7 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/ApiException.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/ApiOriginFilter.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/ApiOriginFilter.class new file mode 100644 index 00000000000..491891093f1 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/ApiOriginFilter.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/ApiResponseMessage.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/ApiResponseMessage.class new file mode 100644 index 00000000000..662e2e846f1 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/ApiResponseMessage.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig$1$1.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig$1$1.class new file mode 100644 index 00000000000..9271b6069d1 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig$1$1.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig$1$2.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig$1$2.class new file mode 100644 index 00000000000..2260a4b19b5 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig$1$2.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig$1.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig$1.class new file mode 100644 index 00000000000..c757c04724e Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig$1.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig.class new file mode 100644 index 00000000000..b4368ff2475 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/JacksonConfig.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/NotFoundException.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/NotFoundException.class new file mode 100644 index 00000000000..cb773657253 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/NotFoundException.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/PetApi.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/PetApi.class new file mode 100644 index 00000000000..71f34c8625b Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/PetApi.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/PetApiService.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/PetApiService.class new file mode 100644 index 00000000000..92283312be5 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/PetApiService.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/RFC3339DateFormat.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/RFC3339DateFormat.class new file mode 100644 index 00000000000..0f5053f2a06 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/RFC3339DateFormat.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/RestApplication.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/RestApplication.class new file mode 100644 index 00000000000..1bd466b82da Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/RestApplication.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/StoreApi.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/StoreApi.class new file mode 100644 index 00000000000..b132fb09089 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/StoreApi.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/StoreApiService.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/StoreApiService.class new file mode 100644 index 00000000000..da4fd7608fd Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/StoreApiService.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/StringUtil.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/StringUtil.class new file mode 100644 index 00000000000..72824471def Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/StringUtil.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/UserApi.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/UserApi.class new file mode 100644 index 00000000000..df0b5b337fb Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/UserApi.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/UserApiService.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/UserApiService.class new file mode 100644 index 00000000000..d12b14b2337 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/UserApiService.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/impl/PetApiServiceImpl.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/impl/PetApiServiceImpl.class new file mode 100644 index 00000000000..e36041a5f07 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/impl/PetApiServiceImpl.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/impl/StoreApiServiceImpl.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/impl/StoreApiServiceImpl.class new file mode 100644 index 00000000000..60fc71759c2 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/impl/StoreApiServiceImpl.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/impl/UserApiServiceImpl.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/impl/UserApiServiceImpl.class new file mode 100644 index 00000000000..86d82b1e0da Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/api/impl/UserApiServiceImpl.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Category.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Category.class new file mode 100644 index 00000000000..e0d0faed108 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Category.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/ModelApiResponse.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/ModelApiResponse.class new file mode 100644 index 00000000000..df7bdc5bbe7 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/ModelApiResponse.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Order$StatusEnum.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Order$StatusEnum.class new file mode 100644 index 00000000000..8f111540b87 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Order$StatusEnum.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Order.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Order.class new file mode 100644 index 00000000000..5aed19284b4 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Order.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Pet$StatusEnum.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Pet$StatusEnum.class new file mode 100644 index 00000000000..514e6558ae8 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Pet$StatusEnum.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Pet.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Pet.class new file mode 100644 index 00000000000..88f65946361 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Pet.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Tag.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Tag.class new file mode 100644 index 00000000000..40027f0aeb7 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/Tag.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/User.class b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/User.class new file mode 100644 index 00000000000..253481fbd91 Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/classes/main/io/swagger/model/User.class differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/libs/swagger-jaxrs-resteasy-server-1.0.0.war b/samples/server/petstore/jaxrs-resteasy/default/build/libs/swagger-jaxrs-resteasy-server-1.0.0.war new file mode 100644 index 00000000000..4d6cba4823b Binary files /dev/null and b/samples/server/petstore/jaxrs-resteasy/default/build/libs/swagger-jaxrs-resteasy-server-1.0.0.war differ diff --git a/samples/server/petstore/jaxrs-resteasy/default/build/tmp/war/MANIFEST.MF b/samples/server/petstore/jaxrs-resteasy/default/build/tmp/war/MANIFEST.MF new file mode 100644 index 00000000000..59499bce4a2 --- /dev/null +++ b/samples/server/petstore/jaxrs-resteasy/default/build/tmp/war/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml index a1b12834a1d..8cbc9358a06 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml @@ -9,6 +9,15 @@ src/main/java + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.7 + 1.7 + + org.apache.maven.plugins maven-war-plugin @@ -49,6 +58,14 @@ + + + javax + javaee-api + 7.0 + provided + + io.swagger swagger-annotations @@ -94,6 +111,7 @@ org.jboss.resteasy resteasy-jackson2-provider ${resteasy-version} + provided javax.annotation diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java index 90e60b780a9..d668c71d237 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java @@ -2,7 +2,6 @@ package io.swagger.api; import io.swagger.model.*; import io.swagger.api.PetApiService; -import io.swagger.api.factories.PetApiServiceFactory; import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; @@ -21,6 +20,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.*; +import javax.inject.Inject; + import javax.validation.constraints.*; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; @@ -30,7 +31,8 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; @io.swagger.annotations.Api(description = "the pet API") public class PetApi { - private final PetApiService delegate = PetApiServiceFactory.getPetApi(); + + @Inject PetApiService service; @POST @@ -46,7 +48,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.addPet(body,securityContext); + return service.addPet(body,securityContext); } @DELETE @Path("/{petId}") @@ -62,7 +64,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) }) public Response deletePet( @PathParam("petId") Long petId,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.deletePet(petId,apiKey,securityContext); + return service.deletePet(petId,apiKey,securityContext); } @GET @Path("/findByStatus") @@ -80,7 +82,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Void.class) }) public Response findPetsByStatus( @NotNull @QueryParam("status") List status,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.findPetsByStatus(status,securityContext); + return service.findPetsByStatus(status,securityContext); } @GET @Path("/findByTags") @@ -98,7 +100,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) }) public Response findPetsByTags( @NotNull @QueryParam("tags") List tags,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.findPetsByTags(tags,securityContext); + return service.findPetsByTags(tags,securityContext); } @GET @Path("/{petId}") @@ -115,7 +117,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class) }) public Response getPetById( @PathParam("petId") Long petId,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.getPetById(petId,securityContext); + return service.getPetById(petId,securityContext); } @PUT @@ -135,7 +137,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.updatePet(body,securityContext); + return service.updatePet(body,securityContext); } @POST @Path("/{petId}") @@ -151,7 +153,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) public Response updatePetWithForm( @PathParam("petId") Long petId,@ApiParam(value = "Updated name of the pet")@FormParam("name") String name,@ApiParam(value = "Updated status of the pet")@FormParam("status") String status,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.updatePetWithForm(petId,name,status,securityContext); + return service.updatePetWithForm(petId,name,status,securityContext); } @POST @Path("/{petId}/uploadImage") @@ -167,6 +169,6 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) public Response uploadFile(MultipartFormDataInput input, @PathParam("petId") Long petId,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.uploadFile(input,petId,securityContext); + return service.uploadFile(input,petId,securityContext); } } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java index c44d05b9278..5b44f5d18b9 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java @@ -18,21 +18,21 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; -public abstract class PetApiService { - public abstract Response addPet(Pet body,SecurityContext securityContext) +public interface PetApiService { + Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException; - public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) + Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException; - public abstract Response findPetsByStatus(List status,SecurityContext securityContext) + Response findPetsByStatus(List status,SecurityContext securityContext) throws NotFoundException; - public abstract Response findPetsByTags(List tags,SecurityContext securityContext) + Response findPetsByTags(List tags,SecurityContext securityContext) throws NotFoundException; - public abstract Response getPetById(Long petId,SecurityContext securityContext) + Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException; - public abstract Response updatePet(Pet body,SecurityContext securityContext) + Response updatePet(Pet body,SecurityContext securityContext) throws NotFoundException; - public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) + Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException; - public abstract Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext) + Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext) throws NotFoundException; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApi.java index c2479535d75..6b3a6cc3a07 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApi.java @@ -2,7 +2,6 @@ package io.swagger.api; import io.swagger.model.*; import io.swagger.api.StoreApiService; -import io.swagger.api.factories.StoreApiServiceFactory; import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; @@ -20,6 +19,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.*; +import javax.inject.Inject; + import javax.validation.constraints.*; @Path("/store") @@ -28,7 +29,8 @@ import javax.validation.constraints.*; @io.swagger.annotations.Api(description = "the store API") public class StoreApi { - private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi(); + + @Inject StoreApiService service; @DELETE @Path("/order/{orderId}") @@ -41,7 +43,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) }) public Response deleteOrder( @PathParam("orderId") String orderId,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.deleteOrder(orderId,securityContext); + return service.deleteOrder(orderId,securityContext); } @GET @Path("/inventory") @@ -54,7 +56,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) public Response getInventory(@Context SecurityContext securityContext) throws NotFoundException { - return delegate.getInventory(securityContext); + return service.getInventory(securityContext); } @GET @Path("/order/{orderId}") @@ -69,7 +71,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) }) public Response getOrderById( @Min(1) @Max(5) @PathParam("orderId") Long orderId,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.getOrderById(orderId,securityContext); + return service.getOrderById(orderId,securityContext); } @POST @Path("/order") @@ -82,6 +84,6 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.placeOrder(body,securityContext); + return service.placeOrder(body,securityContext); } } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApiService.java index 2174b1b3547..46958ea45c4 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApiService.java @@ -16,13 +16,13 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; -public abstract class StoreApiService { - public abstract Response deleteOrder(String orderId,SecurityContext securityContext) +public interface StoreApiService { + Response deleteOrder(String orderId,SecurityContext securityContext) throws NotFoundException; - public abstract Response getInventory(SecurityContext securityContext) + Response getInventory(SecurityContext securityContext) throws NotFoundException; - public abstract Response getOrderById(Long orderId,SecurityContext securityContext) + Response getOrderById(Long orderId,SecurityContext securityContext) throws NotFoundException; - public abstract Response placeOrder(Order body,SecurityContext securityContext) + Response placeOrder(Order body,SecurityContext securityContext) throws NotFoundException; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApi.java index d54375e6c78..30d8e9bae59 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApi.java @@ -2,7 +2,6 @@ package io.swagger.api; import io.swagger.model.*; import io.swagger.api.UserApiService; -import io.swagger.api.factories.UserApiServiceFactory; import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; @@ -20,6 +19,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.*; +import javax.inject.Inject; + import javax.validation.constraints.*; @Path("/user") @@ -28,7 +29,8 @@ import javax.validation.constraints.*; @io.swagger.annotations.Api(description = "the user API") public class UserApi { - private final UserApiService delegate = UserApiServiceFactory.getUserApi(); + + @Inject UserApiService service; @POST @@ -39,7 +41,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.createUser(body,securityContext); + return service.createUser(body,securityContext); } @POST @Path("/createWithArray") @@ -50,7 +52,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.createUsersWithArrayInput(body,securityContext); + return service.createUsersWithArrayInput(body,securityContext); } @POST @Path("/createWithList") @@ -61,7 +63,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.createUsersWithListInput(body,securityContext); + return service.createUsersWithListInput(body,securityContext); } @DELETE @Path("/{username}") @@ -74,7 +76,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response deleteUser( @PathParam("username") String username,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.deleteUser(username,securityContext); + return service.deleteUser(username,securityContext); } @GET @Path("/{username}") @@ -89,7 +91,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response getUserByName( @PathParam("username") String username,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.getUserByName(username,securityContext); + return service.getUserByName(username,securityContext); } @GET @Path("/login") @@ -102,7 +104,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) }) public Response loginUser( @NotNull @QueryParam("username") String username, @NotNull @QueryParam("password") String password,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.loginUser(username,password,securityContext); + return service.loginUser(username,password,securityContext); } @GET @Path("/logout") @@ -113,7 +115,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response logoutUser(@Context SecurityContext securityContext) throws NotFoundException { - return delegate.logoutUser(securityContext); + return service.logoutUser(securityContext); } @PUT @Path("/{username}") @@ -126,6 +128,6 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.updateUser(username,body,securityContext); + return service.updateUser(username,body,securityContext); } } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApiService.java index d693a4bde4d..54f5d5c105f 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApiService.java @@ -16,21 +16,21 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; -public abstract class UserApiService { - public abstract Response createUser(User body,SecurityContext securityContext) +public interface UserApiService { + Response createUser(User body,SecurityContext securityContext) throws NotFoundException; - public abstract Response createUsersWithArrayInput(List body,SecurityContext securityContext) + Response createUsersWithArrayInput(List body,SecurityContext securityContext) throws NotFoundException; - public abstract Response createUsersWithListInput(List body,SecurityContext securityContext) + Response createUsersWithListInput(List body,SecurityContext securityContext) throws NotFoundException; - public abstract Response deleteUser(String username,SecurityContext securityContext) + Response deleteUser(String username,SecurityContext securityContext) throws NotFoundException; - public abstract Response getUserByName(String username,SecurityContext securityContext) + Response getUserByName(String username,SecurityContext securityContext) throws NotFoundException; - public abstract Response loginUser(String username,String password,SecurityContext securityContext) + Response loginUser(String username,String password,SecurityContext securityContext) throws NotFoundException; - public abstract Response logoutUser(SecurityContext securityContext) + Response logoutUser(SecurityContext securityContext) throws NotFoundException; - public abstract Response updateUser(String username,User body,SecurityContext securityContext) + Response updateUser(String username,User body,SecurityContext securityContext) throws NotFoundException; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java deleted file mode 100644 index 54ae4b48435..00000000000 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.swagger.api.factories; - -import io.swagger.api.PetApiService; -import io.swagger.api.impl.PetApiServiceImpl; - - -public class PetApiServiceFactory { - - private final static PetApiService service = new PetApiServiceImpl(); - - public static PetApiService getPetApi() - { - return service; - } -} diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java deleted file mode 100644 index 79a403fee06..00000000000 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.swagger.api.factories; - -import io.swagger.api.StoreApiService; -import io.swagger.api.impl.StoreApiServiceImpl; - - -public class StoreApiServiceFactory { - - private final static StoreApiService service = new StoreApiServiceImpl(); - - public static StoreApiService getStoreApi() - { - return service; - } -} diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java deleted file mode 100644 index 2f1ae542f1b..00000000000 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.swagger.api.factories; - -import io.swagger.api.UserApiService; -import io.swagger.api.impl.UserApiServiceImpl; - - -public class UserApiServiceFactory { - - private final static UserApiService service = new UserApiServiceImpl(); - - public static UserApiService getUserApi() - { - return service; - } -} diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java index 379948ecf83..d8f13b40060 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java @@ -14,54 +14,48 @@ import io.swagger.api.NotFoundException; import java.io.InputStream; +import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; +@RequestScoped -public class PetApiServiceImpl extends PetApiService { - @Override +public class PetApiServiceImpl implements PetApiService { public Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response findPetsByStatus(List status,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response findPetsByTags(List tags,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response updatePet(Pet body,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext) throws NotFoundException { // do some magic! diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java index e07f88cabc0..edbf993ef74 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java @@ -12,30 +12,28 @@ import io.swagger.api.NotFoundException; import java.io.InputStream; +import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; +@RequestScoped -public class StoreApiServiceImpl extends StoreApiService { - @Override +public class StoreApiServiceImpl implements StoreApiService { public Response deleteOrder(String orderId,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response getInventory(SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response getOrderById(Long orderId,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response placeOrder(Order body,SecurityContext securityContext) throws NotFoundException { // do some magic! diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java index f1810b8e257..a0d5982520a 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java @@ -12,54 +12,48 @@ import io.swagger.api.NotFoundException; import java.io.InputStream; +import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; +@RequestScoped -public class UserApiServiceImpl extends UserApiService { - @Override +public class UserApiServiceImpl implements UserApiService { public Response createUser(User body,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response createUsersWithArrayInput(List body,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response createUsersWithListInput(List body,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response deleteUser(String username,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response getUserByName(String username,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response loginUser(String username,String password,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response logoutUser(SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response updateUser(String username,User body,SecurityContext securityContext) throws NotFoundException { // do some magic! diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml index 3a69cdd65b8..86047c8d1a4 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml @@ -9,6 +9,15 @@ src/main/java + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.7 + 1.7 + + org.apache.maven.plugins maven-war-plugin @@ -49,6 +58,14 @@ + + + javax + javaee-api + 7.0 + provided + + io.swagger swagger-annotations @@ -94,6 +111,7 @@ org.jboss.resteasy resteasy-jackson2-provider ${resteasy-version} + provided javax.annotation @@ -143,6 +161,14 @@ + + + javax.validation + validation-api + 1.1.0.Final + provided + + diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/PetApi.java index 90e60b780a9..d668c71d237 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/PetApi.java @@ -2,7 +2,6 @@ package io.swagger.api; import io.swagger.model.*; import io.swagger.api.PetApiService; -import io.swagger.api.factories.PetApiServiceFactory; import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; @@ -21,6 +20,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.*; +import javax.inject.Inject; + import javax.validation.constraints.*; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; @@ -30,7 +31,8 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; @io.swagger.annotations.Api(description = "the pet API") public class PetApi { - private final PetApiService delegate = PetApiServiceFactory.getPetApi(); + + @Inject PetApiService service; @POST @@ -46,7 +48,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.addPet(body,securityContext); + return service.addPet(body,securityContext); } @DELETE @Path("/{petId}") @@ -62,7 +64,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) }) public Response deletePet( @PathParam("petId") Long petId,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.deletePet(petId,apiKey,securityContext); + return service.deletePet(petId,apiKey,securityContext); } @GET @Path("/findByStatus") @@ -80,7 +82,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Void.class) }) public Response findPetsByStatus( @NotNull @QueryParam("status") List status,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.findPetsByStatus(status,securityContext); + return service.findPetsByStatus(status,securityContext); } @GET @Path("/findByTags") @@ -98,7 +100,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) }) public Response findPetsByTags( @NotNull @QueryParam("tags") List tags,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.findPetsByTags(tags,securityContext); + return service.findPetsByTags(tags,securityContext); } @GET @Path("/{petId}") @@ -115,7 +117,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class) }) public Response getPetById( @PathParam("petId") Long petId,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.getPetById(petId,securityContext); + return service.getPetById(petId,securityContext); } @PUT @@ -135,7 +137,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.updatePet(body,securityContext); + return service.updatePet(body,securityContext); } @POST @Path("/{petId}") @@ -151,7 +153,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) public Response updatePetWithForm( @PathParam("petId") Long petId,@ApiParam(value = "Updated name of the pet")@FormParam("name") String name,@ApiParam(value = "Updated status of the pet")@FormParam("status") String status,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.updatePetWithForm(petId,name,status,securityContext); + return service.updatePetWithForm(petId,name,status,securityContext); } @POST @Path("/{petId}/uploadImage") @@ -167,6 +169,6 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) public Response uploadFile(MultipartFormDataInput input, @PathParam("petId") Long petId,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.uploadFile(input,petId,securityContext); + return service.uploadFile(input,petId,securityContext); } } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/PetApiService.java index c44d05b9278..5b44f5d18b9 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/PetApiService.java @@ -18,21 +18,21 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; -public abstract class PetApiService { - public abstract Response addPet(Pet body,SecurityContext securityContext) +public interface PetApiService { + Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException; - public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) + Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException; - public abstract Response findPetsByStatus(List status,SecurityContext securityContext) + Response findPetsByStatus(List status,SecurityContext securityContext) throws NotFoundException; - public abstract Response findPetsByTags(List tags,SecurityContext securityContext) + Response findPetsByTags(List tags,SecurityContext securityContext) throws NotFoundException; - public abstract Response getPetById(Long petId,SecurityContext securityContext) + Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException; - public abstract Response updatePet(Pet body,SecurityContext securityContext) + Response updatePet(Pet body,SecurityContext securityContext) throws NotFoundException; - public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) + Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException; - public abstract Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext) + Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext) throws NotFoundException; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApi.java index c2479535d75..6b3a6cc3a07 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApi.java @@ -2,7 +2,6 @@ package io.swagger.api; import io.swagger.model.*; import io.swagger.api.StoreApiService; -import io.swagger.api.factories.StoreApiServiceFactory; import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; @@ -20,6 +19,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.*; +import javax.inject.Inject; + import javax.validation.constraints.*; @Path("/store") @@ -28,7 +29,8 @@ import javax.validation.constraints.*; @io.swagger.annotations.Api(description = "the store API") public class StoreApi { - private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi(); + + @Inject StoreApiService service; @DELETE @Path("/order/{orderId}") @@ -41,7 +43,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) }) public Response deleteOrder( @PathParam("orderId") String orderId,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.deleteOrder(orderId,securityContext); + return service.deleteOrder(orderId,securityContext); } @GET @Path("/inventory") @@ -54,7 +56,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") }) public Response getInventory(@Context SecurityContext securityContext) throws NotFoundException { - return delegate.getInventory(securityContext); + return service.getInventory(securityContext); } @GET @Path("/order/{orderId}") @@ -69,7 +71,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) }) public Response getOrderById( @Min(1) @Max(5) @PathParam("orderId") Long orderId,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.getOrderById(orderId,securityContext); + return service.getOrderById(orderId,securityContext); } @POST @Path("/order") @@ -82,6 +84,6 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.placeOrder(body,securityContext); + return service.placeOrder(body,securityContext); } } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApiService.java index 2174b1b3547..46958ea45c4 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApiService.java @@ -16,13 +16,13 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; -public abstract class StoreApiService { - public abstract Response deleteOrder(String orderId,SecurityContext securityContext) +public interface StoreApiService { + Response deleteOrder(String orderId,SecurityContext securityContext) throws NotFoundException; - public abstract Response getInventory(SecurityContext securityContext) + Response getInventory(SecurityContext securityContext) throws NotFoundException; - public abstract Response getOrderById(Long orderId,SecurityContext securityContext) + Response getOrderById(Long orderId,SecurityContext securityContext) throws NotFoundException; - public abstract Response placeOrder(Order body,SecurityContext securityContext) + Response placeOrder(Order body,SecurityContext securityContext) throws NotFoundException; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApi.java index d54375e6c78..30d8e9bae59 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApi.java @@ -2,7 +2,6 @@ package io.swagger.api; import io.swagger.model.*; import io.swagger.api.UserApiService; -import io.swagger.api.factories.UserApiServiceFactory; import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; @@ -20,6 +19,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.*; +import javax.inject.Inject; + import javax.validation.constraints.*; @Path("/user") @@ -28,7 +29,8 @@ import javax.validation.constraints.*; @io.swagger.annotations.Api(description = "the user API") public class UserApi { - private final UserApiService delegate = UserApiServiceFactory.getUserApi(); + + @Inject UserApiService service; @POST @@ -39,7 +41,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.createUser(body,securityContext); + return service.createUser(body,securityContext); } @POST @Path("/createWithArray") @@ -50,7 +52,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.createUsersWithArrayInput(body,securityContext); + return service.createUsersWithArrayInput(body,securityContext); } @POST @Path("/createWithList") @@ -61,7 +63,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.createUsersWithListInput(body,securityContext); + return service.createUsersWithListInput(body,securityContext); } @DELETE @Path("/{username}") @@ -74,7 +76,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response deleteUser( @PathParam("username") String username,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.deleteUser(username,securityContext); + return service.deleteUser(username,securityContext); } @GET @Path("/{username}") @@ -89,7 +91,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response getUserByName( @PathParam("username") String username,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.getUserByName(username,securityContext); + return service.getUserByName(username,securityContext); } @GET @Path("/login") @@ -102,7 +104,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) }) public Response loginUser( @NotNull @QueryParam("username") String username, @NotNull @QueryParam("password") String password,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.loginUser(username,password,securityContext); + return service.loginUser(username,password,securityContext); } @GET @Path("/logout") @@ -113,7 +115,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response logoutUser(@Context SecurityContext securityContext) throws NotFoundException { - return delegate.logoutUser(securityContext); + return service.logoutUser(securityContext); } @PUT @Path("/{username}") @@ -126,6 +128,6 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User body,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.updateUser(username,body,securityContext); + return service.updateUser(username,body,securityContext); } } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApiService.java index d693a4bde4d..54f5d5c105f 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApiService.java @@ -16,21 +16,21 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; -public abstract class UserApiService { - public abstract Response createUser(User body,SecurityContext securityContext) +public interface UserApiService { + Response createUser(User body,SecurityContext securityContext) throws NotFoundException; - public abstract Response createUsersWithArrayInput(List body,SecurityContext securityContext) + Response createUsersWithArrayInput(List body,SecurityContext securityContext) throws NotFoundException; - public abstract Response createUsersWithListInput(List body,SecurityContext securityContext) + Response createUsersWithListInput(List body,SecurityContext securityContext) throws NotFoundException; - public abstract Response deleteUser(String username,SecurityContext securityContext) + Response deleteUser(String username,SecurityContext securityContext) throws NotFoundException; - public abstract Response getUserByName(String username,SecurityContext securityContext) + Response getUserByName(String username,SecurityContext securityContext) throws NotFoundException; - public abstract Response loginUser(String username,String password,SecurityContext securityContext) + Response loginUser(String username,String password,SecurityContext securityContext) throws NotFoundException; - public abstract Response logoutUser(SecurityContext securityContext) + Response logoutUser(SecurityContext securityContext) throws NotFoundException; - public abstract Response updateUser(String username,User body,SecurityContext securityContext) + Response updateUser(String username,User body,SecurityContext securityContext) throws NotFoundException; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java index 379948ecf83..d8f13b40060 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java @@ -14,54 +14,48 @@ import io.swagger.api.NotFoundException; import java.io.InputStream; +import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; +@RequestScoped -public class PetApiServiceImpl extends PetApiService { - @Override +public class PetApiServiceImpl implements PetApiService { public Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response findPetsByStatus(List status,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response findPetsByTags(List tags,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response updatePet(Pet body,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext) throws NotFoundException { // do some magic! diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java index e07f88cabc0..edbf993ef74 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java @@ -12,30 +12,28 @@ import io.swagger.api.NotFoundException; import java.io.InputStream; +import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; +@RequestScoped -public class StoreApiServiceImpl extends StoreApiService { - @Override +public class StoreApiServiceImpl implements StoreApiService { public Response deleteOrder(String orderId,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response getInventory(SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response getOrderById(Long orderId,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response placeOrder(Order body,SecurityContext securityContext) throws NotFoundException { // do some magic! diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java index f1810b8e257..a0d5982520a 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java @@ -12,54 +12,48 @@ import io.swagger.api.NotFoundException; import java.io.InputStream; +import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; +@RequestScoped -public class UserApiServiceImpl extends UserApiService { - @Override +public class UserApiServiceImpl implements UserApiService { public Response createUser(User body,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response createUsersWithArrayInput(List body,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response createUsersWithListInput(List body,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response deleteUser(String username,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response getUserByName(String username,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response loginUser(String username,String password,SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response logoutUser(SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } - @Override public Response updateUser(String username,User body,SecurityContext securityContext) throws NotFoundException { // do some magic!