[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)#813

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
jmini merged 14 commits into from
Aug 15, 2018
Merged

[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI) #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
aed302d
Use parameter "useSwaggerAnnotations" to disable swagger annotations …
Aug 13, 2018
82eba8d
Remove import for ApiModel at fromModel(..), postProcessModelProperty…
Aug 14, 2018
4ffccae
Merge branch 'master' into filter_swagger_annotations
Aug 14, 2018
26902cf
Remove swagger annotations only if useSwaggerAnnotations is false
Aug 14, 2018
10cf7f7
Merge branch 'master' into filter_swagger_annotations
Aug 14, 2018
f8dae32
update Petstore sample so that CIs can verify the change
Aug 14, 2018
e45c53c
Prepare version 3.2.2-SNAPSHOT (#810)
jmini Aug 14, 2018
e9916c7
Merge branch 'master' into filter_swagger_annotations
michbeck100 Aug 14, 2018
c8c67e4
update Petstore sample so that CIs can verify the change
Aug 15, 2018
203a7c2
Merge remote-tracking branch 'origin/filter_swagger_annotations' into…
Aug 15, 2018
145fc68
Removed microprofile openapi dependency for now
Aug 15, 2018
daaa63d
update Petstore sample so that CIs can verify the change
Aug 15, 2018
efe7014
Just remove jackson imports if jackson is not used
Aug 15, 2018
8c33497
update Petstore sample so that CIs can verify the change
Aug 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions ...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@
package org.openapitools.codegen.languages;

import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.SupportingFile;

import java.io.File;
Expand All@@ -37,13 +37,17 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
public static final String INTERFACE_ONLY = "interfaceOnly";
public static final String RETURN_RESPONSE = "returnResponse";
public static final String GENERATE_POM = "generatePom";
public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
public static final String JACKSON = "jackson";

private boolean interfaceOnly = false;
private boolean returnResponse = false;
private boolean generatePom = true;

private boolean useSwaggerAnnotations = true;
private boolean useJackson = false;

private String primaryResourceName;

public JavaJAXRSSpecServerCodegen() {
super();
invokerPackage = "org.openapitools.api";
Expand DownExpand Up@@ -91,6 +95,7 @@ public JavaJAXRSSpecServerCodegen() {
cliOptions.add(CliOption.newBoolean(GENERATE_POM, "Whether to generate pom.xml if the file does not already exist.").defaultValue(String.valueOf(generatePom)));
cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
}

@Override
Expand All@@ -110,6 +115,13 @@ public void processOpts() {
additionalProperties.remove(RETURN_RESPONSE);
}
}
if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
}
writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);

useJackson = convertPropertyToBoolean(JACKSON);

if (interfaceOnly) {
// Change default artifactId if genereating interfaces only, before command line options are applied in base class.
artifactId = "openapi-jaxrs-client";
Expand DownExpand Up@@ -148,7 +160,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
if (pos > 0) {
basePath = basePath.substring(0, pos);
}

String operationKey = basePath;
if (StringUtils.isEmpty(basePath)) {
basePath = tag;
Expand All@@ -174,14 +186,19 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
}

@Override
public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
super.postProcessModelProperty(model, property);
model.imports.remove("ApiModelProperty");
model.imports.remove("ApiModel");
model.imports.remove("JsonSerialize");
model.imports.remove("ToStringSerializer");
model.imports.remove("JsonValue");
model.imports.remove("JsonProperty");
public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
if (!useSwaggerAnnotations) {
codegenModel.imports.remove("ApiModelProperty");
codegenModel.imports.remove("ApiModel");
}
if (!useJackson) {
codegenModel.imports.remove("JsonSerialize");
codegenModel.imports.remove("ToStringSerializer");
codegenModel.imports.remove("JsonValue");
codegenModel.imports.remove("JsonProperty");
}
return codegenModel;
}

@Override
Expand All@@ -194,7 +211,7 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
public String getHelp() {
return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
}

@Override
public String toApiName(final String name) {
String computed = name;
Expand Down
6 changes: 4 additions & 2 deletions modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,16 +6,18 @@ package {{package}};
import javax.ws.rs.*;
import javax.ws.rs.core.Response;

{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}

import java.io.InputStream;
import java.util.Map;
import java.util.List;
{{#useBeanValidation}}import javax.validation.constraints.*;
import javax.validation.Valid;{{/useBeanValidation}}

@Path("/{{{baseName}}}")
@Api(description = "the {{{baseName}}} API"){{#hasConsumes}}
@Path("/{{{baseName}}}"){{#useSwaggerAnnotations}}
@Api(description = "the {{{baseName}}} API"){{/useSwaggerAnnotations}}{{#hasConsumes}}
@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
{{>generatedAnnotation}}public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
@{{httpMethod}}{{#subresourceOperation}}
@Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
@ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
{{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
{{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -10,5 +10,5 @@
{{/hasMore}}{{/authMethods}}
}{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
@ApiResponses(value = { {{#responses}}
@ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} })
@ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }){{/useSwaggerAnnotations}}
{{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}});
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
@{{httpMethod}}{{#subresourceOperation}}
@Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
@ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
{{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
{{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -11,7 +11,7 @@
}{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
@ApiResponses(value = { {{#responses}}
@ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}}
})
}){{/useSwaggerAnnotations}}
public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) {
return Response.ok().entity("magic!").build();
}
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isPathParam}}
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}}
10 changes: 6 additions & 4 deletions modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand All@@ -7,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
{{#description}}
/**
* {{description}}
**/{{/description}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
**/{{/description}}{{#useSwaggerAnnotations}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
{{#vars}}{{#isEnum}}{{^isContainer}}

Expand All@@ -34,8 +36,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
return this;
}

{{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
{{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}{{#useSwaggerAnnotations}}
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}
@JsonProperty("{{baseName}}")
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
return {{name}};
Expand Down
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,12 +42,14 @@
<version>2.0</version>
<scope>provided</scope>
</dependency>
{{#useSwaggerAnnotations}}
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<scope>provided</scope>
<version>1.5.3</version>
</dependency>
{{/useSwaggerAnnotations}}
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isQueryParam}}
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isQueryParam}}
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down
1 change: 1 addition & 0 deletions ...s/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.model.Category;
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down
2 changes: 2 additions & 0 deletions ...e/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...re/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions .../petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...s/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...ver/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down
2 changes: 2 additions & 0 deletions ...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions .../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down
2 changes: 2 additions & 0 deletions .../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down
2 changes: 2 additions & 0 deletions ...etstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions .../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...er/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)#813

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

jmini
merged 14 commits into

from

Aug 15, 2018
 Merged


[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
aed302d

Use parameter "useSwaggerAnnotations" to disable swagger annotations …

Aug 13, 2018
82eba8d

Remove import for ApiModel at fromModel(..), postProcessModelProperty…

Aug 14, 2018
4ffccae

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
26902cf

Remove swagger annotations only if useSwaggerAnnotations is false

Aug 14, 2018
10cf7f7

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
f8dae32

update Petstore sample so that CIs can verify the change

Aug 14, 2018
e45c53c

Prepare version 3.2.2-SNAPSHOT (#810)


jmini Aug 14, 2018
e9916c7

Merge branch 'master' into filter_swagger_annotations


michbeck100 Aug 14, 2018
c8c67e4

update Petstore sample so that CIs can verify the change

Aug 15, 2018
203a7c2

Merge remote-tracking branch 'origin/filter_swagger_annotations' into…

Aug 15, 2018
145fc68

Removed microprofile openapi dependency for now

Aug 15, 2018
daaa63d

update Petstore sample so that CIs can verify the change

Aug 15, 2018
efe7014

Just remove jackson imports if jackson is not used

Aug 15, 2018
8c33497

update Petstore sample so that CIs can verify the change

Aug 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


43 changes: 30 additions & 13 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@
package org.openapitools.codegen.languages;

import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.SupportingFile;

import java.io.File;
Expand All@@ -37,13 +37,17 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
 public static final String INTERFACE_ONLY = "interfaceOnly";
 public static final String RETURN_RESPONSE = "returnResponse";
 public static final String GENERATE_POM = "generatePom";
 public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
 public static final String JACKSON = "jackson";

 private boolean interfaceOnly = false;
 private boolean returnResponse = false;
 private boolean generatePom = true;

 private boolean useSwaggerAnnotations = true;
 private boolean useJackson = false;

 private String primaryResourceName;

 public JavaJAXRSSpecServerCodegen() {
 super();
 invokerPackage = "org.openapitools.api";
Expand DownExpand Up@@ -91,6 +95,7 @@ public JavaJAXRSSpecServerCodegen() {
 cliOptions.add(CliOption.newBoolean(GENERATE_POM, "Whether to generate pom.xml if the file does not already exist.").defaultValue(String.valueOf(generatePom)));
 cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
 cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
 cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
 }

 @Override
Expand All@@ -110,6 +115,13 @@ public void processOpts() {
 additionalProperties.remove(RETURN_RESPONSE);
 }
 }
 if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
 useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
 }
 writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);

 useJackson = convertPropertyToBoolean(JACKSON);

 if (interfaceOnly) {
 // Change default artifactId if genereating interfaces only, before command line options are applied in base class.
 artifactId = "openapi-jaxrs-client";
Expand DownExpand Up@@ -148,7 +160,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 if (pos > 0) {
 basePath = basePath.substring(0, pos);
 }

 String operationKey = basePath;
 if (StringUtils.isEmpty(basePath)) {
 basePath = tag;
Expand All@@ -174,14 +186,19 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 }

 @Override
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);
 model.imports.remove("ApiModelProperty");
 model.imports.remove("ApiModel");
 model.imports.remove("JsonSerialize");
 model.imports.remove("ToStringSerializer");
 model.imports.remove("JsonValue");
 model.imports.remove("JsonProperty");
 public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
 CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
 if (!useSwaggerAnnotations) {
 codegenModel.imports.remove("ApiModelProperty");
 codegenModel.imports.remove("ApiModel");
 }
 if (!useJackson) {
 codegenModel.imports.remove("JsonSerialize");
 codegenModel.imports.remove("ToStringSerializer");
 codegenModel.imports.remove("JsonValue");
 codegenModel.imports.remove("JsonProperty");
 }
 return codegenModel;
 }

 @Override
Expand All@@ -194,7 +211,7 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
 public String getHelp() {
 return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
 }

 @Override
 public String toApiName(final String name) {
 String computed = name;
Expand Down

6 changes: 4 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,16 +6,18 @@ package {{package}};
import javax.ws.rs.*;
import javax.ws.rs.core.Response;

{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}

import java.io.InputStream;
import java.util.Map;
import java.util.List;
{{#useBeanValidation}}import javax.validation.constraints.*;
import javax.validation.Valid;{{/useBeanValidation}}

@Path("/{{{baseName}}}")
@Api(description = "the {{{baseName}}} API"){{#hasConsumes}}
@Path("/{{{baseName}}}"){{#useSwaggerAnnotations}}
@Api(description = "the {{{baseName}}} API"){{/useSwaggerAnnotations}}{{#hasConsumes}}
@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
{{>generatedAnnotation}}public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -10,5 +10,5 @@
 {{/hasMore}}{{/authMethods}}
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} })
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }){{/useSwaggerAnnotations}}
 {{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}});

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -11,7 +11,7 @@
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}}
 })
 }){{/useSwaggerAnnotations}}
 public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) {
 return Response.ok().entity("magic!").build();
 }

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isPathParam}}
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}}

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand All@@ -7,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
{{#description}}
/**
 * {{description}}
 **/{{/description}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 **/{{/description}}{{#useSwaggerAnnotations}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#vars}}{{#isEnum}}{{^isContainer}}

Expand All@@ -34,8 +36,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 return this;
 }

 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}{{#useSwaggerAnnotations}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}
 @JsonProperty("{{baseName}}")
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
 return {{name}};
Expand Down

2 changes: 2 additions & 0 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,12 +42,14 @@
 <version>2.0</version>
 <scope>provided</scope>
 </dependency>
 {{#useSwaggerAnnotations}}
 <dependency>
 <groupId>io.swagger</groupId>
 <artifactId>swagger-annotations</artifactId>
 <scope>provided</scope>
 <version>1.5.3</version>
 </dependency>
 {{/useSwaggerAnnotations}}
 <dependency>
 <groupId>junit</groupId>
 <artifactId>junit</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isQueryParam}}
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isQueryParam}}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
...s/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.model.Category;
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

2 changes: 2 additions & 0 deletions
...e/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...re/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...s/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...ver/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

1 change: 1 addition & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...etstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...er/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)#813

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

jmini
merged 14 commits into

from

Aug 15, 2018
 Merged


[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
aed302d

Use parameter "useSwaggerAnnotations" to disable swagger annotations …

Aug 13, 2018
82eba8d

Remove import for ApiModel at fromModel(..), postProcessModelProperty…

Aug 14, 2018
4ffccae

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
26902cf

Remove swagger annotations only if useSwaggerAnnotations is false

Aug 14, 2018
10cf7f7

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
f8dae32

update Petstore sample so that CIs can verify the change

Aug 14, 2018
e45c53c

Prepare version 3.2.2-SNAPSHOT (#810)


jmini Aug 14, 2018
e9916c7

Merge branch 'master' into filter_swagger_annotations


michbeck100 Aug 14, 2018
c8c67e4

update Petstore sample so that CIs can verify the change

Aug 15, 2018
203a7c2

Merge remote-tracking branch 'origin/filter_swagger_annotations' into…

Aug 15, 2018
145fc68

Removed microprofile openapi dependency for now

Aug 15, 2018
daaa63d

update Petstore sample so that CIs can verify the change

Aug 15, 2018
efe7014

Just remove jackson imports if jackson is not used

Aug 15, 2018
8c33497

update Petstore sample so that CIs can verify the change

Aug 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


43 changes: 30 additions & 13 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@
package org.openapitools.codegen.languages;

import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.SupportingFile;

import java.io.File;
Expand All@@ -37,13 +37,17 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
 public static final String INTERFACE_ONLY = "interfaceOnly";
 public static final String RETURN_RESPONSE = "returnResponse";
 public static final String GENERATE_POM = "generatePom";
 public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
 public static final String JACKSON = "jackson";

 private boolean interfaceOnly = false;
 private boolean returnResponse = false;
 private boolean generatePom = true;

 private boolean useSwaggerAnnotations = true;
 private boolean useJackson = false;

 private String primaryResourceName;

 public JavaJAXRSSpecServerCodegen() {
 super();
 invokerPackage = "org.openapitools.api";
Expand DownExpand Up@@ -91,6 +95,7 @@ public JavaJAXRSSpecServerCodegen() {
 cliOptions.add(CliOption.newBoolean(GENERATE_POM, "Whether to generate pom.xml if the file does not already exist.").defaultValue(String.valueOf(generatePom)));
 cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
 cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
 cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
 }

 @Override
Expand All@@ -110,6 +115,13 @@ public void processOpts() {
 additionalProperties.remove(RETURN_RESPONSE);
 }
 }
 if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
 useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
 }
 writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);

 useJackson = convertPropertyToBoolean(JACKSON);

 if (interfaceOnly) {
 // Change default artifactId if genereating interfaces only, before command line options are applied in base class.
 artifactId = "openapi-jaxrs-client";
Expand DownExpand Up@@ -148,7 +160,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 if (pos > 0) {
 basePath = basePath.substring(0, pos);
 }

 String operationKey = basePath;
 if (StringUtils.isEmpty(basePath)) {
 basePath = tag;
Expand All@@ -174,14 +186,19 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 }

 @Override
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);
 model.imports.remove("ApiModelProperty");
 model.imports.remove("ApiModel");
 model.imports.remove("JsonSerialize");
 model.imports.remove("ToStringSerializer");
 model.imports.remove("JsonValue");
 model.imports.remove("JsonProperty");
 public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
 CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
 if (!useSwaggerAnnotations) {
 codegenModel.imports.remove("ApiModelProperty");
 codegenModel.imports.remove("ApiModel");
 }
 if (!useJackson) {
 codegenModel.imports.remove("JsonSerialize");
 codegenModel.imports.remove("ToStringSerializer");
 codegenModel.imports.remove("JsonValue");
 codegenModel.imports.remove("JsonProperty");
 }
 return codegenModel;
 }

 @Override
Expand All@@ -194,7 +211,7 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
 public String getHelp() {
 return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
 }

 @Override
 public String toApiName(final String name) {
 String computed = name;
Expand Down

6 changes: 4 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,16 +6,18 @@ package {{package}};
import javax.ws.rs.*;
import javax.ws.rs.core.Response;

{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}

import java.io.InputStream;
import java.util.Map;
import java.util.List;
{{#useBeanValidation}}import javax.validation.constraints.*;
import javax.validation.Valid;{{/useBeanValidation}}

@Path("/{{{baseName}}}")
@Api(description = "the {{{baseName}}} API"){{#hasConsumes}}
@Path("/{{{baseName}}}"){{#useSwaggerAnnotations}}
@Api(description = "the {{{baseName}}} API"){{/useSwaggerAnnotations}}{{#hasConsumes}}
@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
{{>generatedAnnotation}}public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -10,5 +10,5 @@
 {{/hasMore}}{{/authMethods}}
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} })
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }){{/useSwaggerAnnotations}}
 {{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}});

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -11,7 +11,7 @@
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}}
 })
 }){{/useSwaggerAnnotations}}
 public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) {
 return Response.ok().entity("magic!").build();
 }

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isPathParam}}
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}}

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand All@@ -7,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
{{#description}}
/**
 * {{description}}
 **/{{/description}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 **/{{/description}}{{#useSwaggerAnnotations}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#vars}}{{#isEnum}}{{^isContainer}}

Expand All@@ -34,8 +36,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 return this;
 }

 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}{{#useSwaggerAnnotations}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}
 @JsonProperty("{{baseName}}")
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
 return {{name}};
Expand Down

2 changes: 2 additions & 0 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,12 +42,14 @@
 <version>2.0</version>
 <scope>provided</scope>
 </dependency>
 {{#useSwaggerAnnotations}}
 <dependency>
 <groupId>io.swagger</groupId>
 <artifactId>swagger-annotations</artifactId>
 <scope>provided</scope>
 <version>1.5.3</version>
 </dependency>
 {{/useSwaggerAnnotations}}
 <dependency>
 <groupId>junit</groupId>
 <artifactId>junit</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isQueryParam}}
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isQueryParam}}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
...s/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.model.Category;
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

2 changes: 2 additions & 0 deletions
...e/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...re/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...s/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...ver/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

1 change: 1 addition & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...etstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...er/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)#813

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

jmini
merged 14 commits into

from

Aug 15, 2018
 Merged


[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
aed302d

Use parameter "useSwaggerAnnotations" to disable swagger annotations …

Aug 13, 2018
82eba8d

Remove import for ApiModel at fromModel(..), postProcessModelProperty…

Aug 14, 2018
4ffccae

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
26902cf

Remove swagger annotations only if useSwaggerAnnotations is false

Aug 14, 2018
10cf7f7

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
f8dae32

update Petstore sample so that CIs can verify the change

Aug 14, 2018
e45c53c

Prepare version 3.2.2-SNAPSHOT (#810)


jmini Aug 14, 2018
e9916c7

Merge branch 'master' into filter_swagger_annotations


michbeck100 Aug 14, 2018
c8c67e4

update Petstore sample so that CIs can verify the change

Aug 15, 2018
203a7c2

Merge remote-tracking branch 'origin/filter_swagger_annotations' into…

Aug 15, 2018
145fc68

Removed microprofile openapi dependency for now

Aug 15, 2018
daaa63d

update Petstore sample so that CIs can verify the change

Aug 15, 2018
efe7014

Just remove jackson imports if jackson is not used

Aug 15, 2018
8c33497

update Petstore sample so that CIs can verify the change

Aug 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


43 changes: 30 additions & 13 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@
package org.openapitools.codegen.languages;

import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.SupportingFile;

import java.io.File;
Expand All@@ -37,13 +37,17 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
 public static final String INTERFACE_ONLY = "interfaceOnly";
 public static final String RETURN_RESPONSE = "returnResponse";
 public static final String GENERATE_POM = "generatePom";
 public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
 public static final String JACKSON = "jackson";

 private boolean interfaceOnly = false;
 private boolean returnResponse = false;
 private boolean generatePom = true;

 private boolean useSwaggerAnnotations = true;
 private boolean useJackson = false;

 private String primaryResourceName;

 public JavaJAXRSSpecServerCodegen() {
 super();
 invokerPackage = "org.openapitools.api";
Expand DownExpand Up@@ -91,6 +95,7 @@ public JavaJAXRSSpecServerCodegen() {
 cliOptions.add(CliOption.newBoolean(GENERATE_POM, "Whether to generate pom.xml if the file does not already exist.").defaultValue(String.valueOf(generatePom)));
 cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
 cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
 cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
 }

 @Override
Expand All@@ -110,6 +115,13 @@ public void processOpts() {
 additionalProperties.remove(RETURN_RESPONSE);
 }
 }
 if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
 useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
 }
 writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);

 useJackson = convertPropertyToBoolean(JACKSON);

 if (interfaceOnly) {
 // Change default artifactId if genereating interfaces only, before command line options are applied in base class.
 artifactId = "openapi-jaxrs-client";
Expand DownExpand Up@@ -148,7 +160,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 if (pos > 0) {
 basePath = basePath.substring(0, pos);
 }

 String operationKey = basePath;
 if (StringUtils.isEmpty(basePath)) {
 basePath = tag;
Expand All@@ -174,14 +186,19 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 }

 @Override
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);
 model.imports.remove("ApiModelProperty");
 model.imports.remove("ApiModel");
 model.imports.remove("JsonSerialize");
 model.imports.remove("ToStringSerializer");
 model.imports.remove("JsonValue");
 model.imports.remove("JsonProperty");
 public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
 CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
 if (!useSwaggerAnnotations) {
 codegenModel.imports.remove("ApiModelProperty");
 codegenModel.imports.remove("ApiModel");
 }
 if (!useJackson) {
 codegenModel.imports.remove("JsonSerialize");
 codegenModel.imports.remove("ToStringSerializer");
 codegenModel.imports.remove("JsonValue");
 codegenModel.imports.remove("JsonProperty");
 }
 return codegenModel;
 }

 @Override
Expand All@@ -194,7 +211,7 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
 public String getHelp() {
 return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
 }

 @Override
 public String toApiName(final String name) {
 String computed = name;
Expand Down

6 changes: 4 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,16 +6,18 @@ package {{package}};
import javax.ws.rs.*;
import javax.ws.rs.core.Response;

{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}

import java.io.InputStream;
import java.util.Map;
import java.util.List;
{{#useBeanValidation}}import javax.validation.constraints.*;
import javax.validation.Valid;{{/useBeanValidation}}

@Path("/{{{baseName}}}")
@Api(description = "the {{{baseName}}} API"){{#hasConsumes}}
@Path("/{{{baseName}}}"){{#useSwaggerAnnotations}}
@Api(description = "the {{{baseName}}} API"){{/useSwaggerAnnotations}}{{#hasConsumes}}
@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
{{>generatedAnnotation}}public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -10,5 +10,5 @@
 {{/hasMore}}{{/authMethods}}
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} })
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }){{/useSwaggerAnnotations}}
 {{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}});

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -11,7 +11,7 @@
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}}
 })
 }){{/useSwaggerAnnotations}}
 public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) {
 return Response.ok().entity("magic!").build();
 }

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isPathParam}}
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}}

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand All@@ -7,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
{{#description}}
/**
 * {{description}}
 **/{{/description}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 **/{{/description}}{{#useSwaggerAnnotations}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#vars}}{{#isEnum}}{{^isContainer}}

Expand All@@ -34,8 +36,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 return this;
 }

 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}{{#useSwaggerAnnotations}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}
 @JsonProperty("{{baseName}}")
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
 return {{name}};
Expand Down

2 changes: 2 additions & 0 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,12 +42,14 @@
 <version>2.0</version>
 <scope>provided</scope>
 </dependency>
 {{#useSwaggerAnnotations}}
 <dependency>
 <groupId>io.swagger</groupId>
 <artifactId>swagger-annotations</artifactId>
 <scope>provided</scope>
 <version>1.5.3</version>
 </dependency>
 {{/useSwaggerAnnotations}}
 <dependency>
 <groupId>junit</groupId>
 <artifactId>junit</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isQueryParam}}
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isQueryParam}}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
...s/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.model.Category;
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

2 changes: 2 additions & 0 deletions
...e/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...re/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...s/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...ver/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

1 change: 1 addition & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...etstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...er/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)#813

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

jmini
merged 14 commits into

from

Aug 15, 2018
 Merged


[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
aed302d

Use parameter "useSwaggerAnnotations" to disable swagger annotations …

Aug 13, 2018
82eba8d

Remove import for ApiModel at fromModel(..), postProcessModelProperty…

Aug 14, 2018
4ffccae

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
26902cf

Remove swagger annotations only if useSwaggerAnnotations is false

Aug 14, 2018
10cf7f7

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
f8dae32

update Petstore sample so that CIs can verify the change

Aug 14, 2018
e45c53c

Prepare version 3.2.2-SNAPSHOT (#810)


jmini Aug 14, 2018
e9916c7

Merge branch 'master' into filter_swagger_annotations


michbeck100 Aug 14, 2018
c8c67e4

update Petstore sample so that CIs can verify the change

Aug 15, 2018
203a7c2

Merge remote-tracking branch 'origin/filter_swagger_annotations' into…

Aug 15, 2018
145fc68

Removed microprofile openapi dependency for now

Aug 15, 2018
daaa63d

update Petstore sample so that CIs can verify the change

Aug 15, 2018
efe7014

Just remove jackson imports if jackson is not used

Aug 15, 2018
8c33497

update Petstore sample so that CIs can verify the change

Aug 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


43 changes: 30 additions & 13 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@
package org.openapitools.codegen.languages;

import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.SupportingFile;

import java.io.File;
Expand All@@ -37,13 +37,17 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
 public static final String INTERFACE_ONLY = "interfaceOnly";
 public static final String RETURN_RESPONSE = "returnResponse";
 public static final String GENERATE_POM = "generatePom";
 public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
 public static final String JACKSON = "jackson";

 private boolean interfaceOnly = false;
 private boolean returnResponse = false;
 private boolean generatePom = true;

 private boolean useSwaggerAnnotations = true;
 private boolean useJackson = false;

 private String primaryResourceName;

 public JavaJAXRSSpecServerCodegen() {
 super();
 invokerPackage = "org.openapitools.api";
Expand DownExpand Up@@ -91,6 +95,7 @@ public JavaJAXRSSpecServerCodegen() {
 cliOptions.add(CliOption.newBoolean(GENERATE_POM, "Whether to generate pom.xml if the file does not already exist.").defaultValue(String.valueOf(generatePom)));
 cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
 cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
 cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
 }

 @Override
Expand All@@ -110,6 +115,13 @@ public void processOpts() {
 additionalProperties.remove(RETURN_RESPONSE);
 }
 }
 if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
 useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
 }
 writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);

 useJackson = convertPropertyToBoolean(JACKSON);

 if (interfaceOnly) {
 // Change default artifactId if genereating interfaces only, before command line options are applied in base class.
 artifactId = "openapi-jaxrs-client";
Expand DownExpand Up@@ -148,7 +160,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 if (pos > 0) {
 basePath = basePath.substring(0, pos);
 }

 String operationKey = basePath;
 if (StringUtils.isEmpty(basePath)) {
 basePath = tag;
Expand All@@ -174,14 +186,19 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 }

 @Override
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);
 model.imports.remove("ApiModelProperty");
 model.imports.remove("ApiModel");
 model.imports.remove("JsonSerialize");
 model.imports.remove("ToStringSerializer");
 model.imports.remove("JsonValue");
 model.imports.remove("JsonProperty");
 public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
 CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
 if (!useSwaggerAnnotations) {
 codegenModel.imports.remove("ApiModelProperty");
 codegenModel.imports.remove("ApiModel");
 }
 if (!useJackson) {
 codegenModel.imports.remove("JsonSerialize");
 codegenModel.imports.remove("ToStringSerializer");
 codegenModel.imports.remove("JsonValue");
 codegenModel.imports.remove("JsonProperty");
 }
 return codegenModel;
 }

 @Override
Expand All@@ -194,7 +211,7 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
 public String getHelp() {
 return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
 }

 @Override
 public String toApiName(final String name) {
 String computed = name;
Expand Down

6 changes: 4 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,16 +6,18 @@ package {{package}};
import javax.ws.rs.*;
import javax.ws.rs.core.Response;

{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}

import java.io.InputStream;
import java.util.Map;
import java.util.List;
{{#useBeanValidation}}import javax.validation.constraints.*;
import javax.validation.Valid;{{/useBeanValidation}}

@Path("/{{{baseName}}}")
@Api(description = "the {{{baseName}}} API"){{#hasConsumes}}
@Path("/{{{baseName}}}"){{#useSwaggerAnnotations}}
@Api(description = "the {{{baseName}}} API"){{/useSwaggerAnnotations}}{{#hasConsumes}}
@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
{{>generatedAnnotation}}public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -10,5 +10,5 @@
 {{/hasMore}}{{/authMethods}}
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} })
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }){{/useSwaggerAnnotations}}
 {{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}});

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -11,7 +11,7 @@
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}}
 })
 }){{/useSwaggerAnnotations}}
 public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) {
 return Response.ok().entity("magic!").build();
 }

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isPathParam}}
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}}

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand All@@ -7,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
{{#description}}
/**
 * {{description}}
 **/{{/description}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 **/{{/description}}{{#useSwaggerAnnotations}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#vars}}{{#isEnum}}{{^isContainer}}

Expand All@@ -34,8 +36,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 return this;
 }

 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}{{#useSwaggerAnnotations}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}
 @JsonProperty("{{baseName}}")
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
 return {{name}};
Expand Down

2 changes: 2 additions & 0 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,12 +42,14 @@
 <version>2.0</version>
 <scope>provided</scope>
 </dependency>
 {{#useSwaggerAnnotations}}
 <dependency>
 <groupId>io.swagger</groupId>
 <artifactId>swagger-annotations</artifactId>
 <scope>provided</scope>
 <version>1.5.3</version>
 </dependency>
 {{/useSwaggerAnnotations}}
 <dependency>
 <groupId>junit</groupId>
 <artifactId>junit</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isQueryParam}}
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isQueryParam}}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
...s/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.model.Category;
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

2 changes: 2 additions & 0 deletions
...e/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...re/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...s/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...ver/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

1 change: 1 addition & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...etstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...er/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)#813

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

jmini
merged 14 commits into

from

Aug 15, 2018
 Merged


[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
aed302d

Use parameter "useSwaggerAnnotations" to disable swagger annotations …

Aug 13, 2018
82eba8d

Remove import for ApiModel at fromModel(..), postProcessModelProperty…

Aug 14, 2018
4ffccae

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
26902cf

Remove swagger annotations only if useSwaggerAnnotations is false

Aug 14, 2018
10cf7f7

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
f8dae32

update Petstore sample so that CIs can verify the change

Aug 14, 2018
e45c53c

Prepare version 3.2.2-SNAPSHOT (#810)


jmini Aug 14, 2018
e9916c7

Merge branch 'master' into filter_swagger_annotations


michbeck100 Aug 14, 2018
c8c67e4

update Petstore sample so that CIs can verify the change

Aug 15, 2018
203a7c2

Merge remote-tracking branch 'origin/filter_swagger_annotations' into…

Aug 15, 2018
145fc68

Removed microprofile openapi dependency for now

Aug 15, 2018
daaa63d

update Petstore sample so that CIs can verify the change

Aug 15, 2018
efe7014

Just remove jackson imports if jackson is not used

Aug 15, 2018
8c33497

update Petstore sample so that CIs can verify the change

Aug 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


43 changes: 30 additions & 13 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@
package org.openapitools.codegen.languages;

import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.SupportingFile;

import java.io.File;
Expand All@@ -37,13 +37,17 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
 public static final String INTERFACE_ONLY = "interfaceOnly";
 public static final String RETURN_RESPONSE = "returnResponse";
 public static final String GENERATE_POM = "generatePom";
 public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
 public static final String JACKSON = "jackson";

 private boolean interfaceOnly = false;
 private boolean returnResponse = false;
 private boolean generatePom = true;

 private boolean useSwaggerAnnotations = true;
 private boolean useJackson = false;

 private String primaryResourceName;

 public JavaJAXRSSpecServerCodegen() {
 super();
 invokerPackage = "org.openapitools.api";
Expand DownExpand Up@@ -91,6 +95,7 @@ public JavaJAXRSSpecServerCodegen() {
 cliOptions.add(CliOption.newBoolean(GENERATE_POM, "Whether to generate pom.xml if the file does not already exist.").defaultValue(String.valueOf(generatePom)));
 cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
 cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
 cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
 }

 @Override
Expand All@@ -110,6 +115,13 @@ public void processOpts() {
 additionalProperties.remove(RETURN_RESPONSE);
 }
 }
 if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
 useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
 }
 writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);

 useJackson = convertPropertyToBoolean(JACKSON);

 if (interfaceOnly) {
 // Change default artifactId if genereating interfaces only, before command line options are applied in base class.
 artifactId = "openapi-jaxrs-client";
Expand DownExpand Up@@ -148,7 +160,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 if (pos > 0) {
 basePath = basePath.substring(0, pos);
 }

 String operationKey = basePath;
 if (StringUtils.isEmpty(basePath)) {
 basePath = tag;
Expand All@@ -174,14 +186,19 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 }

 @Override
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);
 model.imports.remove("ApiModelProperty");
 model.imports.remove("ApiModel");
 model.imports.remove("JsonSerialize");
 model.imports.remove("ToStringSerializer");
 model.imports.remove("JsonValue");
 model.imports.remove("JsonProperty");
 public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
 CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
 if (!useSwaggerAnnotations) {
 codegenModel.imports.remove("ApiModelProperty");
 codegenModel.imports.remove("ApiModel");
 }
 if (!useJackson) {
 codegenModel.imports.remove("JsonSerialize");
 codegenModel.imports.remove("ToStringSerializer");
 codegenModel.imports.remove("JsonValue");
 codegenModel.imports.remove("JsonProperty");
 }
 return codegenModel;
 }

 @Override
Expand All@@ -194,7 +211,7 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
 public String getHelp() {
 return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
 }

 @Override
 public String toApiName(final String name) {
 String computed = name;
Expand Down

6 changes: 4 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,16 +6,18 @@ package {{package}};
import javax.ws.rs.*;
import javax.ws.rs.core.Response;

{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}

import java.io.InputStream;
import java.util.Map;
import java.util.List;
{{#useBeanValidation}}import javax.validation.constraints.*;
import javax.validation.Valid;{{/useBeanValidation}}

@Path("/{{{baseName}}}")
@Api(description = "the {{{baseName}}} API"){{#hasConsumes}}
@Path("/{{{baseName}}}"){{#useSwaggerAnnotations}}
@Api(description = "the {{{baseName}}} API"){{/useSwaggerAnnotations}}{{#hasConsumes}}
@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
{{>generatedAnnotation}}public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -10,5 +10,5 @@
 {{/hasMore}}{{/authMethods}}
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} })
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }){{/useSwaggerAnnotations}}
 {{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}});

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -11,7 +11,7 @@
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}}
 })
 }){{/useSwaggerAnnotations}}
 public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) {
 return Response.ok().entity("magic!").build();
 }

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isPathParam}}
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}}

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand All@@ -7,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
{{#description}}
/**
 * {{description}}
 **/{{/description}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 **/{{/description}}{{#useSwaggerAnnotations}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#vars}}{{#isEnum}}{{^isContainer}}

Expand All@@ -34,8 +36,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 return this;
 }

 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}{{#useSwaggerAnnotations}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}
 @JsonProperty("{{baseName}}")
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
 return {{name}};
Expand Down

2 changes: 2 additions & 0 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,12 +42,14 @@
 <version>2.0</version>
 <scope>provided</scope>
 </dependency>
 {{#useSwaggerAnnotations}}
 <dependency>
 <groupId>io.swagger</groupId>
 <artifactId>swagger-annotations</artifactId>
 <scope>provided</scope>
 <version>1.5.3</version>
 </dependency>
 {{/useSwaggerAnnotations}}
 <dependency>
 <groupId>junit</groupId>
 <artifactId>junit</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isQueryParam}}
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isQueryParam}}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
...s/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.model.Category;
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

2 changes: 2 additions & 0 deletions
...e/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...re/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...s/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...ver/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

1 change: 1 addition & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...etstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...er/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)#813

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

jmini
merged 14 commits into

from

Aug 15, 2018
 Merged


[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
aed302d

Use parameter "useSwaggerAnnotations" to disable swagger annotations …

Aug 13, 2018
82eba8d

Remove import for ApiModel at fromModel(..), postProcessModelProperty…

Aug 14, 2018
4ffccae

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
26902cf

Remove swagger annotations only if useSwaggerAnnotations is false

Aug 14, 2018
10cf7f7

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
f8dae32

update Petstore sample so that CIs can verify the change

Aug 14, 2018
e45c53c

Prepare version 3.2.2-SNAPSHOT (#810)


jmini Aug 14, 2018
e9916c7

Merge branch 'master' into filter_swagger_annotations


michbeck100 Aug 14, 2018
c8c67e4

update Petstore sample so that CIs can verify the change

Aug 15, 2018
203a7c2

Merge remote-tracking branch 'origin/filter_swagger_annotations' into…

Aug 15, 2018
145fc68

Removed microprofile openapi dependency for now

Aug 15, 2018
daaa63d

update Petstore sample so that CIs can verify the change

Aug 15, 2018
efe7014

Just remove jackson imports if jackson is not used

Aug 15, 2018
8c33497

update Petstore sample so that CIs can verify the change

Aug 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


43 changes: 30 additions & 13 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@
package org.openapitools.codegen.languages;

import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.SupportingFile;

import java.io.File;
Expand All@@ -37,13 +37,17 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
 public static final String INTERFACE_ONLY = "interfaceOnly";
 public static final String RETURN_RESPONSE = "returnResponse";
 public static final String GENERATE_POM = "generatePom";
 public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
 public static final String JACKSON = "jackson";

 private boolean interfaceOnly = false;
 private boolean returnResponse = false;
 private boolean generatePom = true;

 private boolean useSwaggerAnnotations = true;
 private boolean useJackson = false;

 private String primaryResourceName;

 public JavaJAXRSSpecServerCodegen() {
 super();
 invokerPackage = "org.openapitools.api";
Expand DownExpand Up@@ -91,6 +95,7 @@ public JavaJAXRSSpecServerCodegen() {
 cliOptions.add(CliOption.newBoolean(GENERATE_POM, "Whether to generate pom.xml if the file does not already exist.").defaultValue(String.valueOf(generatePom)));
 cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
 cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
 cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
 }

 @Override
Expand All@@ -110,6 +115,13 @@ public void processOpts() {
 additionalProperties.remove(RETURN_RESPONSE);
 }
 }
 if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
 useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
 }
 writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);

 useJackson = convertPropertyToBoolean(JACKSON);

 if (interfaceOnly) {
 // Change default artifactId if genereating interfaces only, before command line options are applied in base class.
 artifactId = "openapi-jaxrs-client";
Expand DownExpand Up@@ -148,7 +160,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 if (pos > 0) {
 basePath = basePath.substring(0, pos);
 }

 String operationKey = basePath;
 if (StringUtils.isEmpty(basePath)) {
 basePath = tag;
Expand All@@ -174,14 +186,19 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 }

 @Override
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);
 model.imports.remove("ApiModelProperty");
 model.imports.remove("ApiModel");
 model.imports.remove("JsonSerialize");
 model.imports.remove("ToStringSerializer");
 model.imports.remove("JsonValue");
 model.imports.remove("JsonProperty");
 public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
 CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
 if (!useSwaggerAnnotations) {
 codegenModel.imports.remove("ApiModelProperty");
 codegenModel.imports.remove("ApiModel");
 }
 if (!useJackson) {
 codegenModel.imports.remove("JsonSerialize");
 codegenModel.imports.remove("ToStringSerializer");
 codegenModel.imports.remove("JsonValue");
 codegenModel.imports.remove("JsonProperty");
 }
 return codegenModel;
 }

 @Override
Expand All@@ -194,7 +211,7 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
 public String getHelp() {
 return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
 }

 @Override
 public String toApiName(final String name) {
 String computed = name;
Expand Down

6 changes: 4 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,16 +6,18 @@ package {{package}};
import javax.ws.rs.*;
import javax.ws.rs.core.Response;

{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}

import java.io.InputStream;
import java.util.Map;
import java.util.List;
{{#useBeanValidation}}import javax.validation.constraints.*;
import javax.validation.Valid;{{/useBeanValidation}}

@Path("/{{{baseName}}}")
@Api(description = "the {{{baseName}}} API"){{#hasConsumes}}
@Path("/{{{baseName}}}"){{#useSwaggerAnnotations}}
@Api(description = "the {{{baseName}}} API"){{/useSwaggerAnnotations}}{{#hasConsumes}}
@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
{{>generatedAnnotation}}public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -10,5 +10,5 @@
 {{/hasMore}}{{/authMethods}}
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} })
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }){{/useSwaggerAnnotations}}
 {{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}});

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -11,7 +11,7 @@
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}}
 })
 }){{/useSwaggerAnnotations}}
 public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) {
 return Response.ok().entity("magic!").build();
 }

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isPathParam}}
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}}

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand All@@ -7,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
{{#description}}
/**
 * {{description}}
 **/{{/description}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 **/{{/description}}{{#useSwaggerAnnotations}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#vars}}{{#isEnum}}{{^isContainer}}

Expand All@@ -34,8 +36,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 return this;
 }

 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}{{#useSwaggerAnnotations}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}
 @JsonProperty("{{baseName}}")
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
 return {{name}};
Expand Down

2 changes: 2 additions & 0 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,12 +42,14 @@
 <version>2.0</version>
 <scope>provided</scope>
 </dependency>
 {{#useSwaggerAnnotations}}
 <dependency>
 <groupId>io.swagger</groupId>
 <artifactId>swagger-annotations</artifactId>
 <scope>provided</scope>
 <version>1.5.3</version>
 </dependency>
 {{/useSwaggerAnnotations}}
 <dependency>
 <groupId>junit</groupId>
 <artifactId>junit</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isQueryParam}}
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isQueryParam}}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
...s/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.model.Category;
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

2 changes: 2 additions & 0 deletions
...e/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...re/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...s/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...ver/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

1 change: 1 addition & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...etstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...er/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)#813

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

jmini
merged 14 commits into

from

Aug 15, 2018
 Merged


[JAXRS-spec] Add option useSwaggerAnnotations (for MicroProfile-OpenAPI)
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
aed302d

Use parameter "useSwaggerAnnotations" to disable swagger annotations …

Aug 13, 2018
82eba8d

Remove import for ApiModel at fromModel(..), postProcessModelProperty…

Aug 14, 2018
4ffccae

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
26902cf

Remove swagger annotations only if useSwaggerAnnotations is false

Aug 14, 2018
10cf7f7

Merge branch 'master' into filter_swagger_annotations

Aug 14, 2018
f8dae32

update Petstore sample so that CIs can verify the change

Aug 14, 2018
e45c53c

Prepare version 3.2.2-SNAPSHOT (#810)


jmini Aug 14, 2018
e9916c7

Merge branch 'master' into filter_swagger_annotations


michbeck100 Aug 14, 2018
c8c67e4

update Petstore sample so that CIs can verify the change

Aug 15, 2018
203a7c2

Merge remote-tracking branch 'origin/filter_swagger_annotations' into…

Aug 15, 2018
145fc68

Removed microprofile openapi dependency for now

Aug 15, 2018
daaa63d

update Petstore sample so that CIs can verify the change

Aug 15, 2018
efe7014

Just remove jackson imports if jackson is not used

Aug 15, 2018
8c33497

update Petstore sample so that CIs can verify the change

Aug 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


43 changes: 30 additions & 13 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@
package org.openapitools.codegen.languages;

import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.SupportingFile;

import java.io.File;
Expand All@@ -37,13 +37,17 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
 public static final String INTERFACE_ONLY = "interfaceOnly";
 public static final String RETURN_RESPONSE = "returnResponse";
 public static final String GENERATE_POM = "generatePom";
 public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
 public static final String JACKSON = "jackson";

 private boolean interfaceOnly = false;
 private boolean returnResponse = false;
 private boolean generatePom = true;

 private boolean useSwaggerAnnotations = true;
 private boolean useJackson = false;

 private String primaryResourceName;

 public JavaJAXRSSpecServerCodegen() {
 super();
 invokerPackage = "org.openapitools.api";
Expand DownExpand Up@@ -91,6 +95,7 @@ public JavaJAXRSSpecServerCodegen() {
 cliOptions.add(CliOption.newBoolean(GENERATE_POM, "Whether to generate pom.xml if the file does not already exist.").defaultValue(String.valueOf(generatePom)));
 cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
 cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
 cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
 }

 @Override
Expand All@@ -110,6 +115,13 @@ public void processOpts() {
 additionalProperties.remove(RETURN_RESPONSE);
 }
 }
 if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
 useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
 }
 writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);

 useJackson = convertPropertyToBoolean(JACKSON);

 if (interfaceOnly) {
 // Change default artifactId if genereating interfaces only, before command line options are applied in base class.
 artifactId = "openapi-jaxrs-client";
Expand DownExpand Up@@ -148,7 +160,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 if (pos > 0) {
 basePath = basePath.substring(0, pos);
 }

 String operationKey = basePath;
 if (StringUtils.isEmpty(basePath)) {
 basePath = tag;
Expand All@@ -174,14 +186,19 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
 }

 @Override
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);
 model.imports.remove("ApiModelProperty");
 model.imports.remove("ApiModel");
 model.imports.remove("JsonSerialize");
 model.imports.remove("ToStringSerializer");
 model.imports.remove("JsonValue");
 model.imports.remove("JsonProperty");
 public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
 CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
 if (!useSwaggerAnnotations) {
 codegenModel.imports.remove("ApiModelProperty");
 codegenModel.imports.remove("ApiModel");
 }
 if (!useJackson) {
 codegenModel.imports.remove("JsonSerialize");
 codegenModel.imports.remove("ToStringSerializer");
 codegenModel.imports.remove("JsonValue");
 codegenModel.imports.remove("JsonProperty");
 }
 return codegenModel;
 }

 @Override
Expand All@@ -194,7 +211,7 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
 public String getHelp() {
 return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
 }

 @Override
 public String toApiName(final String name) {
 String computed = name;
Expand Down

6 changes: 4 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,16 +6,18 @@ package {{package}};
import javax.ws.rs.*;
import javax.ws.rs.core.Response;

{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}

import java.io.InputStream;
import java.util.Map;
import java.util.List;
{{#useBeanValidation}}import javax.validation.constraints.*;
import javax.validation.Valid;{{/useBeanValidation}}

@Path("/{{{baseName}}}")
@Api(description = "the {{{baseName}}} API"){{#hasConsumes}}
@Path("/{{{baseName}}}"){{#useSwaggerAnnotations}}
@Api(description = "the {{{baseName}}} API"){{/useSwaggerAnnotations}}{{#hasConsumes}}
@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
{{>generatedAnnotation}}public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -10,5 +10,5 @@
 {{/hasMore}}{{/authMethods}}
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} })
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }){{/useSwaggerAnnotations}}
 {{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}});

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
 @{{httpMethod}}{{#subresourceOperation}}
 @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}{{#useSwaggerAnnotations}}
 @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
 {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
 {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
Expand All@@ -11,7 +11,7 @@
 }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
 @ApiResponses(value = { {{#responses}}
 @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}}
 })
 }){{/useSwaggerAnnotations}}
 public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) {
 return Response.ok().entity("magic!").build();
 }

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}
{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}}

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isPathParam}}
{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}}

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand All@@ -7,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
{{#description}}
/**
 * {{description}}
 **/{{/description}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 **/{{/description}}{{#useSwaggerAnnotations}}
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#vars}}{{#isEnum}}{{^isContainer}}

Expand All@@ -34,8 +36,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 return this;
 }

 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
 {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}{{#useSwaggerAnnotations}}
 @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}
 @JsonProperty("{{baseName}}")
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
 return {{name}};
Expand Down

2 changes: 2 additions & 0 deletions
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,12 +42,14 @@
 <version>2.0</version>
 <scope>provided</scope>
 </dependency>
 {{#useSwaggerAnnotations}}
 <dependency>
 <groupId>io.swagger</groupId>
 <artifactId>swagger-annotations</artifactId>
 <scope>provided</scope>
 <version>1.5.3</version>
 </dependency>
 {{/useSwaggerAnnotations}}
 <dependency>
 <groupId>junit</groupId>
 <artifactId>junit</artifactId>
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#description}} @ApiParam("{{description}}"){{/description}} {{{dataType}}} {{paramName}}{{/isQueryParam}}
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}} {{{dataType}}} {{paramName}}{{/isQueryParam}}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
...s/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.model.Category;
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;

/**
Expand Down

2 changes: 2 additions & 0 deletions
...e/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...re/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...s/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...ver/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

1 change: 1 addition & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.*;
Expand Down

2 changes: 2 additions & 0 deletions
...etstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
.../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down

2 changes: 2 additions & 0 deletions
...er/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand Down
Loading