diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java index 7c8cc543bcde..b59c458e4b04 100644 --- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java +++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java @@ -19,16 +19,12 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.core.TreeNode; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; import com.fasterxml.jackson.databind.deser.std.DelegatingDeserializer; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.util.TokenBuffer; import io.airlift.airline.Arguments; diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Meta.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Meta.java index 52043e2ce0c6..a0ec3e314d7f 100644 --- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Meta.java +++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Meta.java @@ -28,7 +28,6 @@ import io.airlift.airline.Option; import org.apache.commons.io.FileUtils; import org.openapitools.codegen.CodegenConfig; -import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.TemplateManager; import org.openapitools.codegen.api.TemplatePathLocator; @@ -40,7 +39,6 @@ import java.io.File; import java.io.IOException; -import java.io.Reader; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; diff --git a/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/AuthorTemplateTest.java b/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/AuthorTemplateTest.java index 4826464ad91b..a8a7f1b0ba2b 100644 --- a/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/AuthorTemplateTest.java +++ b/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/AuthorTemplateTest.java @@ -9,7 +9,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Arrays; public class AuthorTemplateTest { Path outputDirectory; diff --git a/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateBatchTest.java b/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateBatchTest.java index ce446523f1e5..9988ccf989da 100644 --- a/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateBatchTest.java +++ b/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateBatchTest.java @@ -6,7 +6,6 @@ import org.openapitools.codegen.config.GeneratorSettings; import org.openapitools.codegen.config.WorkflowSettings; import org.testng.ITestContext; -import org.testng.TestRunner; import org.testng.annotations.BeforeTest; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java b/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java index 5b0130067398..3c459b04075c 100644 --- a/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java +++ b/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java @@ -24,7 +24,6 @@ import org.openapitools.codegen.Generator; import org.openapitools.codegen.SpecValidationException; import org.openapitools.codegen.config.CodegenConfigurator; -import org.testng.TestException; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/meta/features/DocumentationFeature.java b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/meta/features/DocumentationFeature.java index dda611e4740d..e5479d51ed60 100644 --- a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/meta/features/DocumentationFeature.java +++ b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/meta/features/DocumentationFeature.java @@ -38,5 +38,5 @@ public enum DocumentationFeature { * Generated output includes documentation for all generated APIs. */ @ToolingExtension - Api; + Api } diff --git a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java index 372b9aeb47e9..2db32f005177 100644 --- a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java +++ b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java @@ -51,6 +51,7 @@ import com.google.common.io.CharSource; import io.swagger.v3.parser.core.models.ParseOptions; import io.swagger.v3.parser.util.ClasspathHelper; +import lombok.Setter; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; @@ -96,6 +97,7 @@ public class CodeGenMojo extends AbstractMojo { * The build context is only avail when running from within eclipse. * It is used to update the eclipse-m2e-layer when the plugin is executed inside the IDE. */ + @Setter @Component private BuildContext buildContext = new DefaultBuildContext(); @@ -556,10 +558,6 @@ public class CodeGenMojo extends AbstractMojo { @Parameter(readonly = true, required = true, defaultValue = "${project}") private MavenProject project; - public void setBuildContext(BuildContext buildContext) { - this.buildContext = buildContext; - } - @Override public void execute() throws MojoExecutionException { if (StringUtils.isBlank(inputSpec) && StringUtils.isBlank(inputSpecRootDirectory)) { diff --git a/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java b/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java index d39da0d8a622..e87a391436d4 100644 --- a/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java +++ b/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java @@ -39,10 +39,8 @@ import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.impl.DefaultServiceLocator; import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.RepositorySystem; public class CodeGenMojoTest extends BaseTestCase { @Override diff --git a/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ApiResponse.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ApiResponse.java index b1a1938200b5..3362e09d3465 100644 --- a/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ApiResponse.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ApiResponse.java @@ -17,8 +17,12 @@ package org.openapitools.codegen.online.model; +import lombok.Getter; +import lombok.Setter; + import javax.xml.bind.annotation.XmlTransient; +@Setter @javax.xml.bind.annotation.XmlRootElement public class ApiResponse { public static final int ERROR = 1; @@ -28,8 +32,8 @@ public class ApiResponse { public static final int TOO_BUSY = 5; int code; - String type; - String message; + @Getter String type; + @Getter String message; public ApiResponse() {} @@ -62,24 +66,4 @@ public ApiResponse(int code, String message) { public int getCode() { return code; } - - public void setCode(int code) { - this.code = code; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } } diff --git a/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/Generated.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/Generated.java index 832e178caf9f..709ec3b8b1de 100644 --- a/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/Generated.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/Generated.java @@ -17,23 +17,11 @@ package org.openapitools.codegen.online.model; +import lombok.Getter; +import lombok.Setter; + +@Getter @Setter public class Generated { private String filename; private String friendlyName; - - public String getFilename() { - return filename; - } - - public void setFilename(String filename) { - this.filename = filename; - } - - public String getFriendlyName() { - return friendlyName; - } - - public void setFriendlyName(String friendlyName) { - this.friendlyName = friendlyName; - } } diff --git a/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/GeneratorInput.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/GeneratorInput.java index 15c71a60c2c8..0844839e9e5c 100644 --- a/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/GeneratorInput.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/GeneratorInput.java @@ -20,45 +20,20 @@ import com.fasterxml.jackson.databind.JsonNode; import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.parser.core.models.AuthorizationValue; +import lombok.Getter; +import lombok.Setter; import java.util.Map; +@Setter public class GeneratorInput { - private JsonNode spec; - private Map options; + @Getter private JsonNode spec; + @Getter private Map options; private String openAPIUrl; - private AuthorizationValue authorizationValue; - - public AuthorizationValue getAuthorizationValue() { - return authorizationValue; - } - - public void setAuthorizationValue(AuthorizationValue authorizationValue) { - this.authorizationValue = authorizationValue; - } - - public JsonNode getSpec() { - return spec; - } - - public void setSpec(JsonNode spec) { - this.spec = spec; - } - - public Map getOptions() { - return options; - } - - public void setOptions(Map options) { - this.options = options; - } + @Getter private AuthorizationValue authorizationValue; @ApiModelProperty(example = "https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml") public String getOpenAPIUrl() { return openAPIUrl; } - - public void setOpenAPIUrl(String url) { - this.openAPIUrl = url; - } } diff --git a/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ResponseCode.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ResponseCode.java index a8af9ab76ff4..85529434ab8b 100644 --- a/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ResponseCode.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ResponseCode.java @@ -18,36 +18,25 @@ package org.openapitools.codegen.online.model; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Setter; +@Setter @NoArgsConstructor @AllArgsConstructor public class ResponseCode { private String code; private String link; - public ResponseCode() {} - - public ResponseCode(String code, String link) { - setCode(code); - setLink(link); - } - @ApiModelProperty(value = "File download code", example = "d40029be-eda6-4d62-b1ef-d05e2e91a72a") public String getCode() { return code; } - public void setCode(String code) { - this.code = code; - } - @ApiModelProperty( value = "URL for fetching the generated client", example = "http://localhost:8080/api/gen/download/d40029be-eda6-4d62-b1ef-d05e2e91a72a") public String getLink() { return link; } - - public void setLink(String link) { - this.link = link; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CliOption.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CliOption.java index 7226c7dd9312..f4a04b8fd320 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CliOption.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CliOption.java @@ -19,17 +19,21 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Getter; +import lombok.Setter; import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; public class CliOption { - private final String opt; + @Getter private final String opt; + @Getter @Setter private String description; + @Getter @Setter private String type; private String defaultValue; - private String optValue; + @Getter private String optValue; private Map enumValues; public CliOption(String opt, String description) { @@ -42,26 +46,6 @@ public CliOption(String opt, String description, String type) { this.type = type; } - public String getOpt() { - return opt; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - public String getDefault() { return defaultValue; } @@ -75,10 +59,6 @@ public CliOption defaultValue(String defaultValue) { return this; } - public String getOptValue() { - return this.optValue; - } - public void setOptValue(String optValue) { if (this.enumValues!=null && this.enumValues.containsKey(optValue)) { this.optValue = optValue; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ClientOptInput.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ClientOptInput.java index cf5960cf6334..519a390a0d5f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ClientOptInput.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ClientOptInput.java @@ -20,6 +20,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.parser.core.models.AuthorizationValue; +import lombok.Getter; import org.openapitools.codegen.api.TemplateDefinition; import org.openapitools.codegen.auth.AuthParser; import org.openapitools.codegen.config.GeneratorSettings; @@ -31,7 +32,8 @@ public class ClientOptInput { private GeneratorSettings generatorSettings; private OpenAPI openAPI; private List auths; - private List userDefinedTemplates; + // not deprecated as this is added to match other functionality, we need to move to Context instead of ClientOptInput. + @Getter private List userDefinedTemplates; public ClientOptInput openAPI(OpenAPI openAPI) { this.setOpenAPI(openAPI); @@ -79,11 +81,6 @@ public CodegenConfig getConfig() { return config; } - public List getUserDefinedTemplates() { - // not deprecated as this is added to match other functionality, we need to move to Context instead of ClientOptInput. - return userDefinedTemplates; - } - /** * Sets the generator/config instance * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenComposedSchemas.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenComposedSchemas.java index e2fe81870048..08e261c165e0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenComposedSchemas.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenComposedSchemas.java @@ -16,8 +16,12 @@ package org.openapitools.codegen; +import lombok.Getter; +import lombok.Setter; + import java.util.*; +@Getter @Setter public class CodegenComposedSchemas { private List allOf; private List oneOf; @@ -31,38 +35,6 @@ public CodegenComposedSchemas(List allOf, List this.not = not; } - public List getAllOf() { - return allOf; - } - - public List getOneOf() { - return oneOf; - } - - public List getAnyOf() { - return anyOf; - } - - public CodegenProperty getNot() { - return not; - } - - public void setAllOf(List allOf) { - this.allOf = allOf; - } - - public void setOneOf(List oneOf) { - this.oneOf = oneOf; - } - - public void setAnyOf(List anyOf) { - this.anyOf = anyOf; - } - - public void setNot(CodegenProperty not) { - this.not = not; - } - public String toString() { final StringBuilder sb = new StringBuilder("CodegenComposedSchemas{"); sb.append("oneOf=").append(oneOf); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenDiscriminator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenDiscriminator.java index cabdf4d911de..fdc41c984fab 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenDiscriminator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenDiscriminator.java @@ -1,5 +1,8 @@ package org.openapitools.codegen; +import lombok.Getter; +import lombok.Setter; + import java.util.*; /** @@ -14,10 +17,15 @@ public class CodegenDiscriminator { // The name of the property in the payload that will hold the discriminator value. // This is the propertyName as specified in the OpenAPI discriminator object. + @Getter @Setter private String propertyName; + @Getter @Setter private String propertyBaseName; + @Getter @Setter private String propertyGetter; + @Getter @Setter private String propertyType; + @Getter @Setter private Map mapping; private boolean isEnum; @@ -36,58 +44,12 @@ public class CodegenDiscriminator { // // see the method createDiscriminator in DefaultCodegen.java + @Getter @Setter private Set mappedModels = new TreeSet<>(); + @Getter @Setter private Map vendorExtensions = new HashMap<>(); - public String getPropertyName() { - return propertyName; - } - - public void setPropertyName(String propertyName) { - this.propertyName = propertyName; - } - - public String getPropertyGetter() { - return propertyGetter; - } - - public void setPropertyGetter(String propertyGetter) { - this.propertyGetter = propertyGetter; - } - - public String getPropertyBaseName() { - return propertyBaseName; - } - - public void setPropertyBaseName(String propertyBaseName) { - this.propertyBaseName = propertyBaseName; - } - - public String getPropertyType() { - return propertyType; - } - - public void setPropertyType(String propertyType) { - this.propertyType = propertyType; - } - - public Map getMapping() { - return mapping; - } - - public void setMapping(Map mapping) { - this.mapping = mapping; - } - - public Set getMappedModels() { - return mappedModels; - } - - public void setMappedModels(Set mappedModels) { - this.mappedModels = mappedModels; - } - public boolean getIsEnum() { return isEnum; } @@ -95,15 +57,7 @@ public boolean getIsEnum() { public void setIsEnum(boolean isEnum) { this.isEnum = isEnum; } - - public Map getVendorExtensions() { - return vendorExtensions; - } - - public void setVendorExtensions(Map vendorExtensions) { - this.vendorExtensions = vendorExtensions; - } - + /** * An object to hold discriminator mappings between payload values and schema names or * references. @@ -116,11 +70,14 @@ public void setVendorExtensions(Map vendorExtensions) { */ public static class MappedModel implements Comparable{ // The value of the discriminator property in the payload. + @Getter @Setter private String mappingName; // The OAS schema name. It is obtained from the OAS document, and the string value // is converted to a sanitized, internal representation within codegen. + @Getter @Setter private String modelName; + @Getter @Setter private CodegenModel model; private final boolean explicitMapping; @@ -154,26 +111,6 @@ public int compareTo(MappedModel other) { } } - public String getMappingName() { - return mappingName; - } - - public void setMappingName(String mappingName) { - this.mappingName = mappingName; - } - - public String getModelName() { - return modelName; - } - - public void setModelName(String modelName) { - this.modelName = modelName; - } - - public CodegenModel getModel() { return model; } - - public void setModel(CodegenModel model) { this.model = model; } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenEncoding.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenEncoding.java index d53ee21cc575..c110c5d3ebea 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenEncoding.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenEncoding.java @@ -1,17 +1,19 @@ package org.openapitools.codegen; +import lombok.Getter; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; public class CodegenEncoding { - private String contentType; - private List headers; - private String style; + @Getter private String contentType; + @Getter private List headers; + @Getter private String style; private boolean explode; private boolean allowReserved; - public Map vendorExtensions = new HashMap<>(); + @Getter public Map vendorExtensions = new HashMap<>(); public CodegenEncoding(String contentType, List headers, String style, boolean explode, boolean allowReserved) { this.contentType = contentType; @@ -21,18 +23,6 @@ public CodegenEncoding(String contentType, List headers, Strin this.allowReserved = allowReserved; } - public String getContentType() { - return contentType; - } - - public List getHeaders() { - return headers; - } - - public String getStyle() { - return style; - } - public boolean getExplode() { return explode; } @@ -41,10 +31,6 @@ public boolean getAllowReserved() { return allowReserved; } - public Map getVendorExtensions() { - return vendorExtensions; - } - public String toString() { final StringBuilder sb = new StringBuilder("CodegenEncoding{"); sb.append("contentType=").append(contentType); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenMediaType.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenMediaType.java index e314daf14b4e..55222dc2ceb0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenMediaType.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenMediaType.java @@ -1,13 +1,14 @@ package org.openapitools.codegen; import io.swagger.v3.oas.models.examples.Example; +import lombok.Getter; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; -public class CodegenMediaType { +@Getter public class CodegenMediaType { private CodegenProperty schema; private LinkedHashMap encoding; private HashMap testCases = new HashMap<>(); @@ -33,28 +34,6 @@ public CodegenMediaType(CodegenProperty schema, LinkedHashMap getEncoding() { - return encoding; - } - - public HashMap getTestCases() { return testCases; } - - public Map getExamples() { - return examples; - } - - public Object getExample() { - return example; - } - - public Map getVendorExtensions() { - return vendorExtensions; - } - public String toString() { final StringBuilder sb = new StringBuilder("CodegenMediaType{"); sb.append("schema=").append(schema); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java index 4ea750a84644..41a3a176ab2a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java @@ -22,6 +22,8 @@ import java.util.*; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; /** @@ -35,15 +37,21 @@ public class CodegenModel implements IJsonSchemaValidationProperties { // object is a discriminator, that object is set as the parent. If no discriminator is specified, // codegen returns the first one in the list, i.e. there is no obvious parent in the OpenAPI specification. // When possible, the mustache templates should use 'allParents' to handle multiple parents. + @Getter @Setter public String parent, parentSchema; + @Getter @Setter public List interfaces; // The list of parent model name from the schemas. In order of preference, the parent is obtained // from the 'allOf' attribute, then 'anyOf', and finally 'oneOf'. + @Getter @Setter public List allParents; // References to parent and interface CodegenModels. Only set when code generator supports inheritance. + @Getter @Setter public CodegenModel parentModel; + @Getter @Setter public List interfaceModels; + @Getter @Setter public List children; // anyOf, oneOf, allOf @@ -53,42 +61,101 @@ public class CodegenModel implements IJsonSchemaValidationProperties { // The schema name as written in the OpenAPI document // If it's a reserved word, it will be escaped. + @Getter @Setter public String name; // The original schema name as written in the OpenAPI document. + @Getter @Setter public String schemaName; // The language-specific name of the class that implements this schema. // The name of the class is derived from the OpenAPI schema name with formatting rules applied. // The classname is derived from the OpenAPI schema name, with sanitization and escaping rules applied. + @Getter @Setter public String classname; // The value of the 'title' attribute in the OpenAPI document. + @Getter @Setter public String title; + @Getter @Setter public String description, classVarName, modelJson, dataType, xmlPrefix, xmlNamespace, xmlName; + @Getter @Setter public String classFilename; // store the class file name, mainly used for import + @Getter @Setter public String unescapedDescription; - public CodegenDiscriminator discriminator; + /** + * -- GETTER -- + * Returns the discriminator for this schema object, or null if no discriminator has been specified. + * The list of all possible schema discriminator mapping values is obtained + * from explicit discriminator mapping values in the OpenAPI document, and from + * inherited discriminators through oneOf, allOf, anyOf. + * For example, a discriminator may be defined in a 'Pet' schema as shown below. + * The Dog and Cat schemas inherit the discriminator through the allOf reference. + * In the 'Pet' schema, the supported discriminator mapping values for the + * 'objectType' properties are 'Dog' and 'Cat'. + * The allowed discriminator mapping value for the Dog schema is 'Dog'. + * The allowed discriminator mapping value for the Cat schema is 'Dog'. + * Pet: + * type: object + * discriminator: + * propertyName: objectType + * required: + * - objectType + * properties: + * objectType: + * type: string + * Dog: + * allOf: + * - $ref: '#/components/schemas/Pet' + * - type: object + * properties: + * p1: + * type: string + * Cat: + * allOf: + * - $ref: '#/components/schemas/Pet' + * - type: object + * properties: + * p2: + * type: string + * + * @return the discriminator. + */ + @Getter public CodegenDiscriminator discriminator; + @Getter @Setter public String defaultValue; + @Getter @Setter public String arrayModelType; public boolean isAlias; // Is this effectively an alias of another simple type public boolean isString, isInteger, isLong, isNumber, isNumeric, isFloat, isDouble, isDate, isDateTime, isDecimal, isShort, isUnboundedInteger, isPrimitiveType, isBoolean, isFreeFormObject; private boolean additionalPropertiesIsAnyType; public List vars = new ArrayList<>(); // all properties (without parent's properties) + @Getter @Setter public List allVars = new ArrayList<>(); // all properties (with parent's properties) public List requiredVars = new ArrayList<>(); // a list of required properties + @Getter @Setter public List optionalVars = new ArrayList<>(); // a list of optional properties + @Getter @Setter public List readOnlyVars = new ArrayList<>(); // a list of read-only properties + @Getter @Setter public List readWriteVars = new ArrayList<>(); // a list of properties for read, write + @Getter @Setter public List parentVars = new ArrayList<>(); public List parentRequiredVars = new ArrayList<>(); + @Getter @Setter public List nonNullableVars = new ArrayList<>(); // a list of non-nullable properties + @Getter @Setter public Map allowableValues; // Sorted sets of required parameters. + @Getter @Setter public Set mandatory = new TreeSet<>(); // without parent's required properties + @Getter @Setter public Set allMandatory = new TreeSet<>(); // with parent's required properties + @Getter @Setter public Set imports = new TreeSet<>(); - public boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, hasValidation; + @Getter @Setter + public boolean emptyVars; + public boolean hasVars, hasMoreModels, hasEnums, isEnum, hasValidation; /** * Indicates the OAS schema specifies "nullable: true". */ @@ -120,8 +187,10 @@ public class CodegenModel implements IJsonSchemaValidationProperties { * Indicates the all properties of the type are read-only. */ public boolean hasOnlyReadOnly = true; + @Getter @Setter public ExternalDocumentation externalDocumentation; + @Getter @Setter public Map vendorExtensions = new HashMap<>(); private CodegenComposedSchemas composedSchemas; private boolean hasMultipleTypes = false; @@ -158,6 +227,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { * type: integer * */ + @Getter @Setter public String additionalPropertiesType; /** @@ -193,14 +263,6 @@ public class CodegenModel implements IJsonSchemaValidationProperties { private Map requiredVarsMap; private String ref; - public String getAdditionalPropertiesType() { - return additionalPropertiesType; - } - - public void setAdditionalPropertiesType(String additionalPropertiesType) { - this.additionalPropertiesType = additionalPropertiesType; - } - @Override public CodegenProperty getContains() { return contains; @@ -271,78 +333,6 @@ public void setSchemaIsFromAdditionalProperties(boolean schemaIsFromAdditionalPr this.schemaIsFromAdditionalProperties = schemaIsFromAdditionalProperties; } - public Set getAllMandatory() { - return allMandatory; - } - - public void setAllMandatory(Set allMandatory) { - this.allMandatory = allMandatory; - } - - public List getAllParents() { - return allParents; - } - - public void setAllParents(List allParents) { - this.allParents = allParents; - } - - public List getAllVars() { - return allVars; - } - - public void setAllVars(List allVars) { - this.allVars = allVars; - } - - public List getNonNullableVars() { - return nonNullableVars; - } - - public void setNonNullableVars(List nonNullableVars) { - this.nonNullableVars = nonNullableVars; - } - - public Map getAllowableValues() { - return allowableValues; - } - - public void setAllowableValues(Map allowableValues) { - this.allowableValues = allowableValues; - } - - public String getArrayModelType() { - return arrayModelType; - } - - public void setArrayModelType(String arrayModelType) { - this.arrayModelType = arrayModelType; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } - - public String getClassFilename() { - return classFilename; - } - - public void setClassFilename(String classFilename) { - this.classFilename = classFilename; - } - - public String getClassVarName() { - return classVarName; - } - - public void setClassVarName(String classVarName) { - this.classVarName = classVarName; - } - /** * Return true if the classname property is sanitized, false if it is the same as the OpenAPI schema name. * The OpenAPI schema name may be any valid JSON schema name, including non-ASCII characters. @@ -354,81 +344,6 @@ public boolean getIsClassnameSanitized() { return !StringUtils.equals(classname, name); } - public String getClassname() { - return classname; - } - - public void setClassname(String classname) { - this.classname = classname; - } - - public String getDataType() { - return dataType; - } - - public void setDataType(String dataType) { - this.dataType = dataType; - } - - public String getDefaultValue() { - return defaultValue; - } - - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - /** - * Returns the discriminator for this schema object, or null if no discriminator has been specified. - * - * The list of all possible schema discriminator mapping values is obtained - * from explicit discriminator mapping values in the OpenAPI document, and from - * inherited discriminators through oneOf, allOf, anyOf. - * For example, a discriminator may be defined in a 'Pet' schema as shown below. - * The Dog and Cat schemas inherit the discriminator through the allOf reference. - * In the 'Pet' schema, the supported discriminator mapping values for the - * 'objectType' properties are 'Dog' and 'Cat'. - * The allowed discriminator mapping value for the Dog schema is 'Dog'. - * The allowed discriminator mapping value for the Cat schema is 'Dog'. - * - * Pet: - * type: object - * discriminator: - * propertyName: objectType - * required: - * - objectType - * properties: - * objectType: - * type: string - * Dog: - * allOf: - * - $ref: '#/components/schemas/Pet' - * - type: object - * properties: - * p1: - * type: string - * Cat: - * allOf: - * - $ref: '#/components/schemas/Pet' - * - type: object - * properties: - * p2: - * type: string - * - * @return the discriminator. - */ - public CodegenDiscriminator getDiscriminator() { - return discriminator; - } - public void setDiscriminator(CodegenDiscriminator discriminator) { this.discriminator = discriminator; if (discriminator != null && !discriminator.getMappedModels().isEmpty()) { @@ -448,110 +363,6 @@ public String getDiscriminatorName() { return discriminator == null ? null : discriminator.getPropertyName(); } - public ExternalDocumentation getExternalDocumentation() { - return externalDocumentation; - } - - public void setExternalDocumentation(ExternalDocumentation externalDocumentation) { - this.externalDocumentation = externalDocumentation; - } - - public Set getImports() { - return imports; - } - - public void setImports(Set imports) { - this.imports = imports; - } - - public List getInterfaceModels() { - return interfaceModels; - } - - public void setInterfaceModels(List interfaceModels) { - this.interfaceModels = interfaceModels; - } - - public List getInterfaces() { - return interfaces; - } - - public void setInterfaces(List interfaces) { - this.interfaces = interfaces; - } - - public Set getMandatory() { - return mandatory; - } - - public void setMandatory(Set mandatory) { - this.mandatory = mandatory; - } - - public String getModelJson() { - return modelJson; - } - - public void setModelJson(String modelJson) { - this.modelJson = modelJson; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getSchemaName() { - return schemaName; - } - - public void setSchemaName(String schemaName) { - this.schemaName = schemaName; - } - - - public List getOptionalVars() { - return optionalVars; - } - - public void setOptionalVars(List optionalVars) { - this.optionalVars = optionalVars; - } - - public String getParent() { - return parent; - } - - public void setParent(String parent) { - this.parent = parent; - } - - public CodegenModel getParentModel() { - return parentModel; - } - - public void setParentModel(CodegenModel parentModel) { - this.parentModel = parentModel; - } - - public String getParentSchema() { - return parentSchema; - } - - public void setParentSchema(String parentSchema) { - this.parentSchema = parentSchema; - } - - public List getParentVars() { - return parentVars; - } - - public void setParentVars(List parentVars) { - this.parentVars = parentVars; - } @Override public String getPattern() { @@ -823,22 +634,6 @@ public void setHasValidation(boolean hasValidation) { this.hasValidation = hasValidation; } - public List getReadOnlyVars() { - return readOnlyVars; - } - - public void setReadOnlyVars(List readOnlyVars) { - this.readOnlyVars = readOnlyVars; - } - - public List getReadWriteVars() { - return readWriteVars; - } - - public void setReadWriteVars(List readWriteVars) { - this.readWriteVars = readWriteVars; - } - @Override public List getRequiredVars() { return requiredVars; @@ -849,22 +644,6 @@ public void setRequiredVars(List requiredVars) { this.requiredVars = requiredVars; } - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getUnescapedDescription() { - return unescapedDescription; - } - - public void setUnescapedDescription(String unescapedDescription) { - this.unescapedDescription = unescapedDescription; - } - @Override public List getVars() { return vars; @@ -875,38 +654,6 @@ public void setVars(List vars) { this.vars = vars; } - public Map getVendorExtensions() { - return vendorExtensions; - } - - public void setVendorExtensions(Map vendorExtensions) { - this.vendorExtensions = vendorExtensions; - } - - public String getXmlName() { - return xmlName; - } - - public void setXmlName(String xmlName) { - this.xmlName = xmlName; - } - - public String getXmlNamespace() { - return xmlNamespace; - } - - public void setXmlNamespace(String xmlNamespace) { - this.xmlNamespace = xmlNamespace; - } - - public String getXmlPrefix() { - return xmlPrefix; - } - - public void setXmlPrefix(String xmlPrefix) { - this.xmlPrefix = xmlPrefix; - } - @Override public boolean getIsNull() { return isNull; @@ -1007,8 +754,10 @@ public void setIsFreeFormObject(boolean isFreeFormObject) { this.isFreeFormObject = isFreeFormObject; } + @Override public boolean getIsUuid() { return isUuid; } + @Override public void setIsUuid(boolean isUuid) { this.isUuid = isUuid; } public boolean getIsUri() { return isUri; } @@ -1382,14 +1131,6 @@ public void addDiscriminatorMappedModelsImports(boolean cleanUpMappedModels) { } } - public boolean isEmptyVars() { - return emptyVars; - } - - public void setEmptyVars(boolean emptyVars) { - this.emptyVars = emptyVars; - } - public boolean getHasItems() { return this.items != null; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModelType.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModelType.java index 6d85bcf2c2e0..6627b81a22c9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModelType.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModelType.java @@ -17,7 +17,9 @@ package org.openapitools.codegen; -public enum CodegenModelType { +import lombok.Getter; + +@Getter public enum CodegenModelType { MODEL(CodegenModel.class), OPERATION(CodegenOperation.class), @@ -32,7 +34,4 @@ private CodegenModelType(Class defaultImplementation) { this.defaultImplementation = defaultImplementation; } - public Class getDefaultImplementation() { - return defaultImplementation; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java index fc3457b5a205..0497bf49c55b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java @@ -25,6 +25,8 @@ import java.util.Objects; import io.swagger.v3.oas.models.examples.Example; +import lombok.Getter; +import lombok.Setter; /** * Describes a single operation parameter in the OAS specification. @@ -67,6 +69,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { public String containerType; public String containerTypeMapped; // language-specified container type (e.g. `dict` in python for map) + @Getter @Setter private CodegenProperty schema; private boolean additionalPropertiesIsAnyType; private boolean hasVars; @@ -130,6 +133,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { private boolean hasDiscriminatorWithNonEmptyMapping; private CodegenComposedSchemas composedSchemas; private boolean hasMultipleTypes = false; + @Getter @Setter private LinkedHashMap content; private Map requiredVarsMap; private String ref; @@ -923,8 +927,6 @@ public boolean getHasDiscriminatorWithNonEmptyMapping() { return hasDiscriminatorWithNonEmptyMapping; } - ; - @Override public void setHasDiscriminatorWithNonEmptyMapping(boolean hasDiscriminatorWithNonEmptyMapping) { this.hasDiscriminatorWithNonEmptyMapping = hasDiscriminatorWithNonEmptyMapping; @@ -990,22 +992,6 @@ public void setHasMultipleTypes(boolean hasMultipleTypes) { this.hasMultipleTypes = hasMultipleTypes; } - public CodegenProperty getSchema() { - return schema; - } - - public void setSchema(CodegenProperty schema) { - this.schema = schema; - } - - public LinkedHashMap getContent() { - return content; - } - - public void setContent(LinkedHashMap content) { - this.content = content; - } - @Override public String getBaseType() { return baseType; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java index 5c76182226a4..babaaa1727df 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java @@ -17,6 +17,9 @@ package org.openapitools.codegen; +import lombok.Getter; +import lombok.Setter; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -29,42 +32,58 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti * The value of the 'type' attribute in the OpenAPI schema. * The per-language codegen logic may change to a language-specific type. */ + @Getter public String openApiType; + @Getter @Setter public String baseName; - public String complexType; + @Setter public String complexType; + @Getter @Setter public String getter; + @Getter @Setter public String setter; /** * The value of the 'description' attribute in the OpenAPI schema. */ + @Getter @Setter public String description; /** * The language-specific data type for this property. For example, the OpenAPI type 'integer' * may be represented as 'int', 'int32', 'Integer', etc, depending on the programming language. */ public String dataType; + @Getter @Setter public String datatypeWithEnum; + @Getter @Setter public String dataFormat; /** * The name of this property in the OpenAPI schema. */ + @Getter @Setter public String name; + @Getter @Setter public String min; // TODO: is this really used? + @Getter @Setter public String max; // TODO: is this really used? + @Getter @Setter public String defaultValue; + @Getter @Setter public String defaultValueWithParam; - public String baseType; + @Setter public String baseType; + @Getter @Setter public String containerType; + @Getter @Setter public String containerTypeMapped; // language-specified container type (e.g. `dict` in python for map) /** * The value of the 'title' attribute in the OpenAPI schema. */ + @Getter @Setter public String title; /** * The 'description' string without escape characters needed by some programming languages/targets */ + @Getter @Setter public String unescapedDescription; /** @@ -82,8 +101,10 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti /** * A free-form property to include an example of an instance for this schema. */ + @Getter @Setter public String example; + @Getter @Setter public String jsonSchema; /** * The value of the 'minimum' attribute in the OpenAPI schema. @@ -110,7 +131,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti * The value of "exclusiveMaximum" MUST be number, representing an exclusive upper limit for a numeric instance. */ public boolean exclusiveMaximum; - public boolean required; + @Setter public boolean required; public boolean deprecated; public boolean hasMoreNonReadOnly; // for model constructor, true if next property is not readonly public boolean isPrimitiveType; @@ -170,7 +191,9 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti public boolean isDiscriminator; public boolean isNew; // true when this property overrides an inherited property public Boolean isOverridden; // true if the property is a parent property (not defined in child/current schema) + @Getter @Setter public List _enum; + @Getter @Setter public Map allowableValues; // If 'additionalProperties' is not set, items is null. // If 'additionalProperties' is set to a type or refers to a type, 'items' provides the type information for @@ -180,16 +203,22 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti public List vars = new ArrayList(); // all properties (without parent's properties) public List requiredVars = new ArrayList<>(); public CodegenProperty mostInnerItems; + @Getter @Setter public Map vendorExtensions = new HashMap(); public boolean hasValidation; // true if pattern, maximum, etc are set (only used in the mustache template) public boolean isInherited; public String discriminatorValue; + @Getter @Setter public String nameInLowerCase; // property name in lower case + @Getter @Setter public String nameInCamelCase; // property name in camel case (e.g. modifiedDate) + @Getter @Setter public String nameInPascalCase; // property name in pascal case (e.g. ModifiedDate) + @Getter public String nameInSnakeCase; // property name in upper snake case // enum name based on the property name, usually use as a prefix (e.g. VAR_NAME) for enum name (e.g. VAR_NAME_VALUE1) + @Getter @Setter public String enumName; public Integer maxItems; public Integer minItems; @@ -201,8 +230,11 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti // XML public boolean isXmlAttribute = false; + @Getter @Setter public String xmlPrefix; + @Getter @Setter public String xmlName; + @Getter @Setter public String xmlNamespace; public boolean isXmlWrapped = false; private boolean additionalPropertiesIsAnyType; @@ -270,48 +302,11 @@ public void setIsBooleanSchemaFalse(boolean isBooleanSchemaFalse) { this.isBooleanSchemaFalse = isBooleanSchemaFalse; } - public String getOpenApiType() { return openApiType; } - - public String getBaseName() { - return baseName; - } - - public void setBaseName(String baseName) { - this.baseName = baseName; - } - + @Override public String getComplexType() { return complexType; } - public void setComplexType(String complexType) { - this.complexType = complexType; - } - - public String getGetter() { - return getter; - } - - public void setGetter(String getter) { - this.getter = getter; - } - - public String getSetter() { - return setter; - } - - public void setSetter(String setter) { - this.setter = setter; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - /** * @return dataType * @deprecated since version 3.0.0, use {@link #getDataType()} instead.
@@ -322,119 +317,29 @@ public String getDatatype() { return getDataType(); } + @Override public String getDataType() { return dataType; } /** - * @deprecated use {@link #setDataType()} instead. + * @deprecated use {@link #setDataType(String)} instead. */ @Deprecated public void setDatatype(String datatype) { this.dataType = datatype; } + @Override public void setDataType(String dataType) { this.dataType = dataType; } - public String getDatatypeWithEnum() { - return datatypeWithEnum; - } - - public void setDatatypeWithEnum(String datatypeWithEnum) { - this.datatypeWithEnum = datatypeWithEnum; - } - - public String getDataFormat() { - return dataFormat; - } - - public void setDataFormat(String dataFormat) { - this.dataFormat = dataFormat; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getMin() { - return min; - } - - public void setMin(String min) { - this.min = min; - } - - public String getMax() { - return max; - } - - public void setMax(String max) { - this.max = max; - } - - public String getDefaultValue() { - return defaultValue; - } - - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - public String getDefaultValueWithParam() { - return defaultValueWithParam; - } - - public void setDefaultValueWithParam(String defaultValueWithParam) { - this.defaultValueWithParam = defaultValueWithParam; - } - + @Override public String getBaseType() { return baseType; } - public void setBaseType(String baseType) { - this.baseType = baseType; - } - - public String getContainerType() { - return containerType; - } - - public void setContainerType(String containerType) { - this.containerType = containerType; - } - - public String getContainerTypeMapped() { - return containerTypeMapped; - } - - public void setContainerTypeMapped(String containerTypeMapped) { - this.containerTypeMapped = containerTypeMapped; - } - - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getUnescapedDescription() { - return unescapedDescription; - } - - public void setUnescapedDescription(String unescapedDescription) { - this.unescapedDescription = unescapedDescription; - } - @Override public boolean getSchemaIsFromAdditionalProperties() { return schemaIsFromAdditionalProperties; @@ -475,22 +380,6 @@ public void setPattern(String pattern) { this.pattern = pattern; } - public String getExample() { - return example; - } - - public void setExample(String example) { - this.example = example; - } - - public String getJsonSchema() { - return jsonSchema; - } - - public void setJsonSchema(String jsonSchema) { - this.jsonSchema = jsonSchema; - } - @Override public String getMinimum() { return minimum; @@ -547,26 +436,6 @@ public boolean notRequiredOrIsNullable() { return !getRequired() || isNullable; } - public void setRequired(boolean required) { - this.required = required; - } - - public List get_enum() { - return _enum; - } - - public void set_enum(List _enum) { - this._enum = _enum; - } - - public Map getAllowableValues() { - return allowableValues; - } - - public void setAllowableValues(Map allowableValues) { - this.allowableValues = allowableValues; - } - @Override public CodegenProperty getItems() { return items; @@ -687,50 +556,6 @@ public void setIsPrimitiveType(boolean isPrimitiveType) { this.isPrimitiveType = isPrimitiveType; } - public Map getVendorExtensions() { - return vendorExtensions; - } - - public void setVendorExtensions(Map vendorExtensions) { - this.vendorExtensions = vendorExtensions; - } - - public String getNameInLowerCase() { - return nameInLowerCase; - } - - public void setNameInLowerCase(String nameInLowerCase) { - this.nameInLowerCase = nameInLowerCase; - } - - public String getNameInCamelCase() { - return nameInCamelCase; - } - - public void setNameInCamelCase(String nameInCamelCase) { - this.nameInCamelCase = nameInCamelCase; - } - - public String getNameInPascalCase() { - return nameInPascalCase; - } - - public void setNameInPascalCase(String nameInPascalCase) { - this.nameInPascalCase = nameInPascalCase; - } - - public String getNameInSnakeCase() { - return nameInSnakeCase; - } - - public String getEnumName() { - return enumName; - } - - public void setEnumName(String enumName) { - this.enumName = enumName; - } - @Override public Integer getMaxItems() { return maxItems; @@ -751,30 +576,6 @@ public void setMinItems(Integer minItems) { this.minItems = minItems; } - public String getXmlPrefix() { - return xmlPrefix; - } - - public void setXmlPrefix(String xmlPrefix) { - this.xmlPrefix = xmlPrefix; - } - - public String getXmlName() { - return xmlName; - } - - public void setXmlName(String xmlName) { - this.xmlName = xmlName; - } - - public String getXmlNamespace() { - return xmlNamespace; - } - - public void setXmlNamespace(String xmlNamespace) { - this.xmlNamespace = xmlNamespace; - } - @Override public void setComposedSchemas(CodegenComposedSchemas composedSchemas) { this.composedSchemas = composedSchemas; @@ -983,8 +784,6 @@ public boolean getHasDiscriminatorWithNonEmptyMapping() { return hasDiscriminatorWithNonEmptyMapping; } - ; - @Override public void setHasDiscriminatorWithNonEmptyMapping(boolean hasDiscriminatorWithNonEmptyMapping) { this.hasDiscriminatorWithNonEmptyMapping = hasDiscriminatorWithNonEmptyMapping; @@ -1044,10 +843,12 @@ public void setHasMultipleTypes(boolean hasMultipleTypes) { this.hasMultipleTypes = hasMultipleTypes; } + @Override public boolean getIsUuid() { return isUuid; } + @Override public void setIsUuid(boolean isUuid) { this.isUuid = isUuid; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java index 763147686073..9c8dc08aaa5f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java @@ -17,10 +17,14 @@ package org.openapitools.codegen; +import lombok.Getter; +import lombok.Setter; + import java.util.*; public class CodegenResponse implements IJsonSchemaValidationProperties { public final List headers = new ArrayList(); + @Getter @Setter private List responseHeaders = new ArrayList(); public String code; public boolean is1xx; @@ -94,6 +98,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { private boolean hasDiscriminatorWithNonEmptyMapping; private CodegenComposedSchemas composedSchemas; private boolean hasMultipleTypes = false; + @Getter @Setter private LinkedHashMap content; private Map requiredVarsMap; private String ref; @@ -249,22 +254,6 @@ public String getFormat() { @Override public void setFormat(String format) {} - public LinkedHashMap getContent() { - return content; - } - - public void setContent(LinkedHashMap content) { - this.content = content; - } - - public List getResponseHeaders() { - return responseHeaders; - } - - public void setResponseHeaders(List responseHeaders) { - this.responseHeaders = responseHeaders; - } - @Override public String getPattern() { return pattern; @@ -722,8 +711,6 @@ public boolean getHasDiscriminatorWithNonEmptyMapping() { return hasDiscriminatorWithNonEmptyMapping; } - ; - @Override public void setHasDiscriminatorWithNonEmptyMapping(boolean hasDiscriminatorWithNonEmptyMapping) { this.hasDiscriminatorWithNonEmptyMapping = hasDiscriminatorWithNonEmptyMapping; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 0682fe7c099b..8e2d9d8a8327 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -42,6 +42,8 @@ import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.ServerVariable; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.text.StringEscapeUtils; @@ -181,12 +183,15 @@ public class DefaultCodegen implements CodegenConfig { protected Map operationIdNameMapping = new HashMap<>(); // a map to store the rules in OpenAPI Normalizer protected Map openapiNormalizer = new HashMap<>(); - protected String modelPackage = "", apiPackage = "", fileSuffix; + @Setter protected String modelPackage = "", apiPackage = ""; + protected String fileSuffix; + @Getter @Setter protected String modelNamePrefix = "", modelNameSuffix = ""; + @Getter @Setter protected String apiNamePrefix = "", apiNameSuffix = "Api"; protected String testPackage = ""; - protected String filesMetadataFilename = "FILES"; - protected String versionMetadataFilename = "VERSION"; + @Setter protected String filesMetadataFilename = "FILES"; + @Setter protected String versionMetadataFilename = "VERSION"; /* apiTemplateFiles are for API outputs only (controllers/handlers). API templates may be written multiple times; APIs are grouped by tag and the file is written once per tag group. @@ -198,7 +203,7 @@ apiTemplateFiles are for API outputs only (controllers/handlers). protected Map apiDocTemplateFiles = new HashMap<>(); protected Map modelDocTemplateFiles = new HashMap<>(); protected Map reservedWordsMappings = new HashMap<>(); - protected String templateDir; + @Setter protected String templateDir; protected String embeddedTemplateDir; protected Map additionalProperties = new HashMap<>(); protected Map serverVariables = new HashMap<>(); @@ -213,7 +218,9 @@ apiTemplateFiles are for API outputs only (controllers/handlers). protected List cliOptions = new ArrayList<>(); protected boolean skipOverwrite; protected boolean removeOperationIdPrefix; + @Getter @Setter protected String removeOperationIdPrefixDelimiter = "_"; + @Getter @Setter protected int removeOperationIdPrefixCount = 1; protected boolean skipOperationExample; @@ -246,9 +253,13 @@ apiTemplateFiles are for API outputs only (controllers/handlers). protected boolean supportsMixins; protected Map supportedLibraries = new LinkedHashMap<>(); protected String library; + @Getter @Setter protected Boolean sortParamsByRequiredFlag = true; + @Getter @Setter protected Boolean sortModelPropertiesByRequiredFlag = false; + @Getter @Setter protected Boolean ensureUniqueParams = true; + @Getter @Setter protected Boolean allowUnicodeIdentifiers = false; protected String gitHost, gitUserId, gitRepoId, releaseNote; protected String httpUserAgent; @@ -259,6 +270,7 @@ apiTemplateFiles are for API outputs only (controllers/handlers). protected Map specialCharReplacements = new LinkedHashMap<>(); // When a model is an alias for a simple type protected Map typeAliases = Collections.emptyMap(); + @Getter @Setter protected Boolean prependFormOrBodyParameters = false; // The extension of the generated documentation files (defaults to markdown .md) protected String docExtension; @@ -281,15 +293,15 @@ apiTemplateFiles are for API outputs only (controllers/handlers). protected boolean removeEnumValuePrefix = true; // Support legacy logic for evaluating discriminators - protected boolean legacyDiscriminatorBehavior = true; + @Setter protected boolean legacyDiscriminatorBehavior = true; // Specify what to do if the 'additionalProperties' keyword is not present in a schema. // See CodegenConstants.java for more details. - protected boolean disallowAdditionalPropertiesIfNotPresent = true; + @Setter protected boolean disallowAdditionalPropertiesIfNotPresent = true; // If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response. // With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case. - protected boolean enumUnknownDefaultCase = false; + @Setter protected boolean enumUnknownDefaultCase = false; protected String enumUnknownDefaultCaseName = "unknown_default_open_api"; // make openapi available to all methods @@ -312,8 +324,9 @@ apiTemplateFiles are for API outputs only (controllers/handlers). protected boolean addSuffixToDuplicateOperationNicknames = true; // Whether to automatically hardcode params that are considered Constants by OpenAPI Spec - protected boolean autosetConstants = false; + @Setter protected boolean autosetConstants = false; + @Override public boolean getAddSuffixToDuplicateOperationNicknames() { return addSuffixToDuplicateOperationNicknames; } @@ -1456,127 +1469,23 @@ public String getFilesMetadataFilename() { return filesMetadataFilename; } - public void setFilesMetadataFilename(String filesMetadataFilename) { - this.filesMetadataFilename = filesMetadataFilename; - } - @Override public String getVersionMetadataFilename() { return versionMetadataFilename; } - public void setVersionMetadataFilename(String versionMetadataFilename) { - this.versionMetadataFilename = versionMetadataFilename; - } - - public void setTemplateDir(String templateDir) { - this.templateDir = templateDir; - } - - public void setModelPackage(String modelPackage) { - this.modelPackage = modelPackage; - } - - public String getModelNamePrefix() { - return modelNamePrefix; - } - - public void setModelNamePrefix(String modelNamePrefix) { - this.modelNamePrefix = modelNamePrefix; - } - - public String getModelNameSuffix() { - return modelNameSuffix; - } - - public void setModelNameSuffix(String modelNameSuffix) { - this.modelNameSuffix = modelNameSuffix; - } - - public String getApiNameSuffix() { - return apiNameSuffix; - } - - public void setApiNameSuffix(String apiNameSuffix) { - this.apiNameSuffix = apiNameSuffix; - } - - public String getApiNamePrefix() { - return apiNamePrefix; - } - - public void setApiNamePrefix(String apiNamePrefix) { - this.apiNamePrefix = apiNamePrefix; - } - - public void setApiPackage(String apiPackage) { - this.apiPackage = apiPackage; - } - - public Boolean getSortParamsByRequiredFlag() { - return sortParamsByRequiredFlag; - } - - public void setSortParamsByRequiredFlag(Boolean sortParamsByRequiredFlag) { - this.sortParamsByRequiredFlag = sortParamsByRequiredFlag; - } - - public Boolean getSortModelPropertiesByRequiredFlag() { - return sortModelPropertiesByRequiredFlag; - } - - public void setSortModelPropertiesByRequiredFlag(Boolean sortModelPropertiesByRequiredFlag) { - this.sortModelPropertiesByRequiredFlag = sortModelPropertiesByRequiredFlag; - } - - public Boolean getPrependFormOrBodyParameters() { - return prependFormOrBodyParameters; - } - - public void setPrependFormOrBodyParameters(Boolean prependFormOrBodyParameters) { - this.prependFormOrBodyParameters = prependFormOrBodyParameters; - } - - public Boolean getEnsureUniqueParams() { - return ensureUniqueParams; - } - - public void setEnsureUniqueParams(Boolean ensureUniqueParams) { - this.ensureUniqueParams = ensureUniqueParams; - } - public Boolean getLegacyDiscriminatorBehavior() { return legacyDiscriminatorBehavior; } - public void setLegacyDiscriminatorBehavior(boolean val) { - this.legacyDiscriminatorBehavior = val; - } - public Boolean getDisallowAdditionalPropertiesIfNotPresent() { return disallowAdditionalPropertiesIfNotPresent; } - public void setDisallowAdditionalPropertiesIfNotPresent(boolean val) { - this.disallowAdditionalPropertiesIfNotPresent = val; - } - public Boolean getEnumUnknownDefaultCase() { return enumUnknownDefaultCase; } - public void setEnumUnknownDefaultCase(boolean val) { - this.enumUnknownDefaultCase = val; - } - - public Boolean getAllowUnicodeIdentifiers() { - return allowUnicodeIdentifiers; - } - - public void setAllowUnicodeIdentifiers(Boolean allowUnicodeIdentifiers) { - this.allowUnicodeIdentifiers = allowUnicodeIdentifiers; - } - public Boolean getUseOneOfInterfaces() { return useOneOfInterfaces; } @@ -6277,22 +6186,6 @@ public void setRemoveOperationIdPrefix(boolean removeOperationIdPrefix) { this.removeOperationIdPrefix = removeOperationIdPrefix; } - public String getRemoveOperationIdPrefixDelimiter() { - return removeOperationIdPrefixDelimiter; - } - - public void setRemoveOperationIdPrefixDelimiter(String removeOperationIdPrefixDelimiter) { - this.removeOperationIdPrefixDelimiter = removeOperationIdPrefixDelimiter; - } - - public int getRemoveOperationIdPrefixCount() { - return removeOperationIdPrefixCount; - } - - public void setRemoveOperationIdPrefixCount(int removeOperationIdPrefixCount) { - this.removeOperationIdPrefixCount = removeOperationIdPrefixCount; - } - @Override public void setSkipOperationExample(boolean skipOperationExample) { this.skipOperationExample = skipOperationExample; @@ -8302,7 +8195,7 @@ protected void modifyFeatureSet(Consumer processor) { /** * An map entry for cached sanitized names. */ - private static class SanitizeNameOptions { + @Getter private static class SanitizeNameOptions { public SanitizeNameOptions(String name, String removeCharRegEx, List exceptions) { this.name = name; this.removeCharRegEx = removeCharRegEx; @@ -8313,18 +8206,6 @@ public SanitizeNameOptions(String name, String removeCharRegEx, List exc } } - public String getName() { - return name; - } - - public String getRemoveCharRegEx() { - return removeCharRegEx; - } - - public List getExceptions() { - return exceptions; - } - private final String name; private final String removeCharRegEx; private final List exceptions; @@ -8533,10 +8414,6 @@ protected Schema getSchemaFromBooleanOrSchema(Object schema) { } } - public void setAutosetConstants(boolean autosetConstants) { - this.autosetConstants = autosetConstants; - } - /** * This method removes all constant Query, Header and Cookie Params from allParams and sets them as constantParams in the CodegenOperation. * The definition of constant is single valued required enum params. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 8337b77be4d0..b26136a5950d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -29,7 +29,7 @@ import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.security.*; import io.swagger.v3.oas.models.tags.Tag; - +import lombok.Getter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.comparator.PathFileComparator; import org.apache.commons.lang3.ObjectUtils; @@ -95,7 +95,15 @@ public class DefaultGenerator implements Generator { private String basePathWithoutHost; private String contextPath; private Map generatorPropertyDefaults = new HashMap<>(); - protected TemplateProcessor templateProcessor = null; + /** + * -- GETTER -- + * Retrieves an instance to the configured template processor, available after user-defined options are + * applied via + * . + * + * @return A configured {@link TemplateProcessor}, or null. + */ + @Getter protected TemplateProcessor templateProcessor = null; private List userDefinedTemplates = new ArrayList<>(); private String generatorCheck = "spring"; @@ -160,16 +168,6 @@ public Generator opts(ClientOptInput opts) { return this; } - /** - * Retrieves an instance to the configured template processor, available after user-defined options are - * applied via {@link DefaultGenerator#opts(ClientOptInput)}. - * - * @return A configured {@link TemplateProcessor}, or null. - */ - public TemplateProcessor getTemplateProcessor() { - return templateProcessor; - } - /** * Programmatically disable the output of .openapi-generator/VERSION, .openapi-generator-ignore, * or other metadata files used by OpenAPI Generator. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DryRunStatus.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DryRunStatus.java index bd755e3a83d1..a28b81a8b980 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DryRunStatus.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DryRunStatus.java @@ -1,5 +1,7 @@ package org.openapitools.codegen; +import lombok.Getter; + import java.io.IOException; import java.nio.file.Path; import java.util.Locale; @@ -7,9 +9,28 @@ /** * Holds details about a file's write status for display via the --dry-run option of CLI */ -class DryRunStatus { +@Getter class DryRunStatus { + /** + * -- GETTER -- + * Gets the target path of the file write operation + * + * @return a {@link Path} instance + */ private Path path; + /** + * -- GETTER -- + * Gets the + * as determined by the generator's workflow + * + * @return A {@link State} enum detailing the expected operation of the generator's workflow + */ private State state; + /** + * -- GETTER -- + * Gets the reason for the file's + * + * @return A human-readable string which explains why this file's dry-run resulted in the defined {@link State} + */ private String reason; /** @@ -55,33 +76,6 @@ public void appendTo(Appendable appendable) throws IOException { appendable.append(String.format(Locale.ROOT, "%s %s", this.state.getShortDisplay(), this.path.toAbsolutePath())); } - /** - * Gets the target path of the file write operation - * - * @return a {@link Path} instance - */ - public Path getPath() { - return path; - } - - /** - * Gets the reason for the file's {@link State} - * - * @return A human-readable string which explains why this file's dry-run resulted in the defined {@link State} - */ - public String getReason() { - return reason; - } - - /** - * Gets the {@link State} as determined by the generator's workflow - * - * @return A {@link State} enum detailing the expected operation of the generator's workflow - */ - public State getState() { - return state; - } - /** * Sets the {@link State} as determined by the generator's workflow. *

@@ -116,7 +110,7 @@ public void setState(State state) { /** * Represents the possible states of a file write operation as determined by the Generator */ - enum State { + @Getter enum State { Write("w", "Write"), WriteIfNewer("n", "Write if New/Updated"), Ignored("i", "Ignored"), @@ -124,7 +118,19 @@ enum State { Skipped("k", "Skipped by user option(s)"), Error("e", "Error evaluating file write state"); + /** + * -- GETTER -- + * Gets the short value used for display + * + * @return A character representing this state + */ private final String shortDisplay; + /** + * -- GETTER -- + * Gets a description of the state which is more human-readable than the enum's name + * + * @return A human-readable description + */ private final String description; /** @@ -139,22 +145,5 @@ enum State { this.description = description; } - /** - * Gets a description of the state which is more human-readable than the enum's name - * - * @return A human-readable description - */ - public String getDescription() { - return description; - } - - /** - * Gets the short value used for display - * - * @return A character representing this state - */ - public String getShortDisplay() { - return shortDisplay; - } } } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index 0adc037028ba..e4976de6d9c9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -119,7 +119,7 @@ public interface IJsonSchemaValidationProperties { boolean getIsArray(); - void setIsArray(boolean isShort); + void setIsArray(boolean isArray); boolean getIsShort(); @@ -192,7 +192,7 @@ public interface IJsonSchemaValidationProperties { boolean getIsString(); - void setIsString(boolean isNumber); + void setIsString(boolean isString); boolean getIsNumber(); @@ -248,7 +248,7 @@ public interface IJsonSchemaValidationProperties { boolean getIsDouble(); - void setIsInteger(boolean isDouble); + void setIsInteger(boolean isInteger); boolean getIsInteger(); @@ -290,7 +290,6 @@ default void setTypeProperties(Schema p) { setIsArray(true); } else if (ModelUtils.isFileSchema(p) && !ModelUtils.isStringSchema(p)) { // swagger v2 only, type file - ; } else if (ModelUtils.isStringSchema(p)) { setIsString(true); if (ModelUtils.isByteArraySchema(p)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/SpecValidationException.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/SpecValidationException.java index f8b7371c10ce..704fedc44f31 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/SpecValidationException.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/SpecValidationException.java @@ -1,8 +1,12 @@ package org.openapitools.codegen; +import lombok.Getter; +import lombok.Setter; + import java.util.Optional; import java.util.Set; +@Getter @Setter public class SpecValidationException extends RuntimeException { private Set errors; @@ -81,22 +85,6 @@ public SpecValidationException(String message, Throwable cause, boolean enableSu super(message, cause, enableSuppression, writableStackTrace); } - public Set getErrors() { - return errors; - } - - public Set getWarnings() { - return warnings; - } - - public void setErrors(Set errors) { - this.errors = errors; - } - - public void setWarnings(Set warnings) { - this.warnings = warnings; - } - /** * Returns the detail message string of this throwable. * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/SupportingFile.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/SupportingFile.java index 2d72fa2f2168..9202a81e94fe 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/SupportingFile.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/SupportingFile.java @@ -17,6 +17,7 @@ package org.openapitools.codegen; +import lombok.Getter; import org.openapitools.codegen.api.TemplateDefinition; import org.openapitools.codegen.api.TemplateFileType; @@ -30,7 +31,7 @@ * Supporting files are generated once for an entire application while api/model bound definitions are generated multiple * times according to their target use. */ -public class SupportingFile extends TemplateDefinition { +@Getter public class SupportingFile extends TemplateDefinition { private boolean canOverwrite = true; public SupportingFile(String templateFile, String destinationFilename) { @@ -80,10 +81,6 @@ public boolean equals(Object o) { return isCanOverwrite() == that.isCanOverwrite(); } - public boolean isCanOverwrite() { - return canOverwrite; - } - @Override public int hashCode() { return Objects.hash(super.hashCode(), isCanOverwrite()); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java index 8fb9ce1bdaeb..0b1a91a11d6f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java @@ -1,9 +1,11 @@ package org.openapitools.codegen; +import lombok.Getter; + import java.util.Collections; import java.util.List; -public enum VendorExtension { +@Getter public enum VendorExtension { X_IMPLEMENTS("x-implements", ExtensionLevel.MODEL, "Ability to specify interfaces that model must implements", "empty array"), X_SPRING_PAGINATED("x-spring-paginated", ExtensionLevel.OPERATION, "Add org.springframework.data.domain.Pageable to controller method. Can be used to handle page & size query parameters", "false"), @@ -38,22 +40,6 @@ public enum VendorExtension { this(name, Collections.singletonList(level), description, defaultValue); } - public String getName() { - return name; - } - - public List getLevels() { - return levels; - } - - public String getDescription() { - return description; - } - - public String getDefaultValue() { - return defaultValue; - } - public enum ExtensionLevel { FIELD, MODEL, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/DynamicSettings.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/DynamicSettings.java index 2dcedc0f7c78..66165692d1ad 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/DynamicSettings.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/DynamicSettings.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import lombok.Getter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.api.TemplateDefinition; import org.openapitools.codegen.api.TemplateFileType; @@ -20,7 +21,13 @@ */ @SuppressWarnings({"unused", "WeakerAccess"}) public class DynamicSettings { - @JsonAnySetter + /** + * -- GETTER -- + * Gets all "custom" properties included in the config object. + * + * @return All user-specified custom properties. + */ + @Getter @JsonAnySetter private Map dynamicProperties = new HashMap<>(); @JsonUnwrapped @@ -91,15 +98,6 @@ public WorkflowSettings getWorkflowSettings() { @JsonCreator public DynamicSettings() { } - /** - * Gets all "custom" properties included in the config object. - * - * @return All user-specified custom properties. - */ - public Map getDynamicProperties() { - return dynamicProperties; - } - private void excludeSettingsFromDynamicProperties(){ Set fieldNames = new HashSet<>(); for (Field field : GeneratorSettings.class.getDeclaredFields()) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/GlobalSettings.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/GlobalSettings.java index fae47e37f8ec..5f7fad796277 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/GlobalSettings.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/GlobalSettings.java @@ -45,7 +45,7 @@ protected Properties initialValue() { Properties copy = new Properties(); copy.putAll(System.getProperties()); return copy; - }; + } }; public static String getProperty(String key, String defaultValue) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java index b636c1f69a32..70cd50cbdd28 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.examples; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.XML; import org.apache.commons.lang3.StringUtils; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/IgnoreLineParser.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/IgnoreLineParser.java index 7bdb44b525bd..2702c036d2b5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/IgnoreLineParser.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/IgnoreLineParser.java @@ -17,11 +17,13 @@ package org.openapitools.codegen.ignore.rules; +import lombok.Getter; + import java.util.ArrayList; import java.util.List; public class IgnoreLineParser { - enum Token { + @Getter enum Token { MATCH_ALL("**"), MATCH_ANY("*"), ESCAPED_EXCLAMATION("\\!"), @@ -39,9 +41,6 @@ enum Token { this.pattern = pattern; } - public String getPattern() { - return pattern; - } } // NOTE: Comments that start with a : (e.g. //:) are pulled from git documentation for .gitignore diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/InvalidRule.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/InvalidRule.java index 841a4ff7c0fe..00c126db7d57 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/InvalidRule.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/InvalidRule.java @@ -17,9 +17,11 @@ package org.openapitools.codegen.ignore.rules; +import lombok.Getter; + import java.util.List; -public class InvalidRule extends Rule { +@Getter public class InvalidRule extends Rule { private final String reason; InvalidRule(List syntax, String definition, String reason) { @@ -37,7 +39,4 @@ public Operation evaluate(String relativePath) { return Operation.NOOP; } - public String getReason() { - return reason; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Part.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Part.java index eeb47acea509..e5cb6dff23da 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Part.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Part.java @@ -17,7 +17,9 @@ package org.openapitools.codegen.ignore.rules; -class Part { +import lombok.Getter; + +@Getter class Part { private final IgnoreLineParser.Token token; private final String value; @@ -31,11 +33,4 @@ public Part(IgnoreLineParser.Token token) { this.value = token.getPattern(); } - public IgnoreLineParser.Token getToken() { - return token; - } - - public String getValue() { - return value; - } } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Rule.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Rule.java index fd56a053293d..40f1bb1e7568 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Rule.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Rule.java @@ -17,6 +17,8 @@ package org.openapitools.codegen.ignore.rules; +import lombok.Getter; + import java.util.List; public abstract class Rule { @@ -24,7 +26,7 @@ public abstract class Rule { public enum Operation {EXCLUDE, INCLUDE, NOOP, EXCLUDE_AND_TERMINATE} // The original rule - private final String definition; + @Getter private final String definition; private final List syntax; @@ -35,10 +37,6 @@ public enum Operation {EXCLUDE, INCLUDE, NOOP, EXCLUDE_AND_TERMINATE} public abstract Boolean matches(String relativePath); - public String getDefinition() { - return this.definition; - } - protected String getPattern() { if(syntax == null) return this.definition; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java index da798350211a..d67987aca813 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java @@ -20,7 +20,6 @@ import com.samskivert.mustache.Escapers; import com.samskivert.mustache.Mustache; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; @@ -885,6 +884,7 @@ static class ModelDepend implements Comparable { this.name = name; } + @Override public int compareTo(ModelDepend second) { if (depend != null && depend.contains(second.name)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java index 06823c3a2941..6a090df03d5a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java @@ -19,11 +19,11 @@ import com.google.common.base.Strings; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.MapSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.servers.Server; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.model.ModelsMap; @@ -39,7 +39,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(AbstractApexCodegen.class); - protected Boolean serializableModel = false; + @Setter protected Boolean serializableModel = false; public AbstractApexCodegen() { super(); @@ -208,14 +208,6 @@ public String getTypeDeclaration(Schema p) { return super.getTypeDeclaration(p); } - @Override - public String getAlias(String name) { - if (typeAliases != null && typeAliases.containsKey(name)) { - return typeAliases.get(name); - } - return name; - } - @Override public String toDefaultValue(Schema p) { if (ModelUtils.isArraySchema(p)) { @@ -634,10 +626,6 @@ private static String sanitizePackageName(String packageName) { } - public void setSerializableModel(Boolean serializableModel) { - this.serializableModel = serializableModel; - } - private String sanitizePath(String p) { //prefer replace a ", instead of a fuLL URL encode for readability return p.replaceAll("\"", "%22"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index 595d919150f1..23d460146c8f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -23,6 +23,8 @@ import com.samskivert.mustache.Template; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -52,53 +54,55 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen { protected boolean optionalEmitDefaultValuesFlag = false; protected boolean conditionalSerialization = false; protected boolean optionalProjectFileFlag = true; - protected boolean optionalMethodArgumentFlag = true; + @Setter protected boolean optionalMethodArgumentFlag = true; protected boolean useDateTimeOffsetFlag = false; protected boolean useDateTimeForDateFlag = false; protected boolean useCollection = false; - protected boolean returnICollection = false; - protected boolean netCoreProjectFileFlag = false; + @Setter protected boolean returnICollection = false; + @Setter protected boolean netCoreProjectFileFlag = false; protected boolean nullReferenceTypesFlag = false; protected boolean useSourceGeneration = false; protected String modelPropertyNaming = CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.PascalCase.name(); - protected String licenseUrl = "http://localhost"; - protected String licenseName = "NoLicense"; - - protected String packageVersion = "1.0.0"; - protected String packageName = "Org.OpenAPITools"; - protected String packageTitle = "OpenAPI Library"; - protected String packageProductName = "OpenAPILibrary"; - protected String packageDescription = "A library generated from a OpenAPI doc"; - protected String packageCompany = "OpenAPI"; - protected String packageCopyright = "No Copyright"; - protected String packageAuthors = "OpenAPI"; + @Setter protected String licenseUrl = "http://localhost"; + @Setter protected String licenseName = "NoLicense"; + + @Setter protected String packageVersion = "1.0.0"; + @Setter protected String packageName = "Org.OpenAPITools"; + @Setter protected String packageTitle = "OpenAPI Library"; + @Setter protected String packageProductName = "OpenAPILibrary"; + @Setter protected String packageDescription = "A library generated from a OpenAPI doc"; + @Setter protected String packageCompany = "OpenAPI"; + @Setter protected String packageCopyright = "No Copyright"; + @Setter protected String packageAuthors = "OpenAPI"; public static final String DATE_FORMAT = "dateFormat"; - protected String dateFormat = "yyyy'-'MM'-'dd"; + @Setter protected String dateFormat = "yyyy'-'MM'-'dd"; public static final String DATETIME_FORMAT = "dateTimeFormat"; - protected String dateTimeFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK"; + @Setter protected String dateTimeFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK"; + @Getter @Setter protected String interfacePrefix = "I"; - protected String enumNameSuffix = "Enum"; - protected String enumValueSuffix = "Enum"; + @Setter protected String enumNameSuffix = "Enum"; + @Setter protected String enumValueSuffix = "Enum"; - protected String sourceFolder = "src"; + @Setter protected String sourceFolder = "src"; protected static final String invalidParameterNamePrefix = "var"; protected static final String invalidPropertyNamePrefix = "Var"; - protected CodegenConstants.ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.PascalCase; + @Getter protected CodegenConstants.ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.PascalCase; // TODO: Add option for test folder output location. Nice to allow e.g. ./test instead of ./src. // This would require updating relative paths (e.g. path to main project file in test project file) - protected String testFolder = sourceFolder; + @Setter protected String testFolder = sourceFolder; protected Set collectionTypes; protected Set mapTypes; // true if support nullable type + @Getter @Setter protected boolean supportNullable = Boolean.FALSE; - protected Boolean zeroBasedEnums = null; + @Setter protected Boolean zeroBasedEnums = null; protected static final String zeroBasedEnumVendorExtension = "x-zero-based-enum"; private final Logger LOGGER = LoggerFactory.getLogger(AbstractCSharpCodegen.class); @@ -211,10 +215,6 @@ public AbstractCSharpCodegen() { // this.setSortModelPropertiesByRequiredFlag(true); } - public void setReturnICollection(boolean returnICollection) { - this.returnICollection = returnICollection; - } - public void setUseCollection(boolean useCollection) { this.useCollection = useCollection; if (useCollection) { @@ -224,14 +224,6 @@ public void setUseCollection(boolean useCollection) { this.setTypeMapping(); } - public void setOptionalMethodArgumentFlag(boolean flag) { - this.optionalMethodArgumentFlag = flag; - } - - public void setNetCoreProjectFileFlag(boolean flag) { - this.netCoreProjectFileFlag = flag; - } - public void useDateTimeOffset(boolean flag) { this.useDateTimeOffsetFlag = flag; this.setTypeMapping(); @@ -1539,70 +1531,6 @@ public String toModelTestFilename(String name) { return toModelName(name) + "Tests"; } - public void setLicenseUrl(String licenseUrl) { - this.licenseUrl = licenseUrl; - } - - public void setLicenseName(String licenseName) { - this.licenseName = licenseName; - } - - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - - public void setPackageTitle(String packageTitle) { - this.packageTitle = packageTitle; - } - - public void setPackageProductName(String packageProductName) { - this.packageProductName = packageProductName; - } - - public void setDateFormat(String dateFormat) { - this.dateFormat = dateFormat; - } - - public void setDateTimeFormat(String dateTimeFormat) { - this.dateTimeFormat = dateTimeFormat; - } - - public void setPackageDescription(String packageDescription) { - this.packageDescription = packageDescription; - } - - public void setPackageCompany(String packageCompany) { - this.packageCompany = packageCompany; - } - - public void setPackageCopyright(String packageCopyright) { - this.packageCopyright = packageCopyright; - } - - public void setPackageAuthors(String packageAuthors) { - this.packageAuthors = packageAuthors; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - - public void setTestFolder(String testFolder) { - this.testFolder = testFolder; - } - - public String getInterfacePrefix() { - return interfacePrefix; - } - - public void setZeroBasedEnums(final Boolean zeroBasedEnums) { - this.zeroBasedEnums = zeroBasedEnums; - } - public void setNullableReferenceTypes(final Boolean nullReferenceTypesFlag) { this.nullReferenceTypesFlag = nullReferenceTypesFlag; additionalProperties.put("nullableReferenceTypes", nullReferenceTypesFlag); @@ -1629,30 +1557,6 @@ public boolean getUseSourceGeneration() { return this.useSourceGeneration; } - public void setInterfacePrefix(final String interfacePrefix) { - this.interfacePrefix = interfacePrefix; - } - - public void setEnumNameSuffix(final String enumNameSuffix) { - this.enumNameSuffix = enumNameSuffix; - } - - public void setEnumValueSuffix(final String enumValueSuffix) { - this.enumValueSuffix = enumValueSuffix; - } - - public boolean isSupportNullable() { - return supportNullable; - } - - public void setSupportNullable(final boolean supportNullable) { - this.supportNullable = supportNullable; - } - - public CodegenConstants.ENUM_PROPERTY_NAMING_TYPE getEnumPropertyNaming() { - return this.enumPropertyNaming; - } - public void setEnumPropertyNaming(final String enumPropertyNamingType) { try { this.enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.valueOf(enumPropertyNamingType); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java index 634d63b6c1c9..40335e87c37c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; abstract public class AbstractCppCodegen extends DefaultCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(AbstractCppCodegen.class); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java index e47530d853c1..ad64d5d01a4a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java @@ -2,11 +2,11 @@ import com.google.common.collect.Sets; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.StringSchema; import io.swagger.v3.oas.models.servers.Server; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -48,17 +48,17 @@ public abstract class AbstractDartCodegen extends DefaultCodegen { public static final String PUB_PUBLISH_TO = "pubPublishTo"; public static final String USE_ENUM_EXTENSION = "useEnumExtension"; - protected String pubLibrary = "openapi.api"; - protected String pubName = "openapi"; - protected String pubVersion = "1.0.0"; - protected String pubDescription = "OpenAPI API client"; - protected String pubAuthor = "Author"; - protected String pubAuthorEmail = "author@homepage"; - protected String pubHomepage = "homepage"; - protected String pubRepository = null; - protected String pubPublishTo = null; - protected boolean useEnumExtension = false; - protected String sourceFolder = "src"; + @Setter protected String pubLibrary = "openapi.api"; + @Setter protected String pubName = "openapi"; + @Setter protected String pubVersion = "1.0.0"; + @Setter protected String pubDescription = "OpenAPI API client"; + @Setter protected String pubAuthor = "Author"; + @Setter protected String pubAuthorEmail = "author@homepage"; + @Setter protected String pubHomepage = "homepage"; + @Setter protected String pubRepository = null; + @Setter protected String pubPublishTo = null; + @Setter protected boolean useEnumExtension = false; + @Setter protected String sourceFolder = "src"; protected String libPath = "lib" + File.separator; protected String apiDocPath = "doc/"; protected String modelDocPath = "doc/"; @@ -764,50 +764,6 @@ public String toOperationId(String operationId) { return operationId; } - public void setPubLibrary(String pubLibrary) { - this.pubLibrary = pubLibrary; - } - - public void setPubName(String pubName) { - this.pubName = pubName; - } - - public void setPubVersion(String pubVersion) { - this.pubVersion = pubVersion; - } - - public void setPubDescription(String pubDescription) { - this.pubDescription = pubDescription; - } - - public void setPubAuthor(String pubAuthor) { - this.pubAuthor = pubAuthor; - } - - public void setPubAuthorEmail(String pubAuthorEmail) { - this.pubAuthorEmail = pubAuthorEmail; - } - - public void setPubHomepage(String pubHomepage) { - this.pubHomepage = pubHomepage; - } - - public void setPubRepository(String pubRepository) { - this.pubRepository = pubRepository; - } - - public void setPubPublishTo(String pubPublishTo) { - this.pubPublishTo = pubPublishTo; - } - - public void setUseEnumExtension(boolean useEnumExtension) { - this.useEnumExtension = useEnumExtension; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - @Override public String escapeQuotationMark(String input) { // remove " to avoid code injection diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java index 479fe4c99849..58a1e0bec04f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java @@ -20,7 +20,6 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import io.swagger.v3.core.util.Json; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java index 713efe56087c..e203225c162a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java @@ -20,8 +20,9 @@ import com.samskivert.mustache.Mustache.Lambda; import io.swagger.v3.core.util.Json; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -49,33 +50,35 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co protected boolean useDateTimeOffsetFlag = false; protected boolean useCollection = false; - protected boolean returnICollection = false; - protected boolean netCoreProjectFileFlag = false; + @Setter protected boolean returnICollection = false; + @Setter protected boolean netCoreProjectFileFlag = false; - protected String modelPropertyNaming = CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.PascalCase.name(); + @Getter protected String modelPropertyNaming = CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.PascalCase.name(); - protected String licenseUrl = "http://localhost"; - protected String licenseName = "NoLicense"; + @Setter protected String licenseUrl = "http://localhost"; + @Setter protected String licenseName = "NoLicense"; - protected String packageVersion = "1.0.0"; + @Setter protected String packageVersion = "1.0.0"; protected String packageName = "OpenAPI"; - protected String packageTitle = "OpenAPI Library"; - protected String packageProductName = "OpenAPILibrary"; - protected String packageDescription = "A library generated from a OpenAPI doc"; - protected String packageCompany = "OpenAPI"; - protected String packageCopyright = "No Copyright"; - protected String packageAuthors = "OpenAPI"; - + @Setter protected String packageTitle = "OpenAPI Library"; + @Setter protected String packageProductName = "OpenAPILibrary"; + @Setter protected String packageDescription = "A library generated from a OpenAPI doc"; + @Setter protected String packageCompany = "OpenAPI"; + @Setter protected String packageCopyright = "No Copyright"; + @Setter protected String packageAuthors = "OpenAPI"; + + @Getter @Setter protected String interfacePrefix = "I"; protected String projectFolder = packageName; - protected String sourceFolder = projectFolder + File.separator + "src"; + @Setter protected String sourceFolder = projectFolder + File.separator + "src"; protected String testFolder = projectFolder + ".Tests"; protected Set collectionTypes; protected Set mapTypes; // true if nullable types will be supported (as option) + @Getter @Setter protected boolean supportNullable = Boolean.TRUE; protected Set nullableType = new HashSet<>(); @@ -187,10 +190,6 @@ public AbstractFSharpCodegen() { ); } - public void setReturnICollection(boolean returnICollection) { - this.returnICollection = returnICollection; - } - public void setUseCollection(boolean useCollection) { this.useCollection = useCollection; if (useCollection) { @@ -202,10 +201,6 @@ public void setUseCollection(boolean useCollection) { } } - public void setNetCoreProjectFileFlag(boolean flag) { - this.netCoreProjectFileFlag = flag; - } - public void useDateTimeOffset(boolean flag) { this.useDateTimeOffsetFlag = flag; if (flag) { @@ -641,10 +636,6 @@ public String toOperationId(String operationId) { return camelize(sanitizeName(operationId)); } - public String getModelPropertyNaming() { - return this.modelPropertyNaming; - } - public void setModelPropertyNaming(String naming) { if ("original".equals(naming) || "camelCase".equals(naming) || "PascalCase".equals(naming) || "snake_case".equals(naming)) { @@ -936,14 +927,6 @@ public String toModelTestFilename(String name) { return toModelName(name) + "Tests"; } - public void setLicenseUrl(String licenseUrl) { - this.licenseUrl = licenseUrl; - } - - public void setLicenseName(String licenseName) { - this.licenseName = licenseName; - } - public void setPackageName(String packageName) { this.packageName = packageName; this.projectFolder = packageName; @@ -951,54 +934,6 @@ public void setPackageName(String packageName) { this.testFolder = projectFolder + ".Tests"; } - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - - public void setPackageTitle(String packageTitle) { - this.packageTitle = packageTitle; - } - - public void setPackageProductName(String packageProductName) { - this.packageProductName = packageProductName; - } - - public void setPackageDescription(String packageDescription) { - this.packageDescription = packageDescription; - } - - public void setPackageCompany(String packageCompany) { - this.packageCompany = packageCompany; - } - - public void setPackageCopyright(String packageCopyright) { - this.packageCopyright = packageCopyright; - } - - public void setPackageAuthors(String packageAuthors) { - this.packageAuthors = packageAuthors; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - - public String getInterfacePrefix() { - return interfacePrefix; - } - - public void setInterfacePrefix(final String interfacePrefix) { - this.interfacePrefix = interfacePrefix; - } - - public boolean isSupportNullable() { - return supportNullable; - } - - public void setSupportNullable(final boolean supportNullable) { - this.supportNullable = supportNullable; - } - @Override public String toEnumValue(String value, String datatype) { // C# only supports enums as literals for int, int?, long, long?, byte, and byte?. All else must be treated as strings. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java index 49269a51a425..d5a68e36bdb7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java @@ -17,8 +17,8 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -40,18 +40,17 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege private final Logger LOGGER = LoggerFactory.getLogger(AbstractGoCodegen.class); private static final String NUMERIC_ENUM_PREFIX = "_"; - protected boolean withGoCodegenComment = false; - protected boolean withAWSV4Signature = false; - protected boolean withXml = false; - protected boolean enumClassPrefix = false; - protected boolean structPrefix = false; - protected boolean generateInterfaces = false; - protected boolean withGoMod = false; - protected boolean generateMarshalJSON = true; - protected boolean generateUnmarshalJSON = true; - - - protected String packageName = "openapi"; + @Setter protected boolean withGoCodegenComment = false; + @Setter protected boolean withAWSV4Signature = false; + @Setter protected boolean withXml = false; + @Setter protected boolean enumClassPrefix = false; + @Setter protected boolean structPrefix = false; + @Setter protected boolean generateInterfaces = false; + @Setter protected boolean withGoMod = false; + @Setter protected boolean generateMarshalJSON = true; + @Setter protected boolean generateUnmarshalJSON = true; + + @Setter protected String packageName = "openapi"; protected Set numberTypes; public AbstractGoCodegen() { @@ -814,10 +813,6 @@ protected boolean needToImport(String type) { return !defaultIncludes.contains(type) && !languageSpecificPrimitives.contains(type); } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - @Override public String escapeQuotationMark(String input) { // remove " to avoid code injection @@ -906,42 +901,6 @@ public String toEnumName(CodegenProperty property) { } } - public void setWithGoCodegenComment(boolean withGoCodegenComment) { - this.withGoCodegenComment = withGoCodegenComment; - } - - public void setWithAWSV4Signature(boolean withAWSV4Signature) { - this.withAWSV4Signature = withAWSV4Signature; - } - - public void setWithXml(boolean withXml) { - this.withXml = withXml; - } - - public void setEnumClassPrefix(boolean enumClassPrefix) { - this.enumClassPrefix = enumClassPrefix; - } - - public void setStructPrefix(boolean structPrefix) { - this.structPrefix = structPrefix; - } - - public void setGenerateInterfaces(boolean generateInterfaces) { - this.generateInterfaces = generateInterfaces; - } - - public void setWithGoMod(boolean withGoMod) { - this.withGoMod = withGoMod; - } - - public void setGenerateMarshalJSON(boolean generateMarshalJSON) { - this.generateMarshalJSON = generateMarshalJSON; - } - - public void setGenerateUnmarshalJSON(boolean generateUnmarshalJSON) { - this.generateUnmarshalJSON = generateUnmarshalJSON; - } - @Override public String toDefaultValue(Schema schema) { schema = unaliasSchema(schema); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java index 2d92ab1614f6..0d383f375a61 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java @@ -16,8 +16,8 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.model.ModelMap; @@ -39,8 +39,8 @@ public abstract class AbstractGraphQLCodegen extends DefaultCodegen implements C private final Logger LOGGER = LoggerFactory.getLogger(AbstractGraphQLCodegen.class); protected String specFolder = "spec"; - protected String packageName = "openapi2graphql"; - protected String packageVersion = "1.0.0"; + @Setter protected String packageName = "openapi2graphql"; + @Setter protected String packageVersion = "1.0.0"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; @@ -116,14 +116,6 @@ public void processOpts() { additionalProperties.put("modelDocPath", modelDocPath); } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - @Override public String escapeReservedWord(String name) { // Can't start with an underscore, as our fields need to start with an diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 0ca8bcc2b360..358041f4c8de 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -31,6 +31,8 @@ import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -96,55 +98,87 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code public static final String DEFAULT_TEST_FOLDER = "${project.build.directory}/generated-test-sources/openapi"; public static final String GENERATE_CONSTRUCTOR_WITH_ALL_ARGS = "generateConstructorWithAllArgs"; public static final String GENERATE_BUILDERS = "generateBuilders"; + + @Getter @Setter protected String dateLibrary = "java8"; - protected boolean supportAsync = false; - protected boolean withXml = false; + @Setter protected boolean supportAsync = false; + @Setter protected boolean withXml = false; + @Getter @Setter protected String invokerPackage = "org.openapitools"; + @Getter @Setter protected String groupId = "org.openapitools"; + @Getter @Setter protected String artifactId = "openapi-java"; + @Getter @Setter protected String artifactVersion = null; + @Getter @Setter protected String artifactUrl = "https://github.com/openapitools/openapi-generator"; + @Getter @Setter protected String artifactDescription = "OpenAPI Java"; + @Getter @Setter protected String developerName = "OpenAPI-Generator Contributors"; + @Getter @Setter protected String developerEmail = "team@openapitools.org"; + @Getter @Setter protected String developerOrganization = "OpenAPITools.org"; + @Getter @Setter protected String developerOrganizationUrl = "http://openapitools.org"; + @Getter @Setter protected String scmConnection = "scm:git:git@github.com:openapitools/openapi-generator.git"; + @Getter @Setter protected String scmDeveloperConnection = "scm:git:git@github.com:openapitools/openapi-generator.git"; + @Getter @Setter protected String scmUrl = "https://github.com/openapitools/openapi-generator"; + @Getter @Setter protected String licenseName = "Unlicense"; + @Getter @Setter protected String licenseUrl = "http://unlicense.org"; protected String projectFolder = "src/main"; protected String projectTestFolder = "src/test"; // this must not be OS-specific + @Getter @Setter protected String sourceFolder = projectFolder + "/java"; + @Getter @Setter protected String testFolder = projectTestFolder + "/java"; - protected boolean discriminatorCaseSensitive = true; // True if the discriminator value lookup should be case-sensitive. + /** + * -- SETTER -- + * Set whether discriminator value lookup is case-sensitive or not. + * + * @param discriminatorCaseSensitive true if the discriminator value lookup should be case-sensitive. + */ + @Setter protected boolean discriminatorCaseSensitive = true; + @Getter @Setter protected Boolean serializableModel = false; - protected boolean serializeBigDecimalAsString = false; + @Setter protected boolean serializeBigDecimalAsString = false; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; - protected boolean disableHtmlEscaping = false; + @Setter protected boolean disableHtmlEscaping = false; + @Getter @Setter protected String booleanGetterPrefix = "get"; - protected boolean ignoreAnyOfInEnum = false; - protected String parentGroupId = ""; - protected String parentArtifactId = ""; - protected String parentVersion = ""; - protected boolean parentOverridden = false; + @Setter protected boolean ignoreAnyOfInEnum = false; + @Setter protected String parentGroupId = ""; + @Setter protected String parentArtifactId = ""; + @Setter protected String parentVersion = ""; + @Setter protected boolean parentOverridden = false; + @Getter @Setter protected List additionalModelTypeAnnotations = new LinkedList<>(); protected Map lombokAnnotations = null; + @Getter @Setter protected List additionalOneOfTypeAnnotations = new LinkedList<>(); - protected List additionalEnumTypeAnnotations = new LinkedList<>(); + @Setter protected List additionalEnumTypeAnnotations = new LinkedList<>(); + @Getter @Setter protected boolean openApiNullable = true; - protected String outputTestFolder = ""; + @Setter protected String outputTestFolder = ""; protected DocumentationProvider documentationProvider; protected AnnotationLibrary annotationLibrary; - protected boolean implicitHeaders = false; - protected String implicitHeadersRegex = null; - protected boolean camelCaseDollarSign = false; - protected boolean useJakartaEe = false; - protected boolean containerDefaultToNull = false; + @Setter protected boolean implicitHeaders = false; + @Setter protected String implicitHeadersRegex = null; + @Setter protected boolean camelCaseDollarSign = false; + @Setter protected boolean useJakartaEe = false; + @Setter protected boolean containerDefaultToNull = false; + @Getter @Setter protected boolean generateConstructorWithAllArgs = false; + @Getter @Setter protected boolean generateBuilder = false; private Map schemaKeyToModelNameCache = new HashMap<>(); @@ -692,22 +726,6 @@ public void processOpts() { }); } - public void setGenerateConstructorWithAllArgs(boolean aValue) { - this.generateConstructorWithAllArgs = aValue; - } - - public boolean isGenerateConstructorWithAllArgs() { - return generateConstructorWithAllArgs; - } - - public void setGenerateBuilder(boolean aValue) { - this.generateBuilder = aValue; - } - - public boolean isGenerateBuilder() { - return generateBuilder; - } - /** * Analyse and post process all Models. * @param objs the models map. @@ -1241,14 +1259,6 @@ private String getStringBeanValidation(Schema items) { return validations; } - @Override - public String getAlias(String name) { - if (typeAliases != null && typeAliases.containsKey(name)) { - return typeAliases.get(name); - } - return name; - } - /** * Return the default value of array property *

@@ -1838,6 +1848,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert } } + @Override public void postProcessResponseWithProperty(CodegenResponse response, CodegenProperty property) { if (response == null || property == null || response.dataType == null || property.dataType == null) { return; @@ -2140,208 +2151,11 @@ private static String sanitizePackageName(String packageName) { return packageName; } - public String getInvokerPackage() { - return invokerPackage; - } - - public void setInvokerPackage(String invokerPackage) { - this.invokerPackage = invokerPackage; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getArtifactId() { - return artifactId; - } - - public void setArtifactId(String artifactId) { - this.artifactId = artifactId; - } - - public String getArtifactVersion() { - return artifactVersion; - } - - public void setArtifactVersion(String artifactVersion) { - this.artifactVersion = artifactVersion; - } - - public String getArtifactUrl() { - return artifactUrl; - } - - public void setArtifactUrl(String artifactUrl) { - this.artifactUrl = artifactUrl; - } - - public String getArtifactDescription() { - return artifactDescription; - } - - public void setArtifactDescription(String artifactDescription) { - this.artifactDescription = artifactDescription; - } - - public String getScmConnection() { - return scmConnection; - } - - public void setScmConnection(String scmConnection) { - this.scmConnection = scmConnection; - } - - public String getScmDeveloperConnection() { - return scmDeveloperConnection; - } - - public void setScmDeveloperConnection(String scmDeveloperConnection) { - this.scmDeveloperConnection = scmDeveloperConnection; - } - - public String getScmUrl() { - return scmUrl; - } - - public void setScmUrl(String scmUrl) { - this.scmUrl = scmUrl; - } - - public String getDeveloperName() { - return developerName; - } - - public void setDeveloperName(String developerName) { - this.developerName = developerName; - } - - public String getDeveloperEmail() { - return developerEmail; - } - - public void setDeveloperEmail(String developerEmail) { - this.developerEmail = developerEmail; - } - - public String getDeveloperOrganization() { - return developerOrganization; - } - - public void setDeveloperOrganization(String developerOrganization) { - this.developerOrganization = developerOrganization; - } - - public String getDeveloperOrganizationUrl() { - return developerOrganizationUrl; - } - - public void setDeveloperOrganizationUrl(String developerOrganizationUrl) { - this.developerOrganizationUrl = developerOrganizationUrl; - } - - public String getLicenseName() { - return licenseName; - } - - public void setLicenseName(String licenseName) { - this.licenseName = licenseName; - } - - public String getLicenseUrl() { - return licenseUrl; - } - - public void setLicenseUrl(String licenseUrl) { - this.licenseUrl = licenseUrl; - } - - public String getSourceFolder() { - return sourceFolder; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - - public String getTestFolder() { - return testFolder; - } - - public void setTestFolder(String testFolder) { - this.testFolder = testFolder; - } - - public void setSerializeBigDecimalAsString(boolean s) { - this.serializeBigDecimalAsString = s; - } - - public Boolean getSerializableModel() { - return serializableModel; - } - - public void setSerializableModel(Boolean serializableModel) { - this.serializableModel = serializableModel; - } - private String sanitizePath(String p) { //prefer replace a ", instead of a fuLL URL encode for readability return p.replaceAll("\"", "%22"); } - /** - * Set whether discriminator value lookup is case-sensitive or not. - * - * @param discriminatorCaseSensitive true if the discriminator value lookup should be case sensitive. - */ - public void setDiscriminatorCaseSensitive(boolean discriminatorCaseSensitive) { - this.discriminatorCaseSensitive = discriminatorCaseSensitive; - } - - public void setWithXml(boolean withXml) { - this.withXml = withXml; - } - - public String getDateLibrary() { - return dateLibrary; - } - - public void setDateLibrary(String library) { - this.dateLibrary = library; - } - - public void setSupportAsync(boolean enabled) { - this.supportAsync = enabled; - } - - public void setDisableHtmlEscaping(boolean disabled) { - this.disableHtmlEscaping = disabled; - } - - public String getBooleanGetterPrefix() { - return booleanGetterPrefix; - } - - public void setBooleanGetterPrefix(String booleanGetterPrefix) { - this.booleanGetterPrefix = booleanGetterPrefix; - } - - public void setIgnoreAnyOfInEnum(boolean ignoreAnyOfInEnum) { - this.ignoreAnyOfInEnum = ignoreAnyOfInEnum; - } - - public boolean isOpenApiNullable() { - return openApiNullable; - } - - public void setOpenApiNullable(final boolean openApiNullable) { - this.openApiNullable = openApiNullable; - } - @Override public void setOutputDir(String dir) { super.setOutputDir(dir); @@ -2357,10 +2171,6 @@ public String getOutputTestFolder() { return outputTestFolder; } - public void setOutputTestFolder(String outputTestFolder) { - this.outputTestFolder = outputTestFolder; - } - @Override public DocumentationProvider getDocumentationProvider() { return documentationProvider; @@ -2381,26 +2191,6 @@ public void setAnnotationLibrary(AnnotationLibrary annotationLibrary) { this.annotationLibrary = annotationLibrary; } - public void setImplicitHeaders(boolean implicitHeaders) { - this.implicitHeaders = implicitHeaders; - } - - public void setImplicitHeadersRegex(String implicitHeadersRegex) { - this.implicitHeadersRegex = implicitHeadersRegex; - } - - public void setCamelCaseDollarSign(boolean camelCaseDollarSign) { - this.camelCaseDollarSign = camelCaseDollarSign; - } - - public void setUseJakartaEe(boolean useJakartaEe) { - this.useJakartaEe = useJakartaEe; - } - - public void setContainerDefaultToNull(boolean containerDefaultToNull) { - this.containerDefaultToNull = containerDefaultToNull; - } - @Override public String escapeQuotationMark(String input) { // remove " to avoid code injection @@ -2527,42 +2317,6 @@ public void postProcessFile(File file, String fileType) { } } - public void setParentGroupId(final String parentGroupId) { - this.parentGroupId = parentGroupId; - } - - public void setParentArtifactId(final String parentArtifactId) { - this.parentArtifactId = parentArtifactId; - } - - public void setParentVersion(final String parentVersion) { - this.parentVersion = parentVersion; - } - - public void setParentOverridden(final boolean parentOverridden) { - this.parentOverridden = parentOverridden; - } - - public List getAdditionalModelTypeAnnotations() { - return additionalModelTypeAnnotations; - } - - public void setAdditionalModelTypeAnnotations(final List additionalModelTypeAnnotations) { - this.additionalModelTypeAnnotations = additionalModelTypeAnnotations; - } - - public List getAdditionalOneOfTypeAnnotations() { - return additionalOneOfTypeAnnotations; - } - - public void setAdditionalOneOfTypeAnnotations(final List additionalOneOfTypeAnnotations) { - this.additionalOneOfTypeAnnotations = additionalOneOfTypeAnnotations; - } - - public void setAdditionalEnumTypeAnnotations(final List additionalEnumTypeAnnotations) { - this.additionalEnumTypeAnnotations = additionalEnumTypeAnnotations; - } - @Override protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) { if (!supportsAdditionalPropertiesWithComposedSchema) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJuliaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJuliaCodegen.java index b1210465b89d..3f2549780f59 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJuliaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJuliaCodegen.java @@ -16,6 +16,7 @@ package org.openapitools.codegen.languages; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.ClientModificationFeature; import org.openapitools.codegen.meta.features.DocumentationFeature; @@ -32,7 +33,6 @@ import java.util.*; import io.swagger.v3.oas.models.media.Schema; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.servers.Server; @@ -63,9 +63,9 @@ public abstract class AbstractJuliaCodegen extends DefaultCodegen { protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; - protected String packageName; - protected Boolean exportModels; - protected Boolean exportOperations; + @Setter protected String packageName; + @Setter protected Boolean exportModels; + @Setter protected Boolean exportOperations; protected final DateTimeFormatter OFFSET_DATE_TIME_FORMAT = DateTimeFormatter.ISO_OFFSET_DATE_TIME; protected final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.ROOT); @@ -147,18 +147,6 @@ public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.JULIA; } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setExportModels(Boolean exportModels) { - this.exportModels = exportModels; - } - - public void setExportOperations(Boolean exportOperations) { - this.exportOperations = exportOperations; - } - protected static String dropDots(String str) { return str.replaceAll("\\.", "_"); } @@ -440,6 +428,7 @@ public String escapeUnsafeCharacters(String input) { * @param input String to be cleaned up * @return string with quotation mark removed or escaped */ + @Override public String escapeQuotationMark(String input) { return input.replace("\"", "\\\""); } @@ -500,6 +489,7 @@ public CodegenProperty fromProperty(String name, Schema schema, boolean required * @param operationId operation ID * @return the sanitized method name */ + @Override @SuppressWarnings("static-method") public String toOperationId(String operationId) { CamelizeOption camelizeOption = CamelizeOption.UPPERCASE_FIRST_CHAR; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index 599236a2b820..d97a242dbd47 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -20,9 +20,10 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.StringSchema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -55,32 +56,34 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co private final Logger LOGGER = LoggerFactory.getLogger(AbstractKotlinCodegen.class); - protected String artifactId; - protected String artifactVersion = "1.0.0"; - protected String groupId = "org.openapitools"; - protected String packageName = "org.openapitools"; - protected String apiSuffix = "Api"; + @Setter protected String artifactId; + @Setter protected String artifactVersion = "1.0.0"; + @Setter protected String groupId = "org.openapitools"; + @Setter protected String packageName = "org.openapitools"; + @Setter protected String apiSuffix = "Api"; - protected String sourceFolder = "src/main/kotlin"; - protected String testFolder = "src/test/kotlin"; + @Setter protected String sourceFolder = "src/main/kotlin"; + @Setter protected String testFolder = "src/test/kotlin"; protected String resourcesFolder = "src/main/resources"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; protected boolean parcelizeModels = false; + @Getter @Setter protected boolean serializableModel = false; - protected boolean useJakartaEe = false; + @Setter protected boolean useJakartaEe = false; - protected boolean nonPublicApi = false; + @Setter protected boolean nonPublicApi = false; - protected CodegenConstants.ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.original; + @Getter protected CodegenConstants.ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.original; // model classes cannot use the same property names defined in HashMap // ref: https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-hash-map/ protected Set propertyAdditionalKeywords = new HashSet<>(Arrays.asList("entries", "keys", "size", "values")); private final Map schemaKeyToModelNameCache = new HashMap<>(); + @Getter @Setter protected List additionalModelTypeAnnotations = new LinkedList<>(); public AbstractKotlinCodegen() { @@ -304,10 +307,6 @@ public String escapeUnsafeCharacters(String input) { return input.replace("*/", "*_/").replace("/*", "/_*"); } - public CodegenConstants.ENUM_PROPERTY_NAMING_TYPE getEnumPropertyNaming() { - return this.enumPropertyNaming; - } - /** * Sets the naming convention for Kotlin enum properties @@ -537,34 +536,6 @@ protected boolean isModelMutable() { return Boolean.TRUE.equals(additionalProperties.get(MODEL_MUTABLE)); } - public void setArtifactId(String artifactId) { - this.artifactId = artifactId; - } - - public void setArtifactVersion(String artifactVersion) { - this.artifactVersion = artifactVersion; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setApiSuffix(String apiSuffix) { - this.apiSuffix = apiSuffix; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - - public void setTestFolder(String testFolder) { - this.testFolder = testFolder; - } - public Boolean getParcelizeModels() { return parcelizeModels; } @@ -573,26 +544,10 @@ public void setParcelizeModels(Boolean parcelizeModels) { this.parcelizeModels = parcelizeModels; } - public boolean isSerializableModel() { - return serializableModel; - } - - public void setSerializableModel(boolean serializableModel) { - this.serializableModel = serializableModel; - } - - public void setUseJakartaEe(boolean useJakartaEe) { - this.useJakartaEe = useJakartaEe; - } - public boolean nonPublicApi() { return nonPublicApi; } - public void setNonPublicApi(boolean nonPublicApi) { - this.nonPublicApi = nonPublicApi; - } - /** * Return the sanitized variable name for enum * @@ -1166,14 +1121,6 @@ protected void updateModelForObject(CodegenModel m, Schema schema) { setAddProps(schema, m); } - public List getAdditionalModelTypeAnnotations() { - return additionalModelTypeAnnotations; - } - - public void setAdditionalModelTypeAnnotations(final List additionalModelTypeAnnotations) { - this.additionalModelTypeAnnotations = additionalModelTypeAnnotations; - } - @Override protected ImmutableMap.Builder addMustacheLambdas() { return super.addMustacheLambdas() diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index b8ac658b892c..af33ba1f36a7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -16,9 +16,10 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.StringSchema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -48,15 +49,17 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg public static final String VARIABLE_NAMING_CONVENTION = "variableNamingConvention"; public static final String PACKAGE_NAME = "packageName"; public static final String SRC_BASE_PATH = "srcBasePath"; + @Getter @Setter protected String invokerPackage = "php"; + @Getter @Setter protected String packageName = "php-base"; - protected String artifactVersion = null; - protected String artifactUrl = "https://openapi-generator.tech"; - protected String licenseName = "unlicense"; - protected String developerOrganization = "OpenAPI"; - protected String developerOrganizationUrl = "https://openapi-generator.tech"; - protected String srcBasePath = "lib"; - protected String testBasePath = "test"; + @Setter protected String artifactVersion = null; + @Setter protected String artifactUrl = "https://openapi-generator.tech"; + @Setter protected String licenseName = "unlicense"; + @Setter protected String developerOrganization = "OpenAPI"; + @Setter protected String developerOrganizationUrl = "https://openapi-generator.tech"; + @Setter protected String srcBasePath = "lib"; + @Setter protected String testBasePath = "test"; protected String docsBasePath = "docs"; protected String apiDirName = "Api"; protected String modelDirName = "Model"; @@ -282,10 +285,6 @@ public void processOpts() { supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore")); } - public String getPackageName() { - return packageName; - } - public String toSrcPath(final String packageName, final String basePath) { String modifiedPackageName = packageName.replace(invokerPackage, ""); String modifiedBasePath = basePath; @@ -417,46 +416,6 @@ public String getSchemaType(Schema p) { return toModelName(type); } - public String getInvokerPackage() { - return invokerPackage; - } - - public void setInvokerPackage(String invokerPackage) { - this.invokerPackage = invokerPackage; - } - - public void setArtifactVersion(String artifactVersion) { - this.artifactVersion = artifactVersion; - } - - public void setArtifactUrl(String artifactUrl) { - this.artifactUrl = artifactUrl; - } - - public void setLicenseName(String licenseName) { - this.licenseName = licenseName; - } - - public void setDeveloperOrganization(String developerOrganization) { - this.developerOrganization = developerOrganization; - } - - public void setDeveloperOrganizationUrl(String developerOrganizationUrl) { - this.developerOrganizationUrl = developerOrganizationUrl; - } - - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setSrcBasePath(String srcBasePath) { - this.srcBasePath = srcBasePath; - } - - public void setTestBasePath(String testBasePath) { - this.testBasePath = testBasePath; - } - public void setParameterNamingConvention(String variableNamingConvention) { this.variableNamingConvention = variableNamingConvention; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java index 36b74be9578b..386a40557bde 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java @@ -41,11 +41,11 @@ import javax.annotation.Nullable; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenDiscriminator; import org.openapitools.codegen.CodegenMediaType; import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenOperation; @@ -66,7 +66,6 @@ import com.github.curiousoddman.rgxgen.RgxGen; import io.swagger.v3.oas.models.examples.Example; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; @@ -80,8 +79,8 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co public static final String MAP_NUMBER_TO = "mapNumberTo"; protected String packageName = "openapi_client"; - protected String packageVersion = "1.0.0"; - protected String projectName; // for setup.py, e.g. petstore-api + @Setter protected String packageVersion = "1.0.0"; + @Setter protected String projectName; // for setup.py, e.g. petstore-api protected boolean hasModelsToImport = Boolean.FALSE; protected String mapNumberTo = "Union[StrictFloat, StrictInt]"; protected Map regexModifiers; @@ -679,14 +678,6 @@ public void setPackageName(String packageName) { additionalProperties.put(CodegenConstants.PACKAGE_NAME, this.packageName); } - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - @Override public String getTypeDeclaration(Schema p) { p = ModelUtils.unaliasSchema(openAPI, p); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java index e6480bac8d3f..6062a561bc25 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java @@ -55,7 +55,6 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.PathItem.HttpMethod; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.RequestBody; @@ -737,6 +736,7 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List vendorExtensions) { if (pattern != null) { int i = pattern.lastIndexOf('/'); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonPydanticV1Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonPydanticV1Codegen.java index 617da587f84c..fc2d73b3bb2a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonPydanticV1Codegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonPydanticV1Codegen.java @@ -18,9 +18,9 @@ import com.github.curiousoddman.rgxgen.RgxGen; import io.swagger.v3.oas.models.examples.Example; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -48,8 +48,8 @@ public abstract class AbstractPythonPydanticV1Codegen extends DefaultCodegen imp public static final String MAP_NUMBER_TO = "mapNumberTo"; protected String packageName = "openapi_client"; - protected String packageVersion = "1.0.0"; - protected String projectName; // for setup.py, e.g. petstore-api + @Setter protected String packageVersion = "1.0.0"; + @Setter protected String projectName; // for setup.py, e.g. petstore-api protected boolean hasModelsToImport = Boolean.FALSE; protected String mapNumberTo = "Union[StrictFloat, StrictInt]"; protected Map regexModifiers; @@ -642,14 +642,6 @@ public void setPackageName(String packageName) { additionalProperties.put(CodegenConstants.PACKAGE_NAME, this.packageName); } - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - @Override public String getTypeDeclaration(Schema p) { p = ModelUtils.unaliasSchema(openAPI, p); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java index b3a43938e7be..7ef29f104a72 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRustCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRustCodegen.java index adcc6264fd83..567f6ec41592 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRustCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRustCodegen.java @@ -2,7 +2,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.FileSchema; import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.*; @@ -148,8 +147,6 @@ public boolean canFitIntoUnsigned(@Nullable BigInteger minimum, boolean exclusiv public enum CasingType {CAMEL_CASE, SNAKE_CASE} - ; - /** * General purpose sanitizing function for Rust identifiers (fields, variables, structs, parameters, etc.).
* Rules for Rust are fairly simple: diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java index 9b746340c5be..228728eb42d8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java @@ -20,10 +20,11 @@ import com.samskivert.mustache.Escapers; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.StringSchema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -48,8 +49,9 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen { private final Logger LOGGER = LoggerFactory.getLogger(AbstractScalaCodegen.class); - protected String modelPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.camelCase.name(); - protected String invokerPackage = "org.openapitools.client"; + @Getter protected String modelPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.camelCase.name(); + @Setter protected String invokerPackage = "org.openapitools.client"; + @Getter @Setter protected String sourceFolder = "src/main/scala"; protected String appName = "OpenAPI Sample"; protected String appDescription = "A sample openapi server"; @@ -59,7 +61,7 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen { protected String licenseUrl = "http://apache.org/licenses/LICENSE-2.0.html"; protected String apiVersion = "1.0"; protected boolean stripPackageName = true; - protected String dateLibrary = DateLibraries.java8.name(); + @Getter protected String dateLibrary = DateLibraries.java8.name(); protected enum DateLibraries { java8("Java 8 native JSR310 (preferred for JDK 1.8+)"), @@ -255,10 +257,6 @@ public void setDateLibrary(String dateLibrary, boolean withLegacy) { throw new IllegalArgumentException("Invalid dateLibrary. Must be 'java8' or 'joda'"); } - public String getDateLibrary() { - return this.dateLibrary; - } - public void setModelPropertyNaming(String naming) { try { this.modelPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.valueOf(naming).name(); @@ -269,10 +267,6 @@ public void setModelPropertyNaming(String naming) { } } - public String getModelPropertyNaming() { - return this.modelPropertyNaming; - } - @Override public String toVarName(String name) { @@ -316,14 +310,6 @@ public String getNameUsingModelPropertyNaming(String name) { } } - public String getSourceFolder() { - return sourceFolder; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - @Override public String escapeReservedWord(String name) { if (this.reservedWordsMappings().containsKey(name)) { @@ -614,10 +600,6 @@ public String toOperationId(String operationId) { return operationId; } - public void setInvokerPackage(String invokerPackage) { - this.invokerPackage = invokerPackage; - } - @Override public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.SCALA; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index e751790abcf2..29ceed98f88a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -18,10 +18,10 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.media.ArraySchema; -import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.checkerframework.checker.nullness.qual.Nullable; @@ -240,14 +240,18 @@ protected String nullableQuotedJSString(@Nullable String string) { @SuppressWarnings("squid:S5164") protected static final ThreadLocal SNAPSHOT_SUFFIX_FORMAT = ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT)); - protected MODEL_PROPERTY_NAMING_TYPE modelPropertyNaming = MODEL_PROPERTY_NAMING_TYPE.original; + @Getter protected MODEL_PROPERTY_NAMING_TYPE modelPropertyNaming = MODEL_PROPERTY_NAMING_TYPE.original; protected ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = ENUM_PROPERTY_NAMING_TYPE.PascalCase; - protected PARAM_NAMING_TYPE paramNaming = PARAM_NAMING_TYPE.camelCase; + @Getter protected PARAM_NAMING_TYPE paramNaming = PARAM_NAMING_TYPE.camelCase; protected boolean enumPropertyNamingReplaceSpecialChar = false; + @Getter @Setter protected Boolean supportsES6 = false; + @Getter @Setter protected Boolean nullSafeAdditionalProps = false; protected HashSet languageGenericTypes; + @Getter @Setter protected String npmName = null; + @Getter @Setter protected String npmVersion = "1.0.0"; protected String enumSuffix = "Enum"; @@ -827,14 +831,6 @@ public void setParamNaming(String naming) { } } - public MODEL_PROPERTY_NAMING_TYPE getModelPropertyNaming() { - return modelPropertyNaming; - } - - public PARAM_NAMING_TYPE getParamNaming() { - return paramNaming; - } - private String getNameUsingParamNaming(String name) { switch (getParamNaming()) { case original: @@ -1037,38 +1033,6 @@ public Map postProcessAllModels(Map objs) return result; } - public void setSupportsES6(Boolean value) { - supportsES6 = value; - } - - public Boolean getSupportsES6() { - return supportsES6; - } - - public Boolean getNullSafeAdditionalProps() { - return nullSafeAdditionalProps; - } - - public void setNullSafeAdditionalProps(Boolean value) { - nullSafeAdditionalProps = value; - } - - public String getNpmName() { - return npmName; - } - - public void setNpmName(String npmName) { - this.npmName = npmName; - } - - public String getNpmVersion() { - return npmVersion; - } - - public void setNpmVersion(String npmVersion) { - this.npmVersion = npmVersion; - } - private void setDiscriminatorValue(CodegenModel model, String baseName, String value) { for (CodegenProperty prop : model.allVars) { if (prop.baseName.equals(baseName)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java index 9436c7482c9a..c33745d7e8a6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java @@ -17,8 +17,9 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; @@ -40,21 +41,26 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi public static final String ANDROID_GRADLE_VERSION = "androidGradleVersion"; public static final String ANDROID_SDK_VERSION = "androidSdkVersion"; public static final String ANDROID_BUILD_TOOLS_VERSION = "androidBuildToolsVersion"; + @Getter @Setter protected String invokerPackage = "org.openapitools.client"; - protected String groupId = "org.openapitools"; - protected String artifactId = "openapi-android-client"; - protected String artifactVersion = "1.0.0"; + @Setter protected String groupId = "org.openapitools"; + @Setter protected String artifactId = "openapi-android-client"; + @Setter protected String artifactVersion = "1.0.0"; protected String projectFolder = "src/main"; - protected String sourceFolder = projectFolder + "/java"; + @Setter protected String sourceFolder = projectFolder + "/java"; + @Getter @Setter protected Boolean useAndroidMavenGradlePlugin = true; + @Getter @Setter protected String androidGradleVersion; + @Getter @Setter protected String androidSdkVersion; + @Getter @Setter protected String androidBuildToolsVersion; - protected Boolean serializableModel = false; + @Setter protected Boolean serializableModel = false; // requestPackage and authPackage are used by the "volley" template/library - protected String requestPackage = "org.openapitools.client.request"; - protected String authPackage = "org.openapitools.client.auth"; + @Setter protected String requestPackage = "org.openapitools.client.request"; + @Setter protected String authPackage = "org.openapitools.client.auth"; protected String gradleWrapperPackage = "gradle.wrapper"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; @@ -498,74 +504,6 @@ public void processOpts() { } } - public Boolean getUseAndroidMavenGradlePlugin() { - return useAndroidMavenGradlePlugin; - } - - public String getAndroidGradleVersion() { - return androidGradleVersion; - } - - public String getAndroidSdkVersion() { - return androidSdkVersion; - } - - public String getAndroidBuildToolsVersion() { - return androidBuildToolsVersion; - } - - public void setUseAndroidMavenGradlePlugin(Boolean useAndroidMavenGradlePlugin) { - this.useAndroidMavenGradlePlugin = useAndroidMavenGradlePlugin; - } - - public void setAndroidGradleVersion(String androidGradleVersion) { - this.androidGradleVersion = androidGradleVersion; - } - - public void setAndroidSdkVersion(String androidSdkVersion) { - this.androidSdkVersion = androidSdkVersion; - } - - public void setAndroidBuildToolsVersion(String androidBuildToolsVersion) { - this.androidBuildToolsVersion = androidBuildToolsVersion; - } - - public String getInvokerPackage() { - return invokerPackage; - } - - public void setInvokerPackage(String invokerPackage) { - this.invokerPackage = invokerPackage; - } - - public void setRequestPackage(String requestPackage) { - this.requestPackage = requestPackage; - } - - public void setAuthPackage(String authPackage) { - this.authPackage = authPackage; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public void setArtifactId(String artifactId) { - this.artifactId = artifactId; - } - - public void setArtifactVersion(String artifactVersion) { - this.artifactVersion = artifactVersion; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - - public void setSerializableModel(Boolean serializableModel) { - this.serializableModel = serializableModel; - } - @Override public String escapeQuotationMark(String input) { // remove " to avoid code injection diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java index 7db300702521..167d1f086787 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java @@ -18,8 +18,8 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenProperty; @@ -45,9 +45,9 @@ public class ApexClientCodegen extends AbstractApexCodegen { private static final String NAMED_CREDENTIAL = "namedCredential"; private final Logger LOGGER = LoggerFactory.getLogger(ApexClientCodegen.class); private String classPrefix = "OAS"; - private String apiVersion = "42.0"; + @Setter private String apiVersion = "42.0"; private String buildMethod = "sfdx"; - private String namedCredential; + @Setter private String namedCredential; private String srcPath = "force-app/main/default/"; private String sfdxConfigPath = "config/"; private HashMap primitiveDefaults = new HashMap<>(); @@ -263,20 +263,12 @@ public void setBuildMethod(String buildMethod) { this.buildMethod = buildMethod; } - public void setNamedCredential(String namedCredential) { - this.namedCredential = namedCredential; - } - public void setClassPrefix(String classPrefix) { // the best thing we can do without namespacing in Apex modelNamePrefix = classPrefix; this.classPrefix = classPrefix; } - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - private String toApiVersion(String apiVersion) { if (apiVersion.matches("^\\d{2}(\\.0)?$")) { return apiVersion.substring(0, 2) + ".0"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java index af1e53ab7abb..abd15101b14e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java @@ -16,6 +16,8 @@ package org.openapitools.codegen.languages; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import java.io.File; @@ -153,10 +155,15 @@ public void execute(final Template.Fragment frag, final Writer out) throws IOExc protected String groupId = "org.openapitools"; protected String artifactId = "openapi-client"; protected String artifactVersion = "1.0.0"; + @Getter @Setter protected boolean headerAttributes = true; + @Getter @Setter protected boolean useIntroduction = false; + @Getter @Setter protected boolean skipExamples = false; + @Getter @Setter protected boolean useMethodAndPath = false; + @Getter @Setter protected boolean useTableTitles = false; private IncludeMarkupLambda includeSpecMarkupLambda; @@ -281,46 +288,6 @@ public String escapeUnsafeCharacters(String input) { return input; // just return the original string } - public boolean isHeaderAttributes() { - return headerAttributes; - } - - public void setHeaderAttributes(boolean headerAttributes) { - this.headerAttributes = headerAttributes; - } - - public boolean isUseIntroduction() { - return useIntroduction; - } - - public void setUseIntroduction(boolean useIntroduction) { - this.useIntroduction = useIntroduction; - } - - public boolean isSkipExamples() { - return skipExamples; - } - - public void setSkipExamples(boolean skipExamples) { - this.skipExamples = skipExamples; - } - - public boolean isUseMethodAndPath() { - return useMethodAndPath; - } - - public void setUseMethodAndPath(boolean useMethodAndPath) { - this.useMethodAndPath = useMethodAndPath; - } - - public boolean isUseTableTitles() { - return useTableTitles; - } - - public void setUseTableTitles(boolean useTableTitles) { - this.useTableTitles = useTableTitles; - } - @Override public void processOpts() { super.processOpts(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java index b649982f2040..9f6506e254f1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java @@ -21,6 +21,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; @@ -64,7 +65,7 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen { public static final String USE_DEFAULT_ROUTING = "useDefaultRouting"; public static final String NEWTONSOFT_VERSION = "newtonsoftVersion"; - private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; + @Setter private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; private String userSecretsGuid = randomUUID().toString(); protected final Logger LOGGER = LoggerFactory.getLogger(AspNetServerCodegen.class); @@ -307,11 +308,6 @@ protected Set getNullableTypes() { "DateTime", "DateOnly", "DateTimeOffset", "Guid")); } - @Override - protected Set getValueTypes() { - return new HashSet<>(Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double", "DateTime", "DateOnly", "DateTimeOffset", "Guid")); - } - @Override public CodegenType getTag() { return CodegenType.SERVER; @@ -472,10 +468,6 @@ protected boolean useNet60OrLater() { return additionalProperties.containsKey(NET_60_OR_LATER); } - public void setPackageGuid(String packageGuid) { - this.packageGuid = packageGuid; - } - @Override public String apiFileFolder() { return outputFolder + File.separator + sourceFolder + File.separator + packageName + File.separator + "Controllers"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java index a38e556de493..5a989fe113ab 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java @@ -22,10 +22,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.servers.Server; +import lombok.Setter; import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -44,14 +44,14 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig { protected String apiVersion = "1.0.0"; - protected String curlOptions; - protected boolean processMarkdown = false; - protected String scriptName = "client.sh"; - protected boolean generateBashCompletion = false; - protected boolean generateZshCompletion = false; - protected String hostEnvironmentVariable; - protected String basicAuthEnvironmentVariable; - protected String apiKeyAuthEnvironmentVariable; + @Setter protected String curlOptions; + @Setter protected boolean processMarkdown = false; + @Setter protected String scriptName = "client.sh"; + @Setter protected boolean generateBashCompletion = false; + @Setter protected boolean generateZshCompletion = false; + @Setter protected String hostEnvironmentVariable; + @Setter protected String basicAuthEnvironmentVariable; + @Setter protected String apiKeyAuthEnvironmentVariable; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; @@ -333,40 +333,6 @@ public void processOpts() { "Dockerfile.mustache", "", "Dockerfile")); } - public void setCurlOptions(String curlOptions) { - this.curlOptions = curlOptions; - } - - public void setProcessMarkdown(boolean processMarkdown) { - this.processMarkdown = processMarkdown; - } - - public void setScriptName(String scriptName) { - this.scriptName = scriptName; - } - - public void setGenerateBashCompletion(boolean generateBashCompletion) { - this.generateBashCompletion = generateBashCompletion; - } - - public void setGenerateZshCompletion(boolean generateZshCompletion) { - this.generateZshCompletion = generateZshCompletion; - } - - public void setHostEnvironmentVariable(String hostEnvironmentVariable) { - this.hostEnvironmentVariable = hostEnvironmentVariable; - } - - public void setBasicAuthEnvironmentVariable(String - basicAuthEnvironmentVariable) { - this.basicAuthEnvironmentVariable = basicAuthEnvironmentVariable; - } - - public void setApiKeyAuthEnvironmentVariable(String - apiKeyAuthEnvironmentVariable) { - this.apiKeyAuthEnvironmentVariable = apiKeyAuthEnvironmentVariable; - } - /** * Escapes a reserved word as defined in the `reservedWords` array. Handle diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java index f634fa4a451d..8355e1148455 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java @@ -21,6 +21,8 @@ import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.servers.Server; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; @@ -91,8 +93,8 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { ); private static FrameworkStrategy latestFramework = frameworkStrategies.get(frameworkStrategies.size() - 1); protected final Map frameworks; - protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; - protected String clientPackage = "Client"; + @Setter protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; + @Setter protected String clientPackage = "Client"; protected String authFolder = "Auth"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; @@ -110,16 +112,17 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { protected boolean supportsFileParameters = Boolean.TRUE; protected boolean supportsDateOnly = Boolean.FALSE; - protected boolean validatable = Boolean.TRUE; - protected boolean equatable = Boolean.FALSE; + @Setter protected boolean validatable = Boolean.TRUE; + @Setter protected boolean equatable = Boolean.FALSE; // By default, generated code is considered public + @Getter @Setter protected boolean nonPublicApi = Boolean.FALSE; protected boolean caseInsensitiveResponseHeaders = Boolean.FALSE; protected String releaseNote = "Minor update"; - protected String licenseId; - protected String packageTags; - protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup + @Setter protected String licenseId; + @Setter protected String packageTags; + @Setter protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup protected boolean needsCustomHttpMethod = false; protected boolean needsUriBuilder = false; @@ -575,14 +578,6 @@ public CodegenType getTag() { return CodegenType.CLIENT; } - public boolean isNonPublicApi() { - return nonPublicApi; - } - - public void setNonPublicApi(final boolean nonPublicApi) { - this.nonPublicApi = nonPublicApi; - } - @Override public String modelDocFileFolder() { if (GENERICHOST.equals(getLibrary())) { @@ -855,10 +850,6 @@ public void setUseSourceGeneration(final Boolean useSourceGeneration) { this.useSourceGeneration = useSourceGeneration; } - public void setClientPackage(String clientPackage) { - this.clientPackage = clientPackage; - } - @Override public CodegenOperation fromOperation(String path, String httpMethod, @@ -1057,11 +1048,7 @@ public void setConditionalSerialization(boolean flag) { public void setOptionalProjectFileFlag(boolean flag) { this.optionalProjectFileFlag = flag; } - - public void setPackageGuid(String packageGuid) { - this.packageGuid = packageGuid; - } - + /** * Sets the api name. This value must be a valid class name. * @@ -1136,35 +1123,15 @@ public void setTargetFrameworkNuget(List strategies) { .collect(Collectors.joining(";")); } - public void setValidatable(boolean validatable) { - this.validatable = validatable; - } - - public void setEquatable(boolean equatable) { - this.equatable = equatable; - } - public void setCaseInsensitiveResponseHeaders(final Boolean caseInsensitiveResponseHeaders) { this.caseInsensitiveResponseHeaders = caseInsensitiveResponseHeaders; } - public void setLicenseId(String licenseId) { - this.licenseId = licenseId; - } - @Override public void setReleaseNote(String releaseNote) { this.releaseNote = releaseNote; } - public void setPackageTags(String packageTags) { - this.packageTags = packageTags; - } - - public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) { - this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup; - } - public boolean getUseOneOfDiscriminatorLookup() { return this.useOneOfDiscriminatorLookup; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java index 9aaffde2c104..4871f6d44fd3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java @@ -20,6 +20,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; @@ -55,7 +56,7 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen { public static final String NEWTONSOFT_VERSION = "newtonsoftVersion"; public static final String NET_60_OR_LATER = "net60OrLater"; - private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; + @Setter private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; private String userSecretsGuid = randomUUID().toString(); protected final Logger LOGGER = LoggerFactory.getLogger(AspNetServerCodegen.class); @@ -388,10 +389,6 @@ public void processOpts() { this.setTypeMapping(); } - public void setPackageGuid(String packageGuid) { - this.packageGuid = packageGuid; - } - @Override public String apiFileFolder() { return outputFolder + File.separator + sourceFolder + File.separator + packageName + File.separator + "Functions"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java index 44c30344ccc5..86652a8520c3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java @@ -18,9 +18,9 @@ import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache; -import io.swagger.v3.oas.models.media.ArraySchema; -import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; @@ -75,7 +75,7 @@ public class CSharpReducedClientCodegen extends AbstractCSharpCodegen { ); private static FrameworkStrategy defaultFramework = FrameworkStrategy.NETSTANDARD_2_0; protected final Map frameworks; - protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; + @Setter protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; protected String clientPackage = "Org.OpenAPITools.Client"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; @@ -91,16 +91,17 @@ public class CSharpReducedClientCodegen extends AbstractCSharpCodegen { protected boolean supportsAsync = Boolean.TRUE; protected boolean netStandard = Boolean.FALSE; - protected boolean validatable = Boolean.TRUE; + @Setter protected boolean validatable = Boolean.TRUE; protected Map regexModifiers; // By default, generated code is considered public + @Getter @Setter protected boolean nonPublicApi = Boolean.FALSE; protected boolean caseInsensitiveResponseHeaders = Boolean.FALSE; protected String releaseNote = "Minor update"; - protected String licenseId; - protected String packageTags; - protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup + @Setter protected String licenseId; + @Setter protected String packageTags; + @Setter protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup protected boolean needsCustomHttpMethod = false; protected boolean needsUriBuilder = false; @@ -484,14 +485,6 @@ public CodegenType getTag() { return CodegenType.CLIENT; } - public boolean isNonPublicApi() { - return nonPublicApi; - } - - public void setNonPublicApi(final boolean nonPublicApi) { - this.nonPublicApi = nonPublicApi; - } - @Override public String modelDocFileFolder() { return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar); @@ -753,10 +746,6 @@ public void setOptionalProjectFileFlag(boolean flag) { this.optionalProjectFileFlag = flag; } - public void setPackageGuid(String packageGuid) { - this.packageGuid = packageGuid; - } - @Override public void setPackageName(String packageName) { this.packageName = packageName; @@ -821,31 +810,15 @@ public void setTargetFrameworkNuget(List strategies) { .collect(Collectors.joining(";")); } - public void setValidatable(boolean validatable) { - this.validatable = validatable; - } - public void setCaseInsensitiveResponseHeaders(final Boolean caseInsensitiveResponseHeaders) { this.caseInsensitiveResponseHeaders = caseInsensitiveResponseHeaders; } - public void setLicenseId(String licenseId) { - this.licenseId = licenseId; - } - @Override public void setReleaseNote(String releaseNote) { this.releaseNote = releaseNote; } - public void setPackageTags(String packageTags) { - this.packageTags = packageTags; - } - - public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) { - this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup; - } - public boolean getUseOneOfDiscriminatorLookup() { return this.useOneOfDiscriminatorLookup; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java index 8af296e05e00..fefb7255e030 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java @@ -21,7 +21,6 @@ import io.swagger.v3.oas.models.info.Contact; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java index b4ff2e32d2ab..52f7eff818f6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java index 76e66f62792a..86dc9997010e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java @@ -1,6 +1,5 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; import org.apache.commons.lang3.StringUtils; @@ -367,11 +366,6 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List allModels) { objs = super.postProcessOperationsWithModels(objs, allModels); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java index 5808719fd559..55d383a6b26f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerDeprecatedCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerDeprecatedCodegen.java index cd79aa682b58..603e81e00308 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerDeprecatedCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerDeprecatedCodegen.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java index 54aa49b51886..c316f1c7a31a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java @@ -16,8 +16,8 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.CodegenModel; @@ -52,7 +52,7 @@ public class CppUE4ClientCodegen extends AbstractCppCodegen { // Will be included using the <> syntax, not used in Unreal's coding convention protected Set systemIncludes = new HashSet<>(); protected String cppNamespace = unrealModuleName; - protected boolean optionalProjectFileFlag = true; + @Setter protected boolean optionalProjectFileFlag = true; public CppUE4ClientCodegen() { super(); @@ -246,10 +246,6 @@ public void processOpts() { } } - public void setOptionalProjectFileFlag(boolean flag) { - this.optionalProjectFileFlag = flag; - } - // override to post-process any model properties @Override @SuppressWarnings("unused") @@ -561,17 +557,6 @@ public String toApiName(String type) { return modelNamePrefix + camelize(type) + "Api"; } - @Override - public String escapeQuotationMark(String input) { - // remove " to avoid code injection - return input.replace("\"", ""); - } - - @Override - public String escapeUnsafeCharacters(String input) { - return input.replace("*/", "*_/").replace("/*", "/_*"); - } - @Override public String toBooleanGetter(String name) { return "Is" + getterAndSetterCapitalize(name); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java index ac13c05d3181..cd7c18145c6a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java @@ -16,8 +16,8 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -50,17 +50,17 @@ public class CrystalClientCodegen extends DefaultCodegen { private static final String NUMERIC_ENUM_PREFIX = "N"; protected static int emptyMethodNameCounter = 0; - protected String shardName = "openapi_client"; - protected String moduleName = "OpenAPIClient"; - protected String shardVersion = "1.0.0"; + @Setter protected String shardName = "openapi_client"; + @Setter protected String moduleName = "OpenAPIClient"; + @Setter protected String shardVersion = "1.0.0"; protected String specFolder = "spec"; protected String srcFolder = "src"; - protected String shardLicense = "unlicense"; - protected String shardHomepage = "https://openapitools.org"; - protected String shardSummary = "A Crystal SDK for the REST API"; - protected String shardDescription = "This shard maps to a REST API"; - protected String shardAuthor = ""; - protected String shardAuthorEmail = ""; + @Setter protected String shardLicense = "unlicense"; + @Setter protected String shardHomepage = "https://openapitools.org"; + @Setter protected String shardSummary = "A Crystal SDK for the REST API"; + @Setter protected String shardDescription = "This shard maps to a REST API"; + @Setter protected String shardAuthor = ""; + @Setter protected String shardAuthorEmail = ""; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; protected List primitiveTypes = new ArrayList(); @@ -547,42 +547,6 @@ public String toApiImport(String name) { return shardName + "/" + apiPackage() + "/" + toApiFilename(name); } - public void setShardName(String shardName) { - this.shardName = shardName; - } - - public void setModuleName(String moduleName) { - this.moduleName = moduleName; - } - - public void setShardVersion(String shardVersion) { - this.shardVersion = shardVersion; - } - - public void setShardDescription(String shardDescription) { - this.shardDescription = shardDescription; - } - - public void setShardSummary(String shardSummary) { - this.shardSummary = shardSummary; - } - - public void setShardLicense(String shardLicense) { - this.shardLicense = shardLicense; - } - - public void setShardHomepage(String shardHomepage) { - this.shardHomepage = shardHomepage; - } - - public void setShardAuthor(String shardAuthor) { - this.shardAuthor = shardAuthor; - } - - public void setShardAuthorEmail(String shardAuthorEmail) { - this.shardAuthorEmail = shardAuthorEmail; - } - @Override protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) { final Schema additionalProperties = ModelUtils.getAdditionalProperties(schema); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java index 7fa0d521e72f..95a49a9ee44e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java @@ -19,9 +19,10 @@ import com.google.common.collect.Sets; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.Discriminator; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -73,9 +74,12 @@ public class DartDioClientCodegen extends AbstractDartCodegen { private static final String CLIENT_NAME = "clientName"; + @Getter @Setter private String dateLibrary; + @Getter @Setter private String equalityCheckMethod; + @Getter @Setter private String clientName; private TemplateManager templateManager; @@ -137,30 +141,6 @@ public DartDioClientCodegen() { cliOptions.add(finalProperties); } - public String getDateLibrary() { - return dateLibrary; - } - - public void setDateLibrary(String library) { - this.dateLibrary = library; - } - - public String getEqualityCheckMethod() { - return equalityCheckMethod; - } - - public void setEqualityCheckMethod(String equalityCheckMethod) { - this.equalityCheckMethod = equalityCheckMethod; - } - - public String getClientName() { - return clientName; - } - - public void setClientName(String clientName) { - this.clientName = clientName; - } - @Override public String getName() { return "dart-dio"; @@ -790,13 +770,13 @@ static class BuiltValueSerializer { final boolean isArray; - final boolean uniqueItems; + @Getter final boolean uniqueItems; final boolean isMap; final boolean isNullable; - final String dataType; + @Getter final String dataType; private BuiltValueSerializer(boolean isArray, boolean uniqueItems, boolean isMap, boolean isNullable, String dataType) { this.isArray = isArray; @@ -810,10 +790,6 @@ public boolean isArray() { return isArray; } - public boolean isUniqueItems() { - return uniqueItems; - } - public boolean isMap() { return isMap; } @@ -822,10 +798,6 @@ public boolean isNullable() { return isNullable; } - public String getDataType() { - return dataType; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java index 9c5b6f0d5a27..af66fcf53e39 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java @@ -17,6 +17,7 @@ package org.openapitools.codegen.languages; +import lombok.Setter; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.CodegenType; @@ -34,8 +35,8 @@ public class EiffelClientCodegen extends AbstractEiffelCodegen { private final Logger LOGGER = LoggerFactory.getLogger(EiffelClientCodegen.class); protected String libraryTarget = "openapi_eiffel_client"; - protected String packageName = "Eiffel"; - protected String packageVersion = "1.0.0"; + @Setter protected String packageName = "Eiffel"; + @Setter protected String packageVersion = "1.0.0"; protected String apiDocPath = "docs"; protected String modelDocPath = "docs"; protected String modelPath = "domain"; @@ -170,10 +171,12 @@ public String apiFileFolder() { return outputFolder + File.separator + "src" + File.separator + "api"; } + @Override public String modelFileFolder() { return outputFolder + File.separator + "src" + File.separator + modelPath; } + @Override public String apiTestFileFolder() { return outputFolder + File.separator + "test" + File.separator + "apis"; } @@ -188,14 +191,6 @@ public String modelDocFileFolder() { return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar); } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - @Override public String toEnumName(CodegenProperty property) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java index 658560e51da6..690cdb7f7ec1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java @@ -21,9 +21,10 @@ import com.samskivert.mustache.Template; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.responses.ApiResponse; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; @@ -50,7 +51,7 @@ public class ElixirClientCodegen extends DefaultCodegen { private final Pattern simpleAtomPattern = Pattern.compile("\\A(?:(?:[_@\\p{Alpha}][_@\\p{Alnum}]*[?!]?)|-)\\z"); protected String apiVersion = "1.0.0"; - protected String moduleName; + @Setter protected String moduleName; protected static final String defaultModuleName = "OpenAPI.Client"; // This is the name of elixir project name; @@ -699,7 +700,7 @@ public String decodedStruct() { } - class ExtendedCodegenOperation extends CodegenOperation { + @Getter @Setter class ExtendedCodegenOperation extends CodegenOperation { private List pathTemplateNames = new ArrayList<>(); private String replacedPathName; @@ -762,22 +763,6 @@ public ExtendedCodegenOperation(CodegenOperation o) { this.operationIdCamelCase = o.operationIdCamelCase; } - public List getPathTemplateNames() { - return pathTemplateNames; - } - - public void setPathTemplateNames(List pathTemplateNames) { - this.pathTemplateNames = pathTemplateNames; - } - - public String getReplacedPathName() { - return replacedPathName; - } - - public void setReplacedPathName(String replacedPathName) { - this.replacedPathName = replacedPathName; - } - private void translateBaseType(StringBuilder returnEntry, String baseType) { switch (baseType) { case "AnyType": @@ -996,10 +981,6 @@ public String escapeUnsafeCharacters(String input) { return input; } - public void setModuleName(String moduleName) { - this.moduleName = moduleName; - } - @Override public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.ELIXIR; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java index c27645f7a68d..3bc81accdc3a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java @@ -21,7 +21,6 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Template; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -52,6 +51,7 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig { protected String packageName = "openapi"; protected String packageVersion = "1.0.0"; + @Override public CodegenType getTag() { return CodegenType.CLIENT; } @@ -61,6 +61,7 @@ public String getName() { return "elm"; } + @Override public String getHelp() { return "Generates an Elm client library."; } @@ -273,6 +274,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert } } + @Override @SuppressWarnings({"static-method", "unchecked"}) public Map postProcessAllModels(final Map orgObjs) { final Map objs = super.postProcessAllModels(orgObjs); @@ -403,6 +405,7 @@ private static boolean itemsIncludesType(CodegenProperty p, Predicate { + @Override public int compare(final CodegenParameter p1, final CodegenParameter p2) { return index(p1) - index(p2); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java index f5032301b739..4998ba2f404f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java @@ -20,6 +20,8 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; @@ -42,18 +44,21 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(ErlangClientCodegen.class); - protected String packageName = "openapi"; - protected String packageVersion = "1.0.0"; + @Setter protected String packageName = "openapi"; + @Setter protected String packageVersion = "1.0.0"; protected String sourceFolder = "src"; + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "erlang-client"; } + @Override public String getHelp() { return "Generates an Erlang client library (beta)."; } @@ -347,14 +352,6 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List pathTemplateNames = new ArrayList(); + @Getter @Setter private String replacedPathName; String arityRequired; String arityOptional; @@ -463,21 +462,6 @@ public ExtendedCodegenOperation(CodegenOperation o) { this.operationIdCamelCase = o.operationIdCamelCase; } - public List getPathTemplateNames() { - return pathTemplateNames; - } - - public void setPathTemplateNames(List pathTemplateNames) { - this.pathTemplateNames = pathTemplateNames; - } - - public String getReplacedPathName() { - return replacedPathName; - } - - public void setReplacedPathName(String replacedPathName) { - this.replacedPathName = replacedPathName; - } } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java index cd57040f7300..ab03c7c55d3e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java @@ -18,8 +18,9 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; @@ -43,19 +44,22 @@ public class ErlangProperCodegen extends DefaultCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(ErlangProperCodegen.class); - protected String packageName = "openapi"; - protected String packageVersion = "1.0.0"; + @Setter protected String packageName = "openapi"; + @Setter protected String packageVersion = "1.0.0"; protected String sourceFolder = "src"; protected String modelFolder = "model"; + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "erlang-proper"; } + @Override public String getHelp() { return "Generates an Erlang library with PropEr generators (beta)."; } @@ -399,14 +403,6 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List postProcessSupportingFileData(Map obj return super.postProcessSupportingFileData(objs); } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setOpenApiSpecName(String openApiSpecName) { - this.openApiSpecName = openApiSpecName; - } - protected String toHandlerName(String name) { return toModuleName(name) + "_handler"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpFunctionsServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpFunctionsServerCodegen.java index a924aa6fb5e1..34ff9c7bf29b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpFunctionsServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpFunctionsServerCodegen.java @@ -31,14 +31,17 @@ public class FsharpFunctionsServerCodegen extends AbstractFSharpCodegen { final Logger LOGGER = LoggerFactory.getLogger(FsharpFunctionsServerCodegen.class); + @Override public CodegenType getTag() { return CodegenType.SERVER; } + @Override public String getName() { return "fsharp-functions"; } + @Override public String getHelp() { return "Generates a fsharp-functions server (beta)."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java index 1bc6d6bf8c36..e0b1a765cd0f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java @@ -19,6 +19,7 @@ import com.samskivert.mustache.Mustache; import io.swagger.v3.oas.models.OpenAPI; +import lombok.Setter; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenType; @@ -47,7 +48,7 @@ public class FsharpGiraffeServerCodegen extends AbstractFSharpCodegen { public static final String SDK_WEB = "Microsoft.NET.Sdk.Web"; public static final String SDK_LIB = "Microsoft.NET.Sdk"; - private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; + @Setter private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; @SuppressWarnings("hiding") protected final Logger LOGGER = LoggerFactory.getLogger(FsharpGiraffeServerCodegen.class); @@ -211,10 +212,6 @@ public void processOpts() { LOGGER.warn("Swashbuckle flag not currently supported, this will be ignored."); } - public void setPackageGuid(String packageGuid) { - this.packageGuid = packageGuid; - } - @Override public String modelFileFolder() { return super.modelFileFolder().replace("Model", "model"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java index 060dfc277d73..b4d75b60e230 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java @@ -19,9 +19,9 @@ import com.google.common.collect.Iterables; import com.samskivert.mustache.Mustache; -import com.samskivert.mustache.Template; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.GeneratorMetadata; @@ -37,8 +37,6 @@ import org.slf4j.LoggerFactory; import java.io.File; -import java.io.IOException; -import java.io.Writer; import java.util.*; import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER; @@ -47,7 +45,7 @@ public class GoClientCodegen extends AbstractGoCodegen { private final Logger LOGGER = LoggerFactory.getLogger(GoClientCodegen.class); - protected String packageVersion = "1.0.0"; + @Setter protected String packageVersion = "1.0.0"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; protected String modelFileFolder = null; @@ -57,9 +55,9 @@ public class GoClientCodegen extends AbstractGoCodegen { public static final String GENERATE_INTERFACES = "generateInterfaces"; public static final String MODEL_FILE_FOLDER = "modelFileFolder"; public static final String WITH_GO_MOD = "withGoMod"; - protected String goImportAlias = "openapiclient"; + @Setter protected String goImportAlias = "openapiclient"; protected boolean isGoSubmodule = false; - protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup + @Setter protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup // A cache to efficiently lookup schema `toModelName()` based on the schema Key private Map schemaKeyToModelNameCache = new HashMap<>(); @@ -169,7 +167,7 @@ public String getName() { * Configures the type of generator. * * @return the CodegenType for this generator - * @see org.openapitools.codegen.CodegenType + * @see CodegenType */ @Override public CodegenType getTag() { @@ -312,22 +310,10 @@ public void processOpts() { supportingFiles.add(new SupportingFile("utils.mustache", "", "utils.go")); } - public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) { - this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup; - } - public boolean getUseOneOfDiscriminatorLookup() { return this.useOneOfDiscriminatorLookup; } - public void setGoImportAlias(String goImportAlias) { - this.goImportAlias = goImportAlias; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - public void setIsGoSubmodule(boolean isGoSubmodule) { this.isGoSubmodule = isGoSubmodule; } @@ -374,12 +360,6 @@ public String toModelDocFilename(String name) { return toModelName(name); } - @Override - public String toApiDocFilename(String name) { - return toApiName(name); - } - - @Override public String toModelName(String name) { if (schemaKeyToModelNameCache.containsKey(name)) { @@ -392,6 +372,7 @@ public String toModelName(String name) { return camelizedName; } + @Override public String escapeReservedWord(String name) { if (this.reservedWordsMappings().containsKey(name)) { return this.reservedWordsMappings().get(name); @@ -424,7 +405,7 @@ public void updateCodegenPropertyEnum(CodegenProperty var) { /** * Determines if at least one of the allOf pieces of a schema are of type string * - * @param p + * @param schema * @return */ private boolean isAllOfStringSchema(Schema schema) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoEchoServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoEchoServerCodegen.java index ed1f4ca40e30..621494b0c7a5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoEchoServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoEchoServerCodegen.java @@ -28,7 +28,6 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.List; -import java.util.Map; public class GoEchoServerCodegen extends AbstractGoCodegen { protected String apiVersion = "1.0.0"; @@ -40,14 +39,17 @@ public class GoEchoServerCodegen extends AbstractGoCodegen { private static final String API_PACKAGE_NAME = "handlers"; private static final String OUTPUT_PATH = "generated-code" + File.separator + "go-echo-server"; + @Override public CodegenType getTag() { return CodegenType.SERVER; } + @Override public String getName() { return "go-echo-server"; } + @Override public String getHelp() { return "Generates a go-echo server. (Beta)"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoGinServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoGinServerCodegen.java index 34d7a80cbebd..6d18e6b89244 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoGinServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoGinServerCodegen.java @@ -16,6 +16,7 @@ package org.openapitools.codegen.languages; +import lombok.Setter; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenOperation; @@ -32,7 +33,6 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.List; -import java.util.Map; public class GoGinServerCodegen extends AbstractGoCodegen { @@ -40,7 +40,7 @@ public class GoGinServerCodegen extends AbstractGoCodegen { public static final String INTERFACE_ONLY = "interfaceOnly"; - protected boolean interfaceOnly = false; + @Setter protected boolean interfaceOnly = false; protected String apiVersion = "1.0.0"; protected int serverPort = 8080; @@ -209,10 +209,6 @@ public void processOpts() { supportingFiles.add(new SupportingFile("go.mod.mustache", "go.mod")); } - public void setInterfaceOnly(boolean interfaceOnly) { - this.interfaceOnly = interfaceOnly; - } - @Override public String apiPackage() { return apiPath; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java index b0c7b93edcad..d38c62e5b2b5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java @@ -18,6 +18,7 @@ package org.openapitools.codegen.languages; import com.google.common.collect.Iterables; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; @@ -52,14 +53,14 @@ public class GoServerCodegen extends AbstractGoCodegen { private final Logger LOGGER = LoggerFactory.getLogger(GoServerCodegen.class); - protected String packageVersion = "1.0.0"; - protected int serverPort = 8080; + @Setter protected String packageVersion = "1.0.0"; + @Setter protected int serverPort = 8080; protected String projectName = "openapi-server"; - protected String sourceFolder = "go"; + @Setter protected String sourceFolder = "go"; protected Boolean corsFeatureEnabled = false; - protected Boolean addResponseHeaders = false; - protected Boolean outputAsLibrary = false; - protected Boolean onlyInterfaces = false; + @Setter protected Boolean addResponseHeaders = false; + @Setter protected Boolean outputAsLibrary = false; + @Setter protected Boolean onlyInterfaces = false; public GoServerCodegen() { @@ -474,32 +475,8 @@ public String modelFileFolder() { return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar); } - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - - public void setServerPort(int serverPort) { - this.serverPort = serverPort; - } - public void setFeatureCORS(Boolean featureCORS) { this.corsFeatureEnabled = featureCORS; } - public void setAddResponseHeaders(Boolean addResponseHeaders) { - this.addResponseHeaders = addResponseHeaders; - } - - public void setOnlyInterfaces(Boolean onlyInterfaces) { - this.onlyInterfaces = onlyInterfaces; - } - - public void setOutputAsLibrary(Boolean outputAsLibrary) { - this.outputAsLibrary = outputAsLibrary; - } - } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLNodeJSExpressServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLNodeJSExpressServerCodegen.java index 8a32d2ccf5fb..9e74139e5463 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLNodeJSExpressServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLNodeJSExpressServerCodegen.java @@ -16,7 +16,6 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLSchemaCodegen.java index 5215b9d3bed0..4d1b4127e6f4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLSchemaCodegen.java @@ -32,10 +32,12 @@ public CodegenType getTag() { return CodegenType.SCHEMA; } + @Override public String getName() { return "graphql-schema"; } + @Override public String getHelp() { return "Generates GraphQL schema files (beta)"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java index 1c0bff0c1be2..1b194c7a4da9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java @@ -22,7 +22,6 @@ import java.io.File; import java.util.EnumSet; import java.util.List; -import java.util.Map; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.ClientModificationFeature; @@ -154,11 +153,6 @@ public String escapeQuotationMark(String input) { return input.replace("'", ""); } - @Override - public String escapeUnsafeCharacters(String input) { - return input.replace("*/", "*_/").replace("/*", "/_*"); - } - @Override public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.GROOVY; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java index a879e5b28a46..fbbfae50a3bf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java @@ -19,7 +19,6 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; import org.apache.commons.io.FilenameUtils; @@ -147,14 +146,17 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC final private static Pattern CONTAINS_JSON_MIME_PATTERN = Pattern.compile("(?i)application/.*json(;.*)?"); + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "haskell-http-client"; } + @Override public String getHelp() { return "Generates a Haskell http-client library."; } @@ -1214,6 +1216,7 @@ public String toModelFilename(String name) { return toTypeName("Model", name); } + @Override public String toApiName(String name) { if (name.length() == 0) { return "Default"; @@ -1434,6 +1437,7 @@ public String toEnumValue(String value, String datatype) { } // override with any special text escaping logic + @Override @SuppressWarnings("static-method") public String escapeText(String input) { if (input == null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java index c1fd7e15adaa..a7785024a06f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java @@ -19,7 +19,6 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.servers.Server; import org.apache.commons.io.FilenameUtils; @@ -59,6 +58,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf * * @return the CodegenType for this generator */ + @Override public CodegenType getTag() { return CodegenType.SERVER; } @@ -69,6 +69,7 @@ public CodegenType getTag() { * * @return the friendly name for the generator */ + @Override public String getName() { return "haskell"; } @@ -79,6 +80,7 @@ public String getName() { * * @return A string value for the help message */ + @Override public String getHelp() { return "Generates a Haskell server and client library."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java index 0bd106d632e5..f3587ad772f4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java @@ -19,9 +19,10 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.servers.Server; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -49,37 +50,26 @@ public class HaskellYesodServerCodegen extends DefaultCodegen implements Codegen private final Logger LOGGER = LoggerFactory.getLogger(HaskellYesodServerCodegen.class); + @Getter @Setter protected String projectName; + @Getter @Setter protected String apiModuleName; + @Override public CodegenType getTag() { return CodegenType.SERVER; } + @Override public String getName() { return "haskell-yesod"; } + @Override public String getHelp() { return "Generates a haskell-yesod server."; } - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public String getApiModuleName() { - return apiModuleName; - } - - public void setApiModuleName(String apiModuleName) { - this.apiModuleName = apiModuleName; - } - public HaskellYesodServerCodegen() { super(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java index 3d8ac3561f8a..d005f54111b6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java @@ -20,7 +20,6 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.CodegenType; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java index 032668cee009..012244ab247a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java @@ -18,6 +18,8 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.Operation; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.languages.features.BeanValidationFeatures; import org.openapitools.codegen.languages.features.GzipTestFeatures; @@ -45,17 +47,17 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen public static final String USE_ABSTRACTION_FOR_FILES = "useAbstractionForFiles"; - protected boolean useBeanValidation = false; + @Getter protected boolean useBeanValidation = false; - protected boolean useGenericResponse = false; + @Getter protected boolean useGenericResponse = false; - protected boolean useGzipFeatureForTests = false; + @Getter protected boolean useGzipFeatureForTests = false; - protected boolean useLoggingFeatureForTests = false; + @Getter protected boolean useLoggingFeatureForTests = false; - private boolean useJackson = false; + @Getter private boolean useJackson = false; - protected boolean useAbstractionForFiles = false; + @Setter protected boolean useAbstractionForFiles = false; public JavaCXFClientCodegen() { super(); @@ -193,42 +195,19 @@ public void setUseBeanValidation(boolean useBeanValidation) { this.useBeanValidation = useBeanValidation; } - public boolean isUseBeanValidation() { - return useBeanValidation; - } - @Override public void setUseGzipFeatureForTests(boolean useGzipFeatureForTests) { this.useGzipFeatureForTests = useGzipFeatureForTests; } - public boolean isUseGzipFeatureForTests() { - return useGzipFeatureForTests; - } - @Override public void setUseLoggingFeatureForTests(boolean useLoggingFeatureForTests) { this.useLoggingFeatureForTests = useLoggingFeatureForTests; } - public boolean isUseLoggingFeatureForTests() { - return useLoggingFeatureForTests; - } - @Override public void setUseGenericResponse(boolean useGenericResponse) { this.useGenericResponse = useGenericResponse; } - public boolean isUseGenericResponse() { - return useGenericResponse; - } - - public boolean isUseJackson() { - return useJackson; - } - - public void setUseAbstractionForFiles(boolean useAbstractionForFiles) { - this.useAbstractionForFiles = useAbstractionForFiles; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java index 34e959361719..1345eb48558e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java @@ -27,6 +27,7 @@ import java.text.SimpleDateFormat; import java.util.*; +import lombok.Setter; import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CliOption; @@ -312,19 +313,19 @@ public String toString() { private final Map REGEX_GENERATORS = new HashMap<>(); - protected boolean generateOperationBody = false; + @Setter protected boolean generateOperationBody = false; - protected boolean loadTestDataFromFile = false; + @Setter protected boolean loadTestDataFromFile = false; - protected boolean supportMultipleSpringServices = false; + @Setter protected boolean supportMultipleSpringServices = false; protected JsonCache testDataCache = null; protected JsonCache testDataControlCache = null; - protected File testDataFile = null; + @Setter protected File testDataFile = null; - protected File testDataControlFile = null; + @Setter protected File testDataControlFile = null; public JavaCXFExtServerCodegen() { super(); @@ -1403,26 +1404,6 @@ public void processOpts() { } } - public void setGenerateOperationBody(boolean generateOperationBody) { - this.generateOperationBody = generateOperationBody; - } - - public void setLoadTestDataFromFile(boolean loadTestDataFromFile) { - this.loadTestDataFromFile = loadTestDataFromFile; - } - - public void setSupportMultipleSpringServices(boolean supportMultipleSpringServices) { - this.supportMultipleSpringServices = supportMultipleSpringServices; - } - - public void setTestDataControlFile(File testDataControlFile) { - this.testDataControlFile = testDataControlFile; - } - - public void setTestDataFile(File testDataFile) { - this.testDataFile = testDataFile; - } - @Override public String toDefaultValue(Schema p) { if (ModelUtils.isGenerateAliasAsModel(p) && StringUtils.isNotEmpty(p.get$ref())) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java index 26c99103f236..e654df607402 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java @@ -17,8 +17,7 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ComposedSchema; -import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.languages.features.CXFServerFeatures; import org.openapitools.codegen.languages.features.GzipTestFeatures; @@ -26,7 +25,6 @@ import org.openapitools.codegen.languages.features.UseGenericResponseFeatures; import org.openapitools.codegen.model.ModelMap; import org.openapitools.codegen.model.OperationsMap; -import org.openapitools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,41 +37,41 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen public static final String USE_ABSTRACTION_FOR_FILES = "useAbstractionForFiles"; - protected boolean addConsumesProducesJson = true; + @Setter protected boolean addConsumesProducesJson = true; - protected boolean generateSpringApplication = false; + @Setter protected boolean generateSpringApplication = false; - protected boolean useSpringAnnotationConfig = false; + @Setter protected boolean useSpringAnnotationConfig = false; - protected boolean useSwaggerFeature = false; + @Setter protected boolean useSwaggerFeature = false; - protected boolean useSwaggerUI = false; + @Setter protected boolean useSwaggerUI = false; - protected boolean useWadlFeature = false; + @Setter protected boolean useWadlFeature = false; - protected boolean useMultipartFeature = false; + @Setter protected boolean useMultipartFeature = false; - protected boolean useBeanValidationFeature = false; + @Setter protected boolean useBeanValidationFeature = false; - protected boolean generateSpringBootApplication = false; + @Setter protected boolean generateSpringBootApplication = false; - protected boolean generateJbossDeploymentDescriptor = false; + @Setter protected boolean generateJbossDeploymentDescriptor = false; - protected boolean useGzipFeature = false; + @Setter protected boolean useGzipFeature = false; - protected boolean useGzipFeatureForTests = false; + @Setter protected boolean useGzipFeatureForTests = false; - protected boolean useLoggingFeature = false; + @Setter protected boolean useLoggingFeature = false; - protected boolean useLoggingFeatureForTests = false; + @Setter protected boolean useLoggingFeatureForTests = false; - protected boolean useAnnotatedBasePath = false; + @Setter protected boolean useAnnotatedBasePath = false; - protected boolean generateNonSpringApplication = false; + @Setter protected boolean generateNonSpringApplication = false; - protected boolean useGenericResponse = false; + @Setter protected boolean useGenericResponse = false; - protected boolean useAbstractionForFiles = false; + @Setter protected boolean useAbstractionForFiles = false; public JavaCXFServerCodegen() { super(); @@ -276,81 +274,5 @@ public String getHelp() { return "Generates a Java JAXRS Server application based on Apache CXF framework."; } - public void setGenerateSpringApplication(boolean generateSpringApplication) { - this.generateSpringApplication = generateSpringApplication; - } - - public void setUseSpringAnnotationConfig(boolean useSpringAnnotationConfig) { - this.useSpringAnnotationConfig = useSpringAnnotationConfig; - } - - public void setUseSwaggerFeature(boolean useSwaggerFeature) { - this.useSwaggerFeature = useSwaggerFeature; - } - - - public void setUseWadlFeature(boolean useWadlFeature) { - this.useWadlFeature = useWadlFeature; - } - - - public void setUseMultipartFeature(boolean useMultipartFeature) { - this.useMultipartFeature = useMultipartFeature; - } - - - public void setUseGzipFeature(boolean useGzipFeature) { - this.useGzipFeature = useGzipFeature; - } - - - public void setUseLoggingFeature(boolean useLoggingFeature) { - this.useLoggingFeature = useLoggingFeature; - } - - - public void setUseBeanValidationFeature(boolean useBeanValidationFeature) { - this.useBeanValidationFeature = useBeanValidationFeature; - } - - public void setGenerateSpringBootApplication(boolean generateSpringBootApplication) { - this.generateSpringBootApplication = generateSpringBootApplication; - } - - public void setGenerateJbossDeploymentDescriptor(boolean generateJbossDeploymentDescriptor) { - this.generateJbossDeploymentDescriptor = generateJbossDeploymentDescriptor; - } - - public void setUseGzipFeatureForTests(boolean useGzipFeatureForTests) { - this.useGzipFeatureForTests = useGzipFeatureForTests; - } - - public void setUseLoggingFeatureForTests(boolean useLoggingFeatureForTests) { - this.useLoggingFeatureForTests = useLoggingFeatureForTests; - } - - public void setUseSwaggerUI(boolean useSwaggerUI) { - this.useSwaggerUI = useSwaggerUI; - } - - public void setAddConsumesProducesJson(boolean addConsumesProducesJson) { - this.addConsumesProducesJson = addConsumesProducesJson; - } - - public void setUseAnnotatedBasePath(boolean useAnnotatedBasePath) { - this.useAnnotatedBasePath = useAnnotatedBasePath; - } - - public void setGenerateNonSpringApplication(boolean generateNonSpringApplication) { - this.generateNonSpringApplication = generateNonSpringApplication; - } - - public void setUseGenericResponse(boolean useGenericResponse) { - this.useGenericResponse = useGenericResponse; - } - - public void setUseAbstractionForFiles(boolean useAbstractionForFiles) { - this.useAbstractionForFiles = useAbstractionForFiles; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java index 49887a338bb1..df4659d4aaf8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java @@ -19,7 +19,6 @@ import io.swagger.v3.oas.models.Operation; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenOperation; -import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.languages.features.BeanValidationFeatures; import org.openapitools.codegen.languages.features.OptionalFeatures; @@ -58,14 +57,12 @@ public class JavaCamelServerCodegen extends SpringCodegen implements BeanValidat private final Logger LOGGER = LoggerFactory.getLogger(JavaCamelServerCodegen.class); - public CodegenType getTag() { - return CodegenType.SERVER; - } - + @Override public String getName() { return "java-camel"; } + @Override public String getHelp() { return "Generates a Java Camel server (beta)."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index cc18565f2206..3b72064dfdb0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -19,6 +19,9 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.Schema; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -110,39 +113,45 @@ public class JavaClientCodegen extends AbstractJavaCodegen protected boolean useRxJava3 = false; // backwards compatibility for openapi configs that specify neither rx1 nor rx2 // (mustache does not allow for boolean operators so we need this extra field) - protected boolean doNotUseRx = true; - protected boolean usePlayWS = false; - protected String microprofileFramework = MICROPROFILE_DEFAULT; - protected boolean microprofileMutiny = false; - protected String configKey = null; - protected boolean configKeyFromClassName = false; - - protected boolean asyncNative = false; - protected boolean parcelableModel = false; - protected boolean useBeanValidation = false; - protected boolean performBeanValidation = false; - protected boolean useGzipFeature = false; - protected boolean useRuntimeException = false; - protected boolean useReflectionEqualsHashCode = false; + @Setter protected boolean doNotUseRx = true; + @Setter protected boolean usePlayWS = false; + @Setter protected String microprofileFramework = MICROPROFILE_DEFAULT; + @Setter protected boolean microprofileMutiny = false; + @Setter protected String configKey = null; + @Setter(AccessLevel.PRIVATE) protected boolean configKeyFromClassName = false; + + @Setter protected boolean asyncNative = false; + @Setter protected boolean parcelableModel = false; + @Setter protected boolean useBeanValidation = false; + @Setter protected boolean performBeanValidation = false; + @Setter protected boolean useGzipFeature = false; + @Setter protected boolean useRuntimeException = false; + @Setter protected boolean useReflectionEqualsHashCode = false; protected boolean caseInsensitiveResponseHeaders = false; - protected boolean useAbstractionForFiles = false; - protected boolean dynamicOperations = false; - protected boolean supportStreaming = false; - protected boolean withAWSV4Signature = false; - protected String gradleProperties; - protected String errorObjectType; + @Setter protected boolean useAbstractionForFiles = false; + @Setter protected boolean dynamicOperations = false; + @Setter protected boolean supportStreaming = false; + @Setter protected boolean withAWSV4Signature = false; + @Setter protected String gradleProperties; + @Setter protected String errorObjectType; protected String authFolder; - protected String serializationLibrary = null; - protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup + /** + * -- GETTER -- + * Serialization library. + * + * @return 'gson' or 'jackson' + */ + @Getter protected String serializationLibrary = null; + @Setter protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup protected String rootJavaEEPackage; protected Map mpRestClientVersions = new LinkedHashMap<>(); - protected boolean useSingleRequestParameter = false; + @Setter(AccessLevel.PRIVATE) protected boolean useSingleRequestParameter = false; protected boolean webclientBlockingOperations = false; - protected boolean generateClientAsBean = false; - protected boolean useEnumCaseInsensitive = false; + @Setter protected boolean generateClientAsBean = false; + @Setter protected boolean useEnumCaseInsensitive = false; - protected int maxAttemptsForRetry = 1; - protected long waitTimeMillis = 10l; + @Setter protected int maxAttemptsForRetry = 1; + @Setter protected long waitTimeMillis = 10l; private static class MpRestClientVersion { public final String rootPackage; @@ -1172,10 +1181,6 @@ protected boolean isConstructorWithAllArgsAllowed(CodegenModel codegenModel) { return false; } - public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) { - this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup; - } - public boolean getUseOneOfDiscriminatorLookup() { return this.useOneOfDiscriminatorLookup; } @@ -1184,10 +1189,6 @@ private boolean getUseSingleRequestParameter() { return useSingleRequestParameter; } - private void setUseSingleRequestParameter(boolean useSingleRequestParameter) { - this.useSingleRequestParameter = useSingleRequestParameter; - } - public void setUseRxJava(boolean useRxJava) { this.useRxJava = useRxJava; doNotUseRx = false; @@ -1203,107 +1204,10 @@ public void setUseRxJava3(boolean useRxJava3) { doNotUseRx = false; } - public void setDoNotUseRx(boolean doNotUseRx) { - this.doNotUseRx = doNotUseRx; - } - - public void setUsePlayWS(boolean usePlayWS) { - this.usePlayWS = usePlayWS; - } - - public void setAsyncNative(boolean asyncNative) { - this.asyncNative = asyncNative; - } - - public void setMicroprofileFramework(String microprofileFramework) { - this.microprofileFramework = microprofileFramework; - } - - public void setMicroprofileMutiny(boolean microprofileMutiny) { - this.microprofileMutiny = microprofileMutiny; - } - - public void setConfigKey(String configKey) { - this.configKey = configKey; - } - - public void setParcelableModel(boolean parcelableModel) { - this.parcelableModel = parcelableModel; - } - - public void setUseBeanValidation(boolean useBeanValidation) { - this.useBeanValidation = useBeanValidation; - } - - public void setPerformBeanValidation(boolean performBeanValidation) { - this.performBeanValidation = performBeanValidation; - } - - public void setUseGzipFeature(boolean useGzipFeature) { - this.useGzipFeature = useGzipFeature; - } - - public void setUseRuntimeException(boolean useRuntimeException) { - this.useRuntimeException = useRuntimeException; - } - - public void setUseReflectionEqualsHashCode(boolean useReflectionEqualsHashCode) { - this.useReflectionEqualsHashCode = useReflectionEqualsHashCode; - } - public void setCaseInsensitiveResponseHeaders(final Boolean caseInsensitiveResponseHeaders) { this.caseInsensitiveResponseHeaders = caseInsensitiveResponseHeaders; } - public void setUseAbstractionForFiles(boolean useAbstractionForFiles) { - this.useAbstractionForFiles = useAbstractionForFiles; - } - - public void setDynamicOperations(final boolean dynamicOperations) { - this.dynamicOperations = dynamicOperations; - } - - public void setSupportStreaming(final boolean supportStreaming) { - this.supportStreaming = supportStreaming; - } - - public void setWithAWSV4Signature(boolean withAWSV4Signature) { - this.withAWSV4Signature = withAWSV4Signature; - } - - public void setGradleProperties(final String gradleProperties) { - this.gradleProperties = gradleProperties; - } - - public void setErrorObjectType(final String errorObjectType) { - this.errorObjectType = errorObjectType; - } - - public void setGenerateClientAsBean(boolean generateClientAsBean) { - this.generateClientAsBean = generateClientAsBean; - } - - public void setUseEnumCaseInsensitive(boolean useEnumCaseInsensitive) { - this.useEnumCaseInsensitive = useEnumCaseInsensitive; - } - - public void setMaxAttemptsForRetry(int maxAttemptsForRetry) { - this.maxAttemptsForRetry = maxAttemptsForRetry; - } - - public void setWaitTimeMillis(long waitTimeMillis) { - this.waitTimeMillis = waitTimeMillis; - } - - /** - * Serialization library. - * - * @return 'gson' or 'jackson' - */ - public String getSerializationLibrary() { - return serializationLibrary; - } - public void setSerializationLibrary(String serializationLibrary) { if (SERIALIZATION_LIBRARY_JACKSON.equalsIgnoreCase(serializationLibrary)) { this.serializationLibrary = SERIALIZATION_LIBRARY_JACKSON; @@ -1331,10 +1235,6 @@ public Map postProcessSupportingFileData(Map obj return super.postProcessSupportingFileData(objs); } - private void setConfigKeyFromClassName(boolean configKeyFromClassName) { - this.configKeyFromClassName = configKeyFromClassName; - } - @Override public String toApiVarName(String name) { String apiVarName = super.toApiVarName(name); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java index 79ce9f6186cf..4443cf0eb0dd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java @@ -33,6 +33,8 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.servers.Server; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CliOption; @@ -65,14 +67,14 @@ public class JavaHelidonClientCodegen extends JavaHelidonCommonCodegen { private static final String X_HELIDON_IMPL_IMPORTS = "x-helidon-implImports"; public static final String CONFIG_KEY = "configKey"; - protected String configKey = null; - protected boolean useBeanValidation = false; - protected boolean performBeanValidation = false; - protected boolean useGzipFeature = false; + @Setter protected String configKey = null; + @Setter protected boolean useBeanValidation = false; + @Setter protected boolean performBeanValidation = false; + @Setter protected boolean useGzipFeature = false; protected boolean caseInsensitiveResponseHeaders = false; protected Path invokerFolder; protected Path apiFolder; - protected String serializationLibrary = null; + @Getter protected String serializationLibrary = null; /** * Constructor for this generator. Uses the embedded template dir to find common templates @@ -460,30 +462,10 @@ public ModelsMap postProcessModels(ModelsMap objs) { return objs; } - public void setConfigKey(String configKey) { - this.configKey = configKey; - } - - public void setUseBeanValidation(boolean useBeanValidation) { - this.useBeanValidation = useBeanValidation; - } - - public void setPerformBeanValidation(boolean performBeanValidation) { - this.performBeanValidation = performBeanValidation; - } - - public void setUseGzipFeature(boolean useGzipFeature) { - this.useGzipFeature = useGzipFeature; - } - public void setCaseInsensitiveResponseHeaders(final Boolean caseInsensitiveResponseHeaders) { this.caseInsensitiveResponseHeaders = caseInsensitiveResponseHeaders; } - public String getSerializationLibrary() { - return serializationLibrary; - } - public void setSerializationLibrary(String serializationLibrary) { if (SERIALIZATION_LIBRARY_JACKSON.equalsIgnoreCase(serializationLibrary)) { this.serializationLibrary = SERIALIZATION_LIBRARY_JACKSON; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java index 56867bd176d1..7aa926d7ff3c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java @@ -29,6 +29,7 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.servers.Server; +import lombok.Getter; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenModel; @@ -56,7 +57,7 @@ public class JavaHelidonServerCodegen extends JavaHelidonCommonCodegen { protected boolean useBeanValidation = true; protected String implFolder = "src/main/java"; - protected String serializationLibrary = null; + @Getter protected String serializationLibrary = null; private boolean useAbstractClass = false; private boolean gradleProject = false; @@ -385,10 +386,6 @@ public void setPerformBeanValidation(boolean performBeanValidation) { throw new UnsupportedOperationException("Not implemented"); } - public String getSerializationLibrary() { - return serializationLibrary; - } - public void setSerializationLibrary(String serializationLibrary) { if (SERIALIZATION_LIBRARY_JACKSON.equalsIgnoreCase(serializationLibrary)) { this.serializationLibrary = SERIALIZATION_LIBRARY_JACKSON; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java index 471fb2a14cca..6b56cb303b7c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java @@ -213,6 +213,7 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri return super.getOrGenerateOperationId(operation, path, httpMethod.toUpperCase(Locale.ROOT)); } + @Override public String apiFilename(String templateName, String tag) { String result = super.apiFilename(templateName, tag); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java index ddd5dfaccc0b..ebdf50823187 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java @@ -113,8 +113,4 @@ public String getHelp() { return "Generates a Java JAXRS Server according to JAXRS 2.0 specification, assuming an " + "Apache CXF runtime and a Java EE runtime with CDI enabled."; } - - public void setUseBeanValidation(boolean useBeanValidation) { - this.useBeanValidation = useBeanValidation; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java index ef2c3097a9fe..6fe7a6da6440 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java @@ -18,6 +18,8 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.DocumentationFeature; @@ -56,6 +58,13 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen { protected boolean useGzipFeature = false; private boolean useJackson = false; + /** + * -- SETTER -- + * Location where the file containing the spec will be generated in the output folder. + * + * @param location location inside the output folder. No file generated when set to null or empty string. + */ + @Getter @Setter private String openApiSpecFileLocation = "src/main/openapi/openapi.yaml"; public JavaJAXRSSpecServerCodegen() { @@ -268,18 +277,6 @@ public String getName() { return "jaxrs-spec"; } - public String getOpenApiSpecFileLocation() { - return openApiSpecFileLocation; - } - - /** - * Location where the file containing the spec will be generated in the output folder. - * @param location location inside the output folder. No file generated when set to null or empty string. - */ - public void setOpenApiSpecFileLocation(String location) { - this.openApiSpecFileLocation = location; - } - @Override public CodegenModel fromModel(String name, Schema model) { CodegenModel codegenModel = super.fromModel(name, model); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java index e169a653e8d8..836923522e1a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java @@ -5,6 +5,8 @@ import com.samskivert.mustache.Template; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.languages.features.BeanValidationFeatures; @@ -24,8 +26,6 @@ import java.util.stream.Collectors; import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE; -import static org.openapitools.codegen.utils.StringUtils.camelize; -import static org.openapitools.codegen.utils.StringUtils.underscore; public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen implements BeanValidationFeatures, OptionalFeatures { public static final String OPT_TITLE = "title"; @@ -58,8 +58,9 @@ public enum SERIALIZATION_LIBRARY_TYPE {jackson, micronaut_serde_jackson} protected final Logger LOGGER = LoggerFactory.getLogger(JavaMicronautAbstractCodegen.class); protected String title; - protected boolean useBeanValidation; - protected boolean useOptional; + @Getter protected boolean useBeanValidation; + @Getter protected boolean useOptional; + @Getter @Setter protected boolean visitable; protected String buildTool; protected String testTool; @@ -436,10 +437,6 @@ public void setUseOptional(boolean useOptional) { this.useOptional = useOptional; } - public void setVisitable(boolean visitable) { - this.visitable = visitable; - } - @Override public String toApiVarName(String name) { String apiVarName = super.toApiVarName(name); @@ -449,18 +446,6 @@ public String toApiVarName(String name) { return apiVarName; } - public boolean isUseBeanValidation() { - return useBeanValidation; - } - - public boolean isUseOptional() { - return useOptional; - } - - public boolean isVisitable() { - return visitable; - } - @Override public String sanitizeTag(String tag) { // Skip sanitization to get the original tag name in the addOperationToGroup() method. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java index cdf8b8a1fcf1..1e3c4b84222e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java @@ -3,6 +3,8 @@ import java.util.Arrays; import java.util.List; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.SupportingFile; @@ -22,10 +24,10 @@ public class JavaMicronautClientCodegen extends JavaMicronautAbstractCodegen { public static final String NAME = "java-micronaut-client"; - protected boolean configureAuthorization; - protected List additionalClientTypeAnnotations; + @Getter protected boolean configureAuthorization; + @Setter protected List additionalClientTypeAnnotations; protected String authorizationFilterPattern; - protected String basePathSeparator = "-"; + @Setter protected String basePathSeparator = "-"; protected String clientId; public JavaMicronautClientCodegen() { @@ -61,10 +63,6 @@ public String getHelp() { return "Generates a Java Micronaut Client."; } - public boolean isConfigureAuthorization() { - return configureAuthorization; - } - @Override public void processOpts() { super.processOpts(); @@ -143,10 +141,6 @@ public void processOpts() { apiDocTemplateFiles.put("client/doc/api_doc.mustache", ".md"); } - public void setAdditionalClientTypeAnnotations(final List additionalClientTypeAnnotations) { - this.additionalClientTypeAnnotations = additionalClientTypeAnnotations; - } - public void setAuthorizationFilterPattern(final String pattern) { writePropertyBack(OPT_CONFIGURE_AUTH_FILTER_PATTERN, true); this.authorizationFilterPattern = pattern; @@ -156,8 +150,4 @@ public void setClientId(final String id) { writePropertyBack(OPT_CONFIGURE_CLIENT_ID, true); this.clientId = id; } - - public void setBasePathSeparator(final String separator) { - this.basePathSeparator = separator; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicroprofileServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicroprofileServerCodegen.java index df04653b8a6e..d9719592d0ad 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicroprofileServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicroprofileServerCodegen.java @@ -26,14 +26,17 @@ public JavaMicroprofileServerCodegen() { setLibrary("microprofile"); } + @Override public CodegenType getTag() { return CodegenType.SERVER; } + @Override public String getName() { return "java-microprofile"; } + @Override public String getHelp() { return "Generates a microprofile server."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java index 1289a515486f..de7a175712bf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java @@ -21,6 +21,8 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.tags.Tag; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.DocumentationFeature; import org.openapitools.codegen.model.ModelMap; @@ -39,6 +41,7 @@ /** * Created by prokarma on 04/09/17. */ +@Setter public class JavaPKMSTServerCodegen extends AbstractJavaCodegen { public static final String CONFIG_PACKAGE = "configPackage"; @@ -47,10 +50,10 @@ public class JavaPKMSTServerCodegen extends AbstractJavaCodegen { public static final String EUREKA_URI = "eurekaUri"; public static final String ZIPKIN_URI = "zipkinUri"; public static final String SPRINGADMIN_URI = "springBootAdminUri"; - protected String basePackage = "com.prokarma.pkmst"; - protected String serviceName = "Pkmst"; - protected String configPackage = "com.prokarma.pkmst.config"; - protected String title; + @Getter protected String basePackage = "com.prokarma.pkmst"; + @Getter protected String serviceName = "Pkmst"; + @Getter protected String configPackage = "com.prokarma.pkmst.config"; + @Getter protected String title; protected String eurekaUri; protected String zipkinUri; protected String springBootAdminUri; @@ -95,19 +98,23 @@ public JavaPKMSTServerCodegen() { } } + @Override public CodegenType getTag() { return CodegenType.SERVER; } + @Override public String getName() { return "java-pkmst"; } + @Override public String getHelp() { return "Generates a PKMST SpringBoot Server application using the SpringFox integration." + " Also enables EurekaServerClient / Zipkin / Spring-Boot admin"; } + @Override public void processOpts() { super.processOpts(); if (this.additionalProperties.containsKey("basePackage")) { @@ -319,10 +326,12 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List allModels) { OperationMap operations = objs.getOperations(); @@ -460,6 +416,5 @@ public String toString() { sb.append(", tokenIntrospectUrl='").append(tokenIntrospectUrl).append('\''); return sb.toString(); } - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java index 03d8728f69a6..e57d95eb489a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java @@ -17,6 +17,7 @@ package org.openapitools.codegen.languages; +import lombok.Setter; import org.apache.commons.lang3.BooleanUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.languages.features.BeanValidationFeatures; @@ -32,6 +33,7 @@ import java.util.List; import java.util.Map; +@Setter public class JavaResteasyEapServerCodegen extends AbstractJavaJAXRSServerCodegen implements JbossFeature, BeanValidationFeatures, SwaggerFeatures { @@ -159,16 +161,4 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List customHeaders = new ArrayList<>(); + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "jetbrains-http-client"; } + @Override public String getHelp() { return "Generates a jetbrains-http client. See https://www.jetbrains.com/help/idea/http-client-in-product-code-editor.html"; } @@ -227,6 +232,7 @@ public void postProcess() { System.out.println("##########################################################################################"); } + @Getter @Setter public class RequestItem { private String name; @@ -236,22 +242,6 @@ public RequestItem(String name, String body) { this.name = name; this.body = body; } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } } /* diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JuliaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JuliaClientCodegen.java index f411744f39f8..92e8b914971d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JuliaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JuliaClientCodegen.java @@ -29,6 +29,7 @@ public class JuliaClientCodegen extends AbstractJuliaCodegen { * @return the CodegenType for this generator * @see org.openapitools.codegen.CodegenType */ + @Override public CodegenType getTag() { return CodegenType.CLIENT; } @@ -39,6 +40,7 @@ public CodegenType getTag() { * * @return the name of the generator */ + @Override public String getName() { return "julia-client"; } @@ -49,6 +51,7 @@ public String getName() { * * @return the help message for the generator */ + @Override public String getHelp() { return "Generates a julia client."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JuliaServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JuliaServerCodegen.java index 22dd3af28418..d9f31a0fdde6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JuliaServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JuliaServerCodegen.java @@ -29,6 +29,7 @@ public class JuliaServerCodegen extends AbstractJuliaCodegen { * @return the CodegenType for this generator * @see org.openapitools.codegen.CodegenType */ + @Override public CodegenType getTag() { return CodegenType.SERVER; } @@ -39,6 +40,7 @@ public CodegenType getTag() { * * @return the name of the generator */ + @Override public String getName() { return "julia-server"; } @@ -49,6 +51,7 @@ public String getName() { * * @return the help message for the generator */ + @Override public String getHelp() { return "Generates a julia server."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java index aa31665c5c35..ac267641d74d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java @@ -45,6 +45,8 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -361,16 +363,17 @@ private List sortRequests(Map requestsMap) { static final String[][] JAVASCRIPT_SUPPORTING_FILES = { new String[]{"script.mustache", "script.js"}, new String[]{"README.mustache", "README.md"}}; - protected String projectName; - protected String moduleName; - protected String projectDescription; - protected String projectVersion; - protected String licenseName; + @Setter protected String projectName; + @Setter protected String moduleName; + @Setter protected String projectDescription; + @Setter protected String projectVersion; + @Setter protected String licenseName; + @Getter @Setter protected String invokerPackage; - protected String sourceFolder = ""; - private String modelPropertyNaming = "camelCase"; - protected boolean preserveLeadingParamChar = false; + @Setter protected String sourceFolder = ""; + @Getter private String modelPropertyNaming = "camelCase"; + @Setter protected boolean preserveLeadingParamChar = false; @Override public CodegenType getTag() { @@ -702,10 +705,6 @@ private String getTemplateVariable(String input) { return "${" + input + "}"; } - public String getModelPropertyNaming() { - return this.modelPropertyNaming; - } - private String getNameUsingModelPropertyNaming(String name) { switch (CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.valueOf(getModelPropertyNaming())) { case original: @@ -797,38 +796,6 @@ public String apiFileFolder() { return createPath(outputFolder, sourceFolder, invokerPackage, apiPackage()); } - public String getInvokerPackage() { - return invokerPackage; - } - - public void setInvokerPackage(String invokerPackage) { - this.invokerPackage = invokerPackage; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public void setModuleName(String moduleName) { - this.moduleName = moduleName; - } - - public void setProjectDescription(String projectDescription) { - this.projectDescription = projectDescription; - } - - public void setProjectVersion(String projectVersion) { - this.projectVersion = projectVersion; - } - - public void setLicenseName(String licenseName) { - this.licenseName = licenseName; - } - public void setModelPropertyNaming(String naming) { if ("original".equals(naming) || "camelCase".equals(naming) || "PascalCase".equals(naming) || "snake_case".equals(naming)) { @@ -839,10 +806,6 @@ public void setModelPropertyNaming(String naming) { } } - public void setPreserveLeadingParamChar(boolean preserveLeadingParamChar) { - this.preserveLeadingParamChar = preserveLeadingParamChar; - } - @Override public String escapeQuotationMark(String input) { // remove ', " to avoid code injection diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java index 3d6aa533249b..a01044115b2f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java @@ -27,6 +27,8 @@ import java.util.stream.Stream; import com.samskivert.mustache.Mustache; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; @@ -94,22 +96,22 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { protected static final String VENDOR_EXTENSION_BASE_NAME_LITERAL = "x-base-name-literal"; - protected String dateLibrary = DateLibrary.JAVA8.value; - protected String requestDateConverter = RequestDateConverter.TO_JSON.value; - protected String collectionType = CollectionType.LIST.value; + @Setter protected String dateLibrary = DateLibrary.JAVA8.value; + @Setter protected String requestDateConverter = RequestDateConverter.TO_JSON.value; + @Setter protected String collectionType = CollectionType.LIST.value; protected boolean useRxJava3 = false; protected boolean useCoroutines = false; // backwards compatibility for openapi configs that specify neither rx1 nor rx2 // (mustache does not allow for boolean operators so we need this extra field) protected boolean doNotUseRxAndCoroutines = true; protected boolean generateRoomModels = false; - protected String roomModelPackage = ""; - protected boolean omitGradleWrapper = false; - protected boolean generateOneOfAnyOfWrappers = true; + @Setter protected String roomModelPackage = ""; + @Setter protected boolean omitGradleWrapper = false; + @Setter protected boolean generateOneOfAnyOfWrappers = true; protected String authFolder; - protected SERIALIZATION_LIBRARY_TYPE serializationLibrary = SERIALIZATION_LIBRARY_TYPE.moshi; + @Getter protected SERIALIZATION_LIBRARY_TYPE serializationLibrary = SERIALIZATION_LIBRARY_TYPE.moshi; public static final String SERIALIZATION_LIBRARY_DESC = "What serialization library to use: 'moshi' (default), or 'gson' or 'jackson' or 'kotlinx_serialization'"; public enum SERIALIZATION_LIBRARY_TYPE {moshi, gson, jackson, kotlinx_serialization} @@ -270,14 +272,17 @@ public KotlinClientCodegen() { cliOptions.add(serializationLibraryOpt.defaultValue(serializationLibrary.name())); } + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "kotlin"; } + @Override public String getHelp() { return "Generates a Kotlin client."; } @@ -322,35 +327,6 @@ public void setUseCoroutines(boolean useCoroutines) { this.useCoroutines = useCoroutines; } - - public void setDateLibrary(String library) { - this.dateLibrary = library; - } - - public void setRequestDateConverter(String converter) { - this.requestDateConverter = converter; - } - - public void setCollectionType(String collectionType) { - this.collectionType = collectionType; - } - - public void setRoomModelPackage(String roomModelPackage) { - this.roomModelPackage = roomModelPackage; - } - - public void setOmitGradleWrapper(boolean omitGradleWrapper) { - this.omitGradleWrapper = omitGradleWrapper; - } - - public void setGenerateOneOfAnyOfWrappers(boolean generateOneOfAnyOfWrappers) { - this.generateOneOfAnyOfWrappers = generateOneOfAnyOfWrappers; - } - - public SERIALIZATION_LIBRARY_TYPE getSerializationLibrary() { - return this.serializationLibrary; - } - /** * Sets the serialization engine for Kotlin * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java index b5b5bd363529..044b63239085 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java @@ -18,6 +18,8 @@ package org.openapitools.codegen.languages; import com.google.common.collect.ImmutableMap; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.languages.features.BeanValidationFeatures; @@ -37,19 +39,26 @@ public class KotlinServerCodegen extends AbstractKotlinCodegen implements BeanVa public static final String DEFAULT_LIBRARY = Constants.KTOR; private final Logger LOGGER = LoggerFactory.getLogger(KotlinServerCodegen.class); + @Getter @Setter private Boolean autoHeadFeatureEnabled = true; + @Getter @Setter private Boolean conditionalHeadersFeatureEnabled = false; + @Getter @Setter private Boolean hstsFeatureEnabled = true; + @Getter @Setter private Boolean corsFeatureEnabled = false; + @Getter @Setter private Boolean compressionFeatureEnabled = true; + @Getter @Setter private Boolean resourcesFeatureEnabled = true; + @Getter @Setter private Boolean metricsFeatureEnabled = true; private boolean interfaceOnly = false; private boolean useBeanValidation = false; private boolean useCoroutines = false; private boolean useMutiny = false; private boolean returnResponse = false; - private boolean omitGradleWrapper = false; + @Setter private boolean omitGradleWrapper = false; // This is here to potentially warn the user when an option is not supported by the target framework. private Map> optionsSupportedPerFramework = new ImmutableMap.Builder>() @@ -138,78 +147,21 @@ public KotlinServerCodegen() { addSwitch(USE_JAKARTA_EE, Constants.USE_JAKARTA_EE_DESC, useJakartaEe); } - public Boolean getAutoHeadFeatureEnabled() { - return autoHeadFeatureEnabled; - } - - public void setAutoHeadFeatureEnabled(Boolean autoHeadFeatureEnabled) { - this.autoHeadFeatureEnabled = autoHeadFeatureEnabled; - } - - public Boolean getCompressionFeatureEnabled() { - return compressionFeatureEnabled; - } - - public void setCompressionFeatureEnabled(Boolean compressionFeatureEnabled) { - this.compressionFeatureEnabled = compressionFeatureEnabled; - } - - public Boolean getConditionalHeadersFeatureEnabled() { - return conditionalHeadersFeatureEnabled; - } - - public void setConditionalHeadersFeatureEnabled(Boolean conditionalHeadersFeatureEnabled) { - this.conditionalHeadersFeatureEnabled = conditionalHeadersFeatureEnabled; - } - - public Boolean getCorsFeatureEnabled() { - return corsFeatureEnabled; - } - - public void setCorsFeatureEnabled(Boolean corsFeatureEnabled) { - this.corsFeatureEnabled = corsFeatureEnabled; - } - + @Override public String getHelp() { return "Generates a Kotlin server."; } - public Boolean getHstsFeatureEnabled() { - return hstsFeatureEnabled; - } - - public void setHstsFeatureEnabled(Boolean hstsFeatureEnabled) { - this.hstsFeatureEnabled = hstsFeatureEnabled; - } - - public Boolean getResourcesFeatureEnabled() { - return resourcesFeatureEnabled; - } - public boolean getOmitGradleWrapper() { return omitGradleWrapper; } - public void setOmitGradleWrapper(boolean omitGradleWrapper) { - this.omitGradleWrapper = omitGradleWrapper; - } - - public void setResourcesFeatureEnabled(Boolean resourcesFeatureEnabled) { - this.resourcesFeatureEnabled = resourcesFeatureEnabled; - } - - public Boolean getMetricsFeatureEnabled() { - return metricsFeatureEnabled; - } - - public void setMetricsFeatureEnabled(Boolean metricsEnabled) { - this.metricsFeatureEnabled = metricsEnabled; - } - + @Override public String getName() { return "kotlin-server"; } + @Override public CodegenType getTag() { return CodegenType.SERVER; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 158e4b114af5..df66ab59aed2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -22,9 +22,7 @@ import com.samskivert.mustache.Template; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenModel; @@ -106,26 +104,32 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen public static final String USE_SPRING_BOOT3 = "useSpringBoot3"; public static final String APPEND_REQUEST_TO_HANDLER = "appendRequestToHandler"; + @Getter @Setter private String basePackage; + @Getter @Setter protected String configPackage; + @Getter @Setter private String invokerPackage; + @Getter @Setter private String serverPort = "8080"; private String title = "OpenAPI Kotlin Spring"; private boolean useBeanValidation = true; - private boolean skipDefaultInterface = false; - private boolean exceptionHandler = true; - private boolean gradleBuildFile = true; + @Setter private boolean skipDefaultInterface = false; + @Setter private boolean exceptionHandler = true; + @Setter private boolean gradleBuildFile = true; private boolean useSwaggerUI = true; - private boolean serviceInterface = false; - private boolean serviceImplementation = false; + @Setter private boolean serviceInterface = false; + @Setter private boolean serviceImplementation = false; + @Getter @Setter private boolean reactive = false; - private boolean interfaceOnly = false; - protected boolean useFeignClientUrl = true; - protected boolean useFeignClient = false; - private boolean delegatePattern = false; - protected boolean useTags = false; - private boolean beanQualifiers = false; - + @Setter private boolean interfaceOnly = false; + @Setter protected boolean useFeignClientUrl = true; + @Setter protected boolean useFeignClient = false; + @Setter private boolean delegatePattern = false; + @Setter protected boolean useTags = false; + @Setter private boolean beanQualifiers = false; + + @Getter @Setter protected boolean useSpringBoot3 = false; private DocumentationProvider documentationProvider; private AnnotationLibrary annotationLibrary; @@ -260,6 +264,7 @@ public DocumentationProvider defaultDocumentationProvider() { return DocumentationProvider.SPRINGDOC; } + @Override public List supportedDocumentationProvider() { return Arrays.asList( DocumentationProvider.NONE, @@ -289,54 +294,14 @@ private boolean selectedDocumentationProviderRequiresSwaggerUiBootstrap() { getDocumentationProvider().equals(DocumentationProvider.SOURCE); } - public void setConfigPackage(String configPackage) { - this.configPackage = configPackage; - } - - public String getConfigPackage() { - return configPackage; - } - - public String getBasePackage() { - return this.basePackage; - } - - public void setBasePackage(String basePackage) { - this.basePackage = basePackage; - } - - public String getInvokerPackage() { - return this.invokerPackage; - } - - public void setInvokerPackage(String invokerPackage) { - this.invokerPackage = invokerPackage; - } - - public String getServerPort() { - return this.serverPort; - } - - public void setServerPort(String serverPort) { - this.serverPort = serverPort; - } - public boolean getExceptionHandler() { return this.exceptionHandler; } - public void setExceptionHandler(boolean exceptionHandler) { - this.exceptionHandler = exceptionHandler; - } - public boolean getGradleBuildFile() { return this.gradleBuildFile; } - public void setGradleBuildFile(boolean gradleBuildFile) { - this.gradleBuildFile = gradleBuildFile; - } - public boolean getUseSwaggerUI() { return this.useSwaggerUI; } @@ -350,75 +315,23 @@ public boolean getServiceInterface() { return this.serviceInterface; } - public void setServiceInterface(boolean serviceInterface) { - this.serviceInterface = serviceInterface; - } - - public void setUseFeignClientUrl(boolean useFeignClientUrl) { - this.useFeignClientUrl = useFeignClientUrl; - } - public boolean getServiceImplementation() { return this.serviceImplementation; } - public void setServiceImplementation(boolean serviceImplementation) { - this.serviceImplementation = serviceImplementation; - } - public boolean getUseBeanValidation() { return this.useBeanValidation; } - public void setInterfaceOnly(boolean interfaceOnly) { - this.interfaceOnly = interfaceOnly; - } - - public void setDelegatePattern(boolean delegatePattern) { - this.delegatePattern = delegatePattern; - } - - public void setUseTags(boolean useTags) { - this.useTags = useTags; - } - public boolean isAppendRequestToHandler() { return Boolean.parseBoolean(additionalProperties.getOrDefault(APPEND_REQUEST_TO_HANDLER, false).toString()); } - public void setUseSpringBoot3(boolean isSpringBoot3) { - this.useSpringBoot3 = isSpringBoot3; - } - - public boolean isUseSpringBoot3() { - return useSpringBoot3; - } - @Override public void setUseBeanValidation(boolean useBeanValidation) { this.useBeanValidation = useBeanValidation; } - public void setUseFeignClient(boolean useFeignClient) { - this.useFeignClient = useFeignClient; - } - - public void setSkipDefaultInterface(boolean skipDefaultInterface) { - this.skipDefaultInterface = skipDefaultInterface; - } - - public boolean isReactive() { - return reactive; - } - - public void setReactive(boolean reactive) { - this.reactive = reactive; - } - - public void setBeanQualifiers(boolean beanQualifiers) { - this.beanQualifiers = beanQualifiers; - } - @Override public CodegenType getTag() { return CodegenType.SERVER; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinVertxServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinVertxServerCodegen.java index 6445a7018dcd..525b327212a4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinVertxServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinVertxServerCodegen.java @@ -39,14 +39,17 @@ public class KotlinVertxServerCodegen extends AbstractKotlinCodegen { final Logger LOGGER = LoggerFactory.getLogger(KotlinVertxServerCodegen.class); + @Override public CodegenType getTag() { return CodegenType.SERVER; } + @Override public String getName() { return "kotlin-vertx"; } + @Override public String getHelp() { return "Generates a kotlin-vertx server."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java index ebada61f2cbf..4c6895663772 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java @@ -16,6 +16,8 @@ package org.openapitools.codegen.languages; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.meta.GeneratorMetadata; @@ -51,14 +53,26 @@ public class KtormSchemaCodegen extends AbstractKotlinCodegen { public static final String ADD_SURROGATE_KEY = "addSurrogateKey"; public static final Integer IDENTIFIER_MAX_LENGTH = 255; + /** + * Imported package name for the models + */ + @Getter @Setter protected String importModelPackageName = ""; - protected String defaultDatabaseName = "sqlite.db"; + /** + * Default database name for all queries + * This value must be used with backticks only, eg. `database_name` + */ + @Getter protected String defaultDatabaseName = "sqlite.db"; protected String databaseNamePrefix = "_", databaseNameSuffix = ""; protected String tableNamePrefix = "_", tableNameSuffix = ""; protected String columnNamePrefix = "_", columnNameSuffix = ""; - protected String identifierNamingConvention = "original"; + /** + * Identifier naming convention for table names and column names. + */ + @Getter protected String identifierNamingConvention = "original"; + @Getter @Setter protected String primaryKeyConvention = "id"; - protected boolean addSurrogateKey = false; + @Setter protected boolean addSurrogateKey = false; protected Map sqlTypeMapping = new HashMap(); @@ -232,14 +246,17 @@ public KtormSchemaCodegen() { } + @Override public CodegenType getTag() { return CodegenType.SCHEMA; } + @Override public String getName() { return "ktorm-schema"; } + @Override public String getHelp() { return "Generates a kotlin-ktorm schema (beta)"; } @@ -1097,11 +1114,6 @@ public String escapeQuotationMark(String input) { return input.replace("'", ""); } - @Override - public String escapeUnsafeCharacters(String input) { - return input.replace("*/", "*_/").replace("/*", "/_*"); - } - /** * Sets default database name for all queries * Provided value will be escaped when necessary @@ -1118,34 +1130,6 @@ public void setDefaultDatabaseName(String databaseName) { this.defaultDatabaseName = escapedName; } - /** - * Returns default database name for all queries - * This value must be used with backticks only, eg. `database_name` - * - * @return default database name - */ - public String getDefaultDatabaseName() { - return this.defaultDatabaseName; - } - - /** - * Sets imported package name for the models - * - * @param name name - */ - public void setImportModelPackageName(String name) { - this.importModelPackageName = name; - } - - /** - * Returns imported package name for the models - * - * @return name - */ - public String getImportModelPackageName() { - return this.importModelPackageName; - } - /** * Sets identifier naming convention for table names and column names. * This is not related to database name which is defined by defaultDatabaseName option. @@ -1164,42 +1148,6 @@ public void setIdentifierNamingConvention(String naming) { } } - /** - * Returns identifier naming convention for table names and column names. - * - * @return identifier naming convention - */ - public String getIdentifierNamingConvention() { - return this.identifierNamingConvention; - } - - /** - * Sets primary key naming convention - * - * @param name name - */ - public void setPrimaryKeyConvention(String name) { - this.primaryKeyConvention = name; - } - - /** - * Returns primary key naming convention - * - * @return name - */ - public String getPrimaryKeyConvention() { - return this.primaryKeyConvention; - } - - /** - * Sets primary key naming convention - * - * @param enable enable this option - */ - public void setAddSurrogateKey(boolean enable) { - this.addSurrogateKey = enable; - } - /** * Returns primary key naming convention * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java index 5dec9a470049..9f6ff2977ced 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java @@ -17,8 +17,8 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.GeneratorMetadata; @@ -42,20 +42,23 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(LuaClientCodegen.class); protected String specFolder = "spec"; - protected String packageName = "openapiclient"; - protected String packageVersion = "1.0.0-1"; + @Setter protected String packageName = "openapiclient"; + @Setter protected String packageVersion = "1.0.0-1"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; - protected String luaRocksFilename = "openapiclient-1.0.0-1.rockspec"; + @Setter protected String luaRocksFilename = "openapiclient-1.0.0-1.rockspec"; + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "lua"; } + @Override public String getHelp() { return "Generates a Lua client library (beta)."; } @@ -233,6 +236,7 @@ public String apiFileFolder() { return outputFolder + File.separator + packageName + File.separator + "api" + File.separator; } + @Override public String modelFileFolder() { return outputFolder + File.separator + packageName + File.separator + "model" + File.separator; } @@ -500,18 +504,6 @@ protected boolean needToImport(String type) { && !languageSpecificPrimitives.contains(type); } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - - public void setLuaRocksFilename(String luaRocksFilename) { - this.luaRocksFilename = luaRocksFilename; - } - @Override public String escapeQuotationMark(String input) { // remove " to avoid code injection diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java index 7eb20048feee..1815860f40c9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java @@ -15,14 +15,17 @@ public class MarkdownDocumentationCodegen extends DefaultCodegen implements Code private final Logger LOGGER = LoggerFactory.getLogger(MarkdownDocumentationCodegen.class); + @Override public CodegenType getTag() { return CodegenType.DOCUMENTATION; } + @Override public String getName() { return "markdown"; } + @Override public String getHelp() { return "Generates a markdown documentation."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java index deb82787d0f1..02e6d8456a0b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java @@ -16,6 +16,8 @@ package org.openapitools.codegen.languages; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; @@ -59,12 +61,34 @@ public class MysqlSchemaCodegen extends DefaultCodegen implements CodegenConfig "GEOMETRY", "GEOMETRYCOLLECTION", "LINESTRING", "MULTILINESTRING", "MULTIPOINT", "MULTIPOLYGON", "POINT", "POLYGON" )); - protected String defaultDatabaseName = "", databaseNamePrefix = "", databaseNameSuffix = "_db"; + /** + * -- GETTER -- + * Returns default database name for all MySQL queries + * This value must be used with backticks only, eg. `database_name` + * + * @return default database name + */ + @Getter protected String defaultDatabaseName = "", databaseNamePrefix = "", databaseNameSuffix = "_db"; protected String tableNamePrefix = "tbl_", tableNameSuffix = ""; protected String columnNamePrefix = "col_", columnNameSuffix = ""; + /** + * Whether JSON data type enabled or disabled in all MySQL queries. + * JSON data type requires MySQL version 5.7.8 + */ + @Getter @Setter protected Boolean jsonDataTypeEnabled = true; + /** + * Whether named parameters enabled or disabled in prepared SQLs + */ + @Getter @Setter protected Boolean namedParametersEnabled = false; - protected String identifierNamingConvention = "original"; + /** + * -- GETTER -- + * Returns identifier naming convention for table names and column names. + * + * @return identifier naming convention + */ + @Getter protected String identifierNamingConvention = "original"; public MysqlSchemaCodegen() { super(); @@ -1162,53 +1186,6 @@ public void setDefaultDatabaseName(String databaseName) { this.defaultDatabaseName = escapedName; } - /** - * Returns default database name for all MySQL queries - * This value must be used with backticks only, eg. `database_name` - * - * @return default database name - */ - public String getDefaultDatabaseName() { - return this.defaultDatabaseName; - } - - /** - * Enables special JSON data type in all MySQL queries - * JSON data type requires MySQL version 5.7.8 - * - * @param enabled true to enable, otherwise false - */ - public void setJsonDataTypeEnabled(Boolean enabled) { - this.jsonDataTypeEnabled = enabled; - } - - /** - * Whether JSON data type enabled or disabled in all MySQL queries - * - * @return true if enabled otherwise false - */ - public Boolean getJsonDataTypeEnabled() { - return this.jsonDataTypeEnabled; - } - - /** - * Enables named parameters in prepared SQLs - * - * @param enabled true to enable, otherwise false - */ - public void setNamedParametersEnabled(Boolean enabled) { - this.namedParametersEnabled = enabled; - } - - /** - * Whether named parameters enabled or disabled in prepared SQLs - * - * @return true if enabled otherwise false - */ - public Boolean getNamedParametersEnabled() { - return this.namedParametersEnabled; - } - /** * Sets identifier naming convention for table names and column names. * This is not related to database name which is defined by defaultDatabaseName option. @@ -1227,15 +1204,6 @@ public void setIdentifierNamingConvention(String naming) { } } - /** - * Returns identifier naming convention for table names and column names. - * - * @return identifier naming convention - */ - public String getIdentifierNamingConvention() { - return this.identifierNamingConvention; - } - /** * Slightly modified version of AbstractPhpCodegen.toSrcPath method. * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/N4jsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/N4jsClientCodegen.java index 972d8bbdb0db..6f154dbb2731 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/N4jsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/N4jsClientCodegen.java @@ -61,8 +61,6 @@ import org.slf4j.LoggerFactory; import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.media.ArraySchema; -import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; @@ -79,14 +77,17 @@ public class N4jsClientCodegen extends DefaultCodegen implements CodegenConfig { private boolean checkSuperfluousBodyProps = true; private boolean generateDefaultApiExecuter = true; + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "n4js"; } + @Override public String getHelp() { return "Generates a n4js client."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java index bed1cec85ecc..b2332a2d9642 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java @@ -16,9 +16,9 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.StringSchema; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; @@ -43,17 +43,20 @@ public class NimClientCodegen extends DefaultCodegen implements CodegenConfig { public static final String PROJECT_NAME = "projectName"; - protected String packageName = "openapiclient"; - protected String packageVersion = "1.0.0"; + @Setter protected String packageName = "openapiclient"; + @Setter protected String packageVersion = "1.0.0"; + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "nim"; } + @Override public String getHelp() { return "Generates a nim client (beta)."; } @@ -166,14 +169,6 @@ public NimClientCodegen() { typeMapping.put("file", "string"); } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - @Override public ModelsMap postProcessModels(ModelsMap objs) { return postProcessModelsEnum(objs); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java index 0f01e91e89dc..c6aa293cdeea 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java @@ -25,6 +25,8 @@ import io.swagger.v3.oas.models.PathItem.HttpMethod; import io.swagger.v3.oas.models.Paths; import io.swagger.v3.oas.models.info.Info; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -58,6 +60,7 @@ public class NodeJSExpressServerCodegen extends DefaultCodegen implements Codege protected String defaultServerPort = "8080"; protected String implFolder = "services"; protected String projectName = "openapi-server"; + @Getter @Setter protected String exportedName; public NodeJSExpressServerCodegen() { @@ -232,14 +235,6 @@ public String apiFileFolder() { return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar); } - public String getExportedName() { - return exportedName; - } - - public void setExportedName(String name) { - exportedName = name; - } - @Override public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List allModels) { OperationMap objectMap = objs.getOperations(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java index d023dc130522..32329d4a8595 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java @@ -21,6 +21,7 @@ import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.responses.ApiResponse; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -51,8 +52,8 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig public static final String CO_HTTP = "cohttp"; - protected String packageName = "openapi"; - protected String packageVersion = "1.0.0"; + @Setter protected String packageName = "openapi"; + @Setter protected String packageVersion = "1.0.0"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; protected String apiFolder = "src/apis"; @@ -62,14 +63,17 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig private Map enumHash = new HashMap<>(); private Map enumUniqNames; + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "ocaml"; } + @Override public String getHelp() { return "Generates an OCaml client library (beta)."; } @@ -752,14 +756,6 @@ protected boolean needToImport(String type) { && !languageSpecificPrimitives.contains(type); } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - @Override public String escapeQuotationMark(String input) { // remove " to avoid code injection diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java index 391b8eb46b94..9c388464071f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java @@ -17,8 +17,8 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; @@ -48,13 +48,13 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { public static final String CORE_DATA = "coreData"; protected Set foundationClasses = new HashSet<>(); - protected String podName = "OpenAPIClient"; - protected String podVersion = "1.0.0"; - protected String classPrefix = "OAI"; - protected String authorName = "OpenAPI"; - protected String authorEmail = "team@openapitools.org"; - protected String license = DEFAULT_LICENSE; - protected String gitRepoURL = "https://github.com/openapitools/openapi-generator"; + @Setter protected String podName = "OpenAPIClient"; + @Setter protected String podVersion = "1.0.0"; + @Setter protected String classPrefix = "OAI"; + @Setter protected String authorName = "OpenAPI"; + @Setter protected String authorEmail = "team@openapitools.org"; + @Setter protected String license = DEFAULT_LICENSE; + @Setter protected String gitRepoURL = "https://github.com/openapitools/openapi-generator"; protected String[] specialWords = {"new", "copy"}; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; @@ -626,34 +626,6 @@ public String toOperationId(String operationId) { return camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER); } - public void setClassPrefix(String classPrefix) { - this.classPrefix = classPrefix; - } - - public void setPodName(String podName) { - this.podName = podName; - } - - public void setPodVersion(String podVersion) { - this.podVersion = podVersion; - } - - public void setAuthorEmail(String authorEmail) { - this.authorEmail = authorEmail; - } - - public void setAuthorName(String authorName) { - this.authorName = authorName; - } - - public void setGitRepoURL(String gitRepoURL) { - this.gitRepoURL = gitRepoURL; - } - - public void setLicense(String license) { - this.license = license; - } - @Override public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List allModels) { OperationMap operations = objs.getOperations(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java index 19a552bb22ce..67dee27a017d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java @@ -17,8 +17,8 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -44,9 +44,9 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { protected static int emptyFunctionNameCounter = 0; public static final String MODULE_NAME = "moduleName"; public static final String MODULE_VERSION = "moduleVersion"; - protected String moduleName = "WWW::OpenAPIClient"; - protected String modulePathPart = moduleName.replaceAll("::", Matcher.quoteReplacement(File.separator)); - protected String moduleVersion = "1.0.0"; + @Setter protected String moduleName = "WWW::OpenAPIClient"; + @Setter protected String modulePathPart = moduleName.replaceAll("::", Matcher.quoteReplacement(File.separator)); + @Setter protected String moduleVersion = "1.0.0"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; @@ -465,18 +465,6 @@ public String toOperationId(String operationId) { return underscore(sanitizeName(operationId)); } - public void setModuleName(String moduleName) { - this.moduleName = moduleName; - } - - public void setModulePathPart(String modulePathPart) { - this.modulePathPart = modulePathPart; - } - - public void setModuleVersion(String moduleVersion) { - this.moduleVersion = moduleVersion; - } - @Override public void setParameterExampleValue(CodegenParameter p) { String example; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java index 16920f32fc97..8ba229df4b83 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java @@ -43,6 +43,7 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen { * @return the CodegenType for this generator * @see org.openapitools.codegen.CodegenType */ + @Override public CodegenType getTag() { return CodegenType.SERVER; } @@ -53,6 +54,7 @@ public CodegenType getTag() { * * @return the friendly name for the generator */ + @Override public String getName() { return "php-laravel"; } @@ -63,6 +65,7 @@ public String getName() { * * @return A string value for the help message */ + @Override public String getHelp() { return "Generates a PHP laravel server library."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java index fc5b114d3f47..a660336ac021 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java @@ -38,6 +38,7 @@ public class PhpLumenServerCodegen extends AbstractPhpCodegen { * @return the CodegenType for this generator * @see org.openapitools.codegen.CodegenType */ + @Override public CodegenType getTag() { return CodegenType.SERVER; } @@ -48,6 +49,7 @@ public CodegenType getTag() { * * @return the friendly name for the generator */ + @Override public String getName() { return "php-lumen"; } @@ -58,6 +60,7 @@ public String getName() { * * @return A string value for the help message */ + @Override public String getHelp() { return "Generates a PHP Lumen server library."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java index 22da687b9e64..6335eafdd160 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java index df8f7eee7b90..4eecd23cd4e7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java @@ -17,13 +17,12 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; +import lombok.Getter; import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.CodegenOperation; -import org.openapitools.codegen.CodegenSecurity; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.SupportingFile; @@ -56,7 +55,13 @@ public class PhpSlim4ServerCodegen extends AbstractPhpCodegen { protected String authPackage = ""; protected String appDirName = "App"; protected String appPackage = ""; - protected String psr7Implementation = "slim-psr7"; + /** + * -- GETTER -- + * Returns PSR-7 implementation package. + * + * @return PSR-7 implementation package + */ + @Getter protected String psr7Implementation = "slim-psr7"; protected String interfacesDirName = "Interfaces"; protected String interfacesPackage = ""; @@ -394,12 +399,4 @@ public void setPsr7Implementation(String psr7Implementation) { } } - /** - * Returns PSR-7 implementation package. - * - * @return PSR-7 implementation package - */ - public String getPsr7Implementation() { - return this.psr7Implementation; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java index 823e9609929c..8a0aa66e939b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java @@ -17,8 +17,9 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; @@ -48,10 +49,10 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg protected String testsPackage; protected String apiTestsPackage; protected String modelTestsPackage; - protected String composerVendorName = "openapi"; - protected String composerProjectName = "server-bundle"; + @Setter protected String composerVendorName = "openapi"; + @Setter protected String composerProjectName = "server-bundle"; protected String testsDirName = "Tests"; - protected String bundleName; + @Getter protected String bundleName; protected String bundleClassName; protected String bundleExtensionName; protected String bundleAlias; @@ -60,7 +61,7 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg protected String controllerPackage; protected String controllerTestsPackage; protected String servicePackage; - protected Boolean phpLegacySupport = Boolean.TRUE; + @Setter protected Boolean phpLegacySupport = Boolean.TRUE; protected HashSet typeHintable; @@ -212,10 +213,6 @@ public PhpSymfonyServerCodegen() { cliOptions.add(new CliOption(PHP_LEGACY_SUPPORT, "Should the generated code be compatible with PHP 5.x?").defaultValue(Boolean.TRUE.toString())); } - public String getBundleName() { - return bundleName; - } - public void setBundleName(String bundleName) { this.bundleName = bundleName; this.bundleClassName = bundleName + "Bundle"; @@ -230,10 +227,6 @@ public void setBundleAlias(String alias) { } } - public void setPhpLegacySupport(Boolean support) { - this.phpLegacySupport = support; - } - public String controllerFileFolder() { return (outputFolder + File.separator + toSrcPath(controllerPackage, srcBasePath)); } @@ -492,6 +485,7 @@ public String prependSlashToDataTypeOnlyIfNecessary(String dataType) { * @param name the name of the property * @return getter name based on naming convention */ + @Override public String toBooleanGetter(String name) { return "is" + getterAndSetterCapitalize(name); } @@ -514,14 +508,6 @@ public String modelTestFileFolder() { return (outputFolder + File.separator + toSrcPath(modelTestsPackage, srcBasePath)); } - public void setComposerVendorName(String composerVendorName) { - this.composerVendorName = composerVendorName; - } - - public void setComposerProjectName(String composerProjectName) { - this.composerProjectName = composerProjectName; - } - @Override public void setInvokerPackage(String invokerPackage) { super.setInvokerPackage(invokerPackage); @@ -611,6 +597,7 @@ public String toRegularExpression(String pattern) { return escapeText(pattern); } + @Override public String toApiName(String name) { if (name.isEmpty()) { return "DefaultApiInterface"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java index 6212b7929b55..2b7314ef699b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java @@ -32,14 +32,17 @@ public class PlantumlDocumentationCodegen extends DefaultCodegen implements Code final Logger LOGGER = LoggerFactory.getLogger(PlantumlDocumentationCodegen.class); + @Override public CodegenType getTag() { return CodegenType.DOCUMENTATION; } + @Override public String getName() { return "plantuml"; } + @Override public String getHelp() { return "Generates a plantuml documentation."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PostmanCollectionCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PostmanCollectionCodegen.java index 03fa6c5141bf..d3f7d77f91c5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PostmanCollectionCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PostmanCollectionCodegen.java @@ -10,6 +10,8 @@ import io.swagger.v3.oas.models.examples.Example; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.servers.ServerVariable; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; @@ -85,6 +87,7 @@ public class PostmanCollectionCodegen extends DefaultCodegen implements CodegenC * @return the CodegenType for this generator * @see org.openapitools.codegen.CodegenType */ + @Override public CodegenType getTag() { return CodegenType.SCHEMA; } @@ -101,6 +104,7 @@ public GeneratorLanguage generatorLanguage() { * * @return the friendly name for the generator */ + @Override public String getName() { return "postman-collection"; } @@ -453,6 +457,7 @@ List setPostmanIsoTimestamp(List postman * * @return A string value for the help message */ + @Override public String getHelp() { return "Generates a Postman collection (format v2.1.0) JSON file"; } @@ -505,6 +510,7 @@ public String toDefaultValue(Schema schema) { * @param input String to be cleaned up * @return string with quotation mark removed or escaped */ + @Override public String escapeQuotationMark(String input) { //TODO: check that this logic is safe to escape quotation mark to avoid code injection return input.replace("\"", "\\\""); @@ -820,7 +826,7 @@ public String getPostmanType(CodegenProperty codegenProperty) { } // Supporting models - public class PostmanRequestItem { + @Getter @Setter public class PostmanRequestItem { private String name; private String body; @@ -833,23 +839,9 @@ public PostmanRequestItem(String name, String body) { this.body = body; } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } } + @Getter @Setter class PostmanVariable { private String name; @@ -871,30 +863,6 @@ public PostmanVariable addeDefaultValue(String defaultValue) { return this; } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getDefaultValue() { - return defaultValue; - } - - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - @Override public boolean equals(Object o) { if (this == o) return true; @@ -917,6 +885,5 @@ public String toString() { '}'; } } - } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java index edf53eb51745..6550d352bb5d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java @@ -16,8 +16,8 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; @@ -43,29 +43,29 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(PowerShellClientCodegen.class); - private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; + @Setter private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}"; - protected String sourceFolder = "src"; + @Setter protected String sourceFolder = "src"; protected String packageName = "PSOpenAPITools"; - protected String packageVersion = "0.1.2"; + @Setter protected String packageVersion = "0.1.2"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; protected String apiTestPath = "tests/Api"; protected String modelTestPath = "tests/Model"; protected HashSet nullablePrimitives; - protected String powershellGalleryUrl; + @Setter protected String powershellGalleryUrl; protected HashSet powershellVerbs; protected Map commonVerbs; // verbs not in the official ps verb list but can be mapped to one of the verbs protected HashSet methodNames; // store a list of method names to detect duplicates - protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup - protected boolean discardReadOnly = false; // Discard the readonly property in initialize cmdlet - protected boolean skipVerbParsing = false; // Attempt to parse cmdlets from operation names - protected String projectUri; - protected String licenseUri; - protected String releaseNotes; - protected String tags; - protected String iconUri; + @Setter protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup + @Setter protected boolean discardReadOnly = false; // Discard the readonly property in initialize cmdlet + @Setter protected boolean skipVerbParsing = false; // Attempt to parse cmdlets from operation names + @Setter protected String projectUri; + @Setter protected String licenseUri; + @Setter protected String releaseNotes; + @Setter protected String tags; + @Setter protected String iconUri; protected Set paramNameReservedWords; protected String modelsCmdletVerb = "Initialize"; protected boolean useClassNameInModelsExamples = true; @@ -577,14 +577,17 @@ public PowerShellClientCodegen() { additionalProperties.put("psData", null); } + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "powershell"; } + @Override public String getHelp() { return "Generates a PowerShell API client (beta)"; } @@ -595,60 +598,14 @@ public void setPackageName(String packageName) { this.modelPackage = packageName + File.separator + "Model"; } - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - - public void setPackageGuid(String packageGuid) { - this.packageGuid = packageGuid; - } - - public void setPowershellGalleryUrl(String powershellGalleryUrl) { - this.powershellGalleryUrl = powershellGalleryUrl; - } - - public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) { - this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup; - } - public boolean getUseOneOfDiscriminatorLookup() { return this.useOneOfDiscriminatorLookup; } - public void setDiscardReadOnly(boolean discardReadOnly) { - this.discardReadOnly = discardReadOnly; - } - public boolean getDiscardReadOnly() { return this.discardReadOnly; } - public void setTags(String tags){ - this.tags = tags; - } - - public void setLicenseUri(String licenseUri){ - this.licenseUri = licenseUri; - } - - public void setProjectUri(String projectUri){ - this.projectUri = projectUri; - } - - public void setReleaseNotes(String releaseNotes){ - this.releaseNotes = releaseNotes; - } - - public void setIconUri(String iconUri){ - this.iconUri = iconUri; - } - - public void setSkipVerbParsing(boolean skipVerbParsing) { this.skipVerbParsing = skipVerbParsing; } - public void SetModelsCmdletVerb(String modelsCmdletVerb) { this.modelsCmdletVerb = modelsCmdletVerb; } public void SetUseClassNameInModelsExamples(boolean useClassNameInModelsExamples) { this.useClassNameInModelsExamples = useClassNameInModelsExamples; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java index f1ca476646ae..bac31f924dd6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java @@ -16,9 +16,9 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.exceptions.ProtoBufIndexComputationException; import org.openapitools.codegen.meta.GeneratorMetadata; @@ -56,7 +56,7 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf private final Logger LOGGER = LoggerFactory.getLogger(ProtobufSchemaCodegen.class); - protected String packageName = "openapitools"; + @Setter protected String packageName = "openapitools"; private boolean numberedFieldNumberList = false; @@ -67,10 +67,12 @@ public CodegenType getTag() { return CodegenType.SCHEMA; } + @Override public String getName() { return "protobuf-schema"; } + @Override public String getHelp() { return "Generates gRPC and protocol buffer schema files (beta)"; } @@ -485,10 +487,6 @@ public String toApiVarName(String name) { return underscore(name) + "_service"; } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - @Override public String toModelFilename(String name) { // underscore the model file name diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAiohttpConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAiohttpConnexionServerCodegen.java index d497c8a0e01e..49e869399429 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAiohttpConnexionServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAiohttpConnexionServerCodegen.java @@ -77,5 +77,5 @@ protected void addSupportingFiles() { } @Override - public String generatorLanguageVersion() { return "3.5.2+"; }; + public String generatorLanguageVersion() { return "3.5.2+"; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java index e36fc7a3170b..e0fdc0a52b30 100755 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java @@ -267,5 +267,5 @@ public String apiFileFolder() { } @Override - public String generatorLanguageVersion() { return "3.5.2+"; }; + public String generatorLanguageVersion() { return "3.5.2+"; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java index 93cebd71582f..8b10ad97c160 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java @@ -17,19 +17,14 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; import org.openapitools.codegen.meta.features.*; -import org.openapitools.codegen.meta.features.*; -import org.openapitools.codegen.model.ModelMap; -import org.openapitools.codegen.model.ModelsMap; -import org.openapitools.codegen.model.OperationMap; -import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.ProcessUtils; import org.slf4j.Logger; @@ -38,7 +33,6 @@ import java.io.File; import java.util.*; -import static org.openapitools.codegen.utils.StringUtils.escape; import static org.openapitools.codegen.utils.StringUtils.underscore; public class PythonClientCodegen extends AbstractPythonCodegen implements CodegenConfig { @@ -50,12 +44,12 @@ public class PythonClientCodegen extends AbstractPythonCodegen implements Codege public static final String DATETIME_FORMAT = "datetimeFormat"; public static final String DATE_FORMAT = "dateFormat"; - protected String packageUrl; + @Setter protected String packageUrl; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; - protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup - protected String datetimeFormat = "%Y-%m-%dT%H:%M:%S.%f%z"; - protected String dateFormat = "%Y-%m-%d"; + @Setter protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup + @Setter protected String datetimeFormat = "%Y-%m-%dT%H:%M:%S.%f%z"; + @Setter protected String dateFormat = "%Y-%m-%d"; private String testFolder; @@ -335,10 +329,6 @@ public void processOpts() { apiPackage = this.packageName + "." + apiPackage; } - public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) { - this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup; - } - public boolean getUseOneOfDiscriminatorLookup() { return this.useOneOfDiscriminatorLookup; } @@ -413,10 +403,6 @@ public String modelTestFileFolder() { return outputFolder + File.separatorChar + testFolder; } - public void setPackageUrl(String packageUrl) { - this.packageUrl = packageUrl; - } - public String packagePath() { return packageName.replace('.', File.separatorChar); } @@ -456,14 +442,4 @@ public String escapeReservedWord(String name) { } return "var_" + name; } - - public void setDatetimeFormat(String datetimeFormat) { - this.datetimeFormat = datetimeFormat; - } - - public void setDateFormat(String dateFormat) { - this.dateFormat = dateFormat; - } - - } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java index 5fb5d415ee4b..49d55ba09868 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -338,5 +337,5 @@ public void postProcess() { } @Override - public String generatorLanguageVersion() { return "3.7"; }; + public String generatorLanguageVersion() { return "3.7"; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java index f667f7b6fca2..715574a8835f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java @@ -56,5 +56,5 @@ protected void addSupportingFiles() { } @Override - public String generatorLanguageVersion() { return "3.5.2+"; }; + public String generatorLanguageVersion() { return "3.5.2+"; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonPydanticV1ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonPydanticV1ClientCodegen.java index 0c7c0bbc78e4..bf1823b9016d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonPydanticV1ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonPydanticV1ClientCodegen.java @@ -17,19 +17,14 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; import org.openapitools.codegen.meta.features.*; -import org.openapitools.codegen.meta.features.*; -import org.openapitools.codegen.model.ModelMap; -import org.openapitools.codegen.model.ModelsMap; -import org.openapitools.codegen.model.OperationMap; -import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.ProcessUtils; import org.slf4j.Logger; @@ -38,7 +33,6 @@ import java.io.File; import java.util.*; -import static org.openapitools.codegen.utils.StringUtils.escape; import static org.openapitools.codegen.utils.StringUtils.underscore; public class PythonPydanticV1ClientCodegen extends AbstractPythonPydanticV1Codegen implements CodegenConfig { @@ -50,12 +44,12 @@ public class PythonPydanticV1ClientCodegen extends AbstractPythonPydanticV1Codeg public static final String DATETIME_FORMAT = "datetimeFormat"; public static final String DATE_FORMAT = "dateFormat"; - protected String packageUrl; + @Setter protected String packageUrl; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; - protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup - protected String datetimeFormat = "%Y-%m-%dT%H:%M:%S.%f%z"; - protected String dateFormat = "%Y-%m-%d"; + @Setter protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup + @Setter protected String datetimeFormat = "%Y-%m-%dT%H:%M:%S.%f%z"; + @Setter protected String dateFormat = "%Y-%m-%d"; private String testFolder; @@ -350,10 +344,6 @@ public void processOpts() { apiPackage = this.packageName + "." + apiPackage; } - public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) { - this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup; - } - public boolean getUseOneOfDiscriminatorLookup() { return this.useOneOfDiscriminatorLookup; } @@ -428,10 +418,6 @@ public String modelTestFileFolder() { return outputFolder + File.separatorChar + testFolder; } - public void setPackageUrl(String packageUrl) { - this.packageUrl = packageUrl; - } - public String packagePath() { return packageName.replace('.', File.separatorChar); } @@ -471,14 +457,4 @@ public String escapeReservedWord(String name) { } return "var_" + name; } - - public void setDatetimeFormat(String datetimeFormat) { - this.datetimeFormat = datetimeFormat; - } - - public void setDateFormat(String dateFormat) { - this.dateFormat = dateFormat; - } - - } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java index 8e1d295dcd1a..7e7d8ebb3515 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java @@ -17,15 +17,14 @@ package org.openapitools.codegen.languages; -import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; //import com.sun.media.sound.InvalidDataException; import io.swagger.v3.oas.models.examples.Example; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; @@ -50,12 +49,12 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(RClientCodegen.class); - protected String packageName = "openapi"; - protected String packageVersion = "1.0.0"; + @Setter protected String packageName = "openapi"; + @Setter protected String packageVersion = "1.0.0"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; protected String testFolder = "tests/testthat"; - protected boolean returnExceptionOnFailure = false; + @Setter protected boolean returnExceptionOnFailure = false; protected String exceptionPackage = "default"; protected Map exceptionPackages = new LinkedHashMap(); protected Set itemReservedWords = new TreeSet(); @@ -74,21 +73,24 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig { protected boolean useDefaultExceptionHandling = false; protected boolean useRlangExceptionHandling = false; - protected String errorObjectType; + @Setter protected String errorObjectType; protected String operationIdNaming; - protected boolean generateWrapper; - protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup + @Setter protected boolean generateWrapper; + @Setter protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup private Map schemaKeyToModelNameCache = new HashMap<>(); + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "r"; } + @Override public String getHelp() { return "Generates a R client library (beta)."; } @@ -387,6 +389,7 @@ public String apiFileFolder() { return outputFolder + File.separator + "R" + File.separator; } + @Override public String modelFileFolder() { return outputFolder + File.separator + "R" + File.separator; } @@ -631,18 +634,6 @@ protected boolean needToImport(String type) { return !languageSpecificPrimitives.contains(type); } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - - public void setReturnExceptionOnFailure(boolean returnExceptionOnFailure) { - this.returnExceptionOnFailure = returnExceptionOnFailure; - } - public void setExceptionPackageToUse(String exceptionPackage) { if (DEFAULT.equals(exceptionPackage)) this.useDefaultExceptionHandling = true; @@ -652,18 +643,6 @@ public void setExceptionPackageToUse(String exceptionPackage) { } } - public void setErrorObjectType(final String errorObjectType) { - this.errorObjectType = errorObjectType; - } - - public void setGenerateWrapper(final boolean generateWrapper) { - this.generateWrapper = generateWrapper; - } - - public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) { - this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup; - } - public boolean getUseOneOfDiscriminatorLookup() { return this.useOneOfDiscriminatorLookup; } @@ -822,6 +801,7 @@ public void setParameterExampleValue(CodegenParameter p) { * @param codegenParameter Codegen parameter * @param parameter Parameter */ + @Override public void setParameterExampleValue(CodegenParameter codegenParameter, Parameter parameter) { if (parameter.getExample() != null) { codegenParameter.example = parameter.getExample().toString(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java index 966089f24432..2e1731f4af16 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java @@ -20,6 +20,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; @@ -56,22 +57,22 @@ public class RubyClientCodegen extends AbstractRubyCodegen { private final Logger LOGGER = LoggerFactory.getLogger(RubyClientCodegen.class); private static final String NUMERIC_ENUM_PREFIX = "N"; protected static int emptyMethodNameCounter = 0; - protected String gemName; - protected String moduleName; - protected String gemVersion = "1.0.0"; + @Setter protected String gemName; + @Setter protected String moduleName; + @Setter protected String gemVersion = "1.0.0"; protected String specFolder = "spec"; protected String libFolder = "lib"; - protected String gemLicense = "unlicense"; - protected String gemRequiredRubyVersion = ">= 1.9"; - protected String gemHomepage = "https://openapitools.org"; - protected String gemSummary = "A Ruby SDK for the REST API"; - protected String gemDescription = "This gem maps to a REST API"; - protected String gemAuthor = ""; - protected String gemMetadata = "{}"; - protected String gemAuthorEmail = ""; + @Setter protected String gemLicense = "unlicense"; + @Setter protected String gemRequiredRubyVersion = ">= 1.9"; + @Setter protected String gemHomepage = "https://openapitools.org"; + @Setter protected String gemSummary = "A Ruby SDK for the REST API"; + @Setter protected String gemDescription = "This gem maps to a REST API"; + @Setter protected String gemAuthor = ""; + @Setter protected String gemMetadata = "{}"; + @Setter protected String gemAuthorEmail = ""; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; - protected boolean useAutoload = false; + @Setter protected boolean useAutoload = false; private Map schemaKeyToModelNameCache = new HashMap<>(); @@ -590,54 +591,6 @@ public String toApiImport(String name) { return gemName + "/" + apiPackage() + "/" + toApiFilename(name); } - public void setGemName(String gemName) { - this.gemName = gemName; - } - - public void setModuleName(String moduleName) { - this.moduleName = moduleName; - } - - public void setGemVersion(String gemVersion) { - this.gemVersion = gemVersion; - } - - public void setGemDescription(String gemDescription) { - this.gemDescription = gemDescription; - } - - public void setGemSummary(String gemSummary) { - this.gemSummary = gemSummary; - } - - public void setGemLicense(String gemLicense) { - this.gemLicense = gemLicense; - } - - public void setGemRequiredRubyVersion(String gemRequiredRubyVersion) { - this.gemRequiredRubyVersion = gemRequiredRubyVersion; - } - - public void setGemHomepage(String gemHomepage) { - this.gemHomepage = gemHomepage; - } - - public void setGemAuthor(String gemAuthor) { - this.gemAuthor = gemAuthor; - } - - public void setGemAuthorEmail(String gemAuthorEmail) { - this.gemAuthorEmail = gemAuthorEmail; - } - - public void setGemMetadata(String gemMetadata) { - this.gemMetadata = gemMetadata; - } - - public void setUseAutoload(boolean useAutoload) { - this.useAutoload = useAutoload; - } - @Override protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) { final Schema additionalProperties = ModelUtils.getAdditionalProperties(schema); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyOnRailsServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyOnRailsServerCodegen.java index 576216bbf017..b3f484f375cd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyOnRailsServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyOnRailsServerCodegen.java @@ -18,6 +18,7 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenType; @@ -66,7 +67,7 @@ public class RubyOnRailsServerCodegen extends AbstractRubyCodegen { protected String pidFolder = tmpFolder + File.separator + "pids"; protected String socketsFolder = tmpFolder + File.separator + "sockets"; protected String vendorFolder = "vendor"; - protected String databaseAdapter = "sqlite"; + @Setter protected String databaseAdapter = "sqlite"; public RubyOnRailsServerCodegen() { @@ -294,8 +295,4 @@ public Map postProcessSupportingFileData(Map obj generateYAMLSpecFile(objs); return super.postProcessSupportingFileData(objs); } - - public void setDatabaseAdapter(String databaseAdapter) { - this.databaseAdapter = databaseAdapter; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustAxumServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustAxumServerCodegen.java index 4b36b305c097..9f8475eb20f1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustAxumServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustAxumServerCodegen.java @@ -20,7 +20,6 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.RequestBody; @@ -45,7 +44,6 @@ import java.io.File; import java.io.IOException; -import java.io.ObjectInputFilter.Config; import java.math.BigInteger; import java.nio.file.Path; import java.util.*; @@ -245,14 +243,17 @@ public RustAxumServerCodegen() { .doNotOverwrite()); } + @Override public CodegenType getTag() { return CodegenType.SERVER; } + @Override public String getName() { return "rust-axum"; } + @Override public String getHelp() { return "Generates a Rust server library which bases on Axum."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java index 78669ce2fbae..9dd063204be9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java @@ -22,6 +22,8 @@ import io.swagger.v3.oas.models.media.*; import io.swagger.v3.parser.util.SchemaTypeUtil; import joptsimple.internal.Strings; +import lombok.AccessLevel; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; @@ -43,14 +45,14 @@ public class RustClientCodegen extends AbstractRustCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(RustClientCodegen.class); - private boolean useSingleRequestParameter = false; - private boolean supportAsync = true; - private boolean supportMiddleware = false; + @Setter(AccessLevel.PRIVATE) private boolean useSingleRequestParameter = false; + @Setter(AccessLevel.PRIVATE) private boolean supportAsync = true; + @Setter(AccessLevel.PRIVATE) private boolean supportMiddleware = false; private boolean supportMultipleResponses = false; private boolean withAWSV4Signature = false; - private boolean preferUnsignedInt = false; - private boolean bestFitInt = false; - private boolean avoidBoxedModels = false; + @Setter private boolean preferUnsignedInt = false; + @Setter private boolean bestFitInt = false; + @Setter private boolean avoidBoxedModels = false; public static final String PACKAGE_NAME = "packageName"; public static final String PACKAGE_VERSION = "packageVersion"; @@ -63,21 +65,24 @@ public class RustClientCodegen extends AbstractRustCodegen implements CodegenCon public static final String BEST_FIT_INT = "bestFitInt"; public static final String AVOID_BOXED_MODELS = "avoidBoxedModels"; - protected String packageName = "openapi"; - protected String packageVersion = "1.0.0"; + @Setter protected String packageName = "openapi"; + @Setter protected String packageVersion = "1.0.0"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; protected String apiFolder = "src/apis"; protected String modelFolder = "src/models"; + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "rust"; } + @Override public String getHelp() { return "Generates a Rust client library (beta)."; } @@ -417,18 +422,10 @@ private boolean getSupportAsync() { return supportAsync; } - private void setSupportAsync(boolean supportAsync) { - this.supportAsync = supportAsync; - } - private boolean getSupportMiddleware() { return supportMiddleware; } - private void setSupportMiddleware(boolean supportMiddleware) { - this.supportMiddleware = supportMiddleware; - } - public boolean getSupportMultipleReturns() { return supportMultipleResponses; } @@ -441,34 +438,18 @@ public boolean getPreferUnsignedInt() { return preferUnsignedInt; } - public void setPreferUnsignedInt(boolean preferUnsignedInt) { - this.preferUnsignedInt = preferUnsignedInt; - } - public boolean getBestFitInt() { return bestFitInt; } - public void setBestFitInt(boolean bestFitInt) { - this.bestFitInt = bestFitInt; - } - private boolean getUseSingleRequestParameter() { return useSingleRequestParameter; } - private void setUseSingleRequestParameter(boolean useSingleRequestParameter) { - this.useSingleRequestParameter = useSingleRequestParameter; - } - public boolean getAvoidBoxedModels() { return avoidBoxedModels; } - public void setAvoidBoxedModels(boolean avoidBoxedModels) { - this.avoidBoxedModels = avoidBoxedModels; - } - @Override public String apiFileFolder() { return (outputFolder + File.separator + apiFolder).replace("/", File.separator); @@ -623,14 +604,6 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List> pathSetMap = new HashMap(); protected Map> callbacksPathSetMap = new HashMap(); @@ -282,10 +282,6 @@ public void setPackageName(String packageName) { this.externCrateName = packageName.replace('-', '_'); } - public void setPackageVersion(String packageVersion) { - this.packageVersion = packageVersion; - } - @Override public String apiPackage() { return apiPath; @@ -1128,6 +1124,7 @@ private static void addPathSetMapToBundle(Map> pathS // the templates to process. List>> pathSetEntryList = new ArrayList(pathSetMap.entrySet()); Collections.sort(pathSetEntryList, new Comparator>>() { + @Override public int compare(Map.Entry> a, Map.Entry> b) { return a.getValue().get("path").compareTo(b.getValue().get("path")); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java index a5df2e22ba49..e03a7f90965e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java @@ -17,9 +17,6 @@ package org.openapitools.codegen.languages; -import com.samskivert.mustache.Mustache; -import com.samskivert.mustache.Template; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; import org.apache.commons.lang3.StringUtils; @@ -33,13 +30,8 @@ import org.slf4j.LoggerFactory; import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; import java.util.*; -import static org.openapitools.codegen.utils.StringUtils.camelize; - public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements CodegenConfig { protected String mainPackage = "org.openapitools.client"; protected String groupId = "org.openapitools"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java index a88e5cc1d8f3..2962bfc56191 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java @@ -67,14 +67,17 @@ public class ScalaAkkaHttpServerCodegen extends AbstractScalaCodegen implements final Logger LOGGER = LoggerFactory.getLogger(ScalaAkkaHttpServerCodegen.class); + @Override public CodegenType getTag() { return CodegenType.SERVER; } + @Override public String getName() { return "scala-akka-http-server"; } + @Override public String getHelp() { return "Generates a scala-akka-http server (beta)."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaCaskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaCaskServerCodegen.java index 576e138aead4..6487a9921eda 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaCaskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaCaskServerCodegen.java @@ -41,14 +41,17 @@ public class ScalaCaskServerCodegen extends AbstractScalaCodegen implements Code private final Logger LOGGER = LoggerFactory.getLogger(ScalaCaskServerCodegen.class); + @Override public CodegenType getTag() { return CodegenType.SERVER; } + @Override public String getName() { return "scala-cask"; } + @Override public String getHelp() { return "Generates a scala-cask server."; } @@ -152,6 +155,7 @@ public String testPackage() { return "jvm/src/test/scala"; } + @Override public String toModelTestFilename(String name) { String n = super.toModelTestFilename(name); return (modelPackage + "." + n).replace('.', '/'); @@ -305,7 +309,7 @@ public String modelFilename(String templateName, String modelName) { @Override public String apiFileFolder() { - final String folder = outputFolder + "/jvm/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);; + final String folder = outputFolder + "/jvm/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); return folder; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java index 7427c4ce786e..a869bbecad17 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java @@ -17,8 +17,8 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; @@ -38,7 +38,7 @@ public class ScalaFinchServerCodegen extends DefaultCodegen implements CodegenCo protected String artifactId = "finch-server"; protected String artifactVersion = "1.0.0"; protected String sourceFolder = "src/main/scala"; - protected String packageName = "org.openapitools"; + @Setter protected String packageName = "org.openapitools"; public ScalaFinchServerCodegen() { super(); @@ -297,10 +297,6 @@ public String escapeUnsafeCharacters(String input) { return input.replace("*/", "*_/").replace("/*", "/_*"); } - public void setPackageName(String packageName) { - this.packageName = packageName; - } - /** * @param prim primitive type diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java index 5d99d8d80cc9..48e4f81f1249 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java @@ -20,7 +20,6 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; import org.apache.commons.io.FileUtils; @@ -52,6 +51,7 @@ public class ScalaGatlingCodegen extends AbstractScalaCodegen implements Codegen * * @return the CodegenType for this generator */ + @Override public CodegenType getTag() { return CodegenType.CLIENT; } @@ -62,6 +62,7 @@ public CodegenType getTag() { * * @return the friendly name for the generator */ + @Override public String getName() { return "scala-gatling"; } @@ -72,6 +73,7 @@ public String getName() { * * @return A string value for the help message */ + @Override public String getHelp() { return "Generates a gatling simulation library (beta)."; } @@ -231,6 +233,7 @@ public String escapeReservedWord(String name) { * Location to write model files. You can use the modelPackage() as defined when the class is * instantiated */ + @Override public String modelFileFolder() { return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttp4sServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttp4sServerCodegen.java index d97f772e642c..59dc936667d3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttp4sServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttp4sServerCodegen.java @@ -16,7 +16,6 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPekkoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPekkoClientCodegen.java index c4da7d22d21c..1eb47d1d0f80 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPekkoClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPekkoClientCodegen.java @@ -17,9 +17,6 @@ package org.openapitools.codegen.languages; -import com.samskivert.mustache.Mustache; -import com.samskivert.mustache.Template; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; import org.apache.commons.lang3.StringUtils; @@ -33,13 +30,8 @@ import org.slf4j.LoggerFactory; import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; import java.util.*; -import static org.openapitools.codegen.utils.StringUtils.camelize; - public class ScalaPekkoClientCodegen extends AbstractScalaCodegen implements CodegenConfig { protected String mainPackage = "org.openapitools.client"; protected String groupId = "org.openapitools"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java index 4c4d748ab955..44caae87fb31 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java @@ -19,8 +19,8 @@ import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache.Lambda; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ApiInfoMap; @@ -55,12 +55,12 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem final Logger LOGGER = LoggerFactory.getLogger(ScalaPlayFrameworkServerCodegen.class); - protected boolean skipStubs = false; - protected boolean supportAsync = false; - protected boolean generateCustomExceptions = true; - protected boolean useSwaggerUI = true; - protected String routesFileName = "routes"; - protected String basePackage = "org.openapitools"; + @Setter protected boolean skipStubs = false; + @Setter protected boolean supportAsync = false; + @Setter protected boolean generateCustomExceptions = true; + @Setter protected boolean useSwaggerUI = true; + @Setter protected String routesFileName = "routes"; + @Setter protected String basePackage = "org.openapitools"; public ScalaPlayFrameworkServerCodegen() { super(); @@ -119,42 +119,21 @@ public ScalaPlayFrameworkServerCodegen() { addCliOptionWithDefault(USE_SWAGGER_UI, "Add a route to /api which show your documentation in swagger-ui. Will also import needed dependencies", useSwaggerUI); } + @Override public CodegenType getTag() { return CodegenType.SERVER; } + @Override public String getName() { return "scala-play-server"; } + @Override public String getHelp() { return "Generates a Scala server application (beta) with Play Framework."; } - public void setSupportAsync(boolean supportAsync) { - this.supportAsync = supportAsync; - } - - public void setSkipStubs(boolean skipStubs) { - this.skipStubs = skipStubs; - } - - public void setGenerateCustomExceptions(boolean generateCustomExceptions) { - this.generateCustomExceptions = generateCustomExceptions; - } - - public void setRoutesFileName(String routesFileName) { - this.routesFileName = routesFileName; - } - - public void setBasePackage(String basePackage) { - this.basePackage = basePackage; - } - - public void setUseSwaggerUI(boolean useSwaggerUI) { - this.useSwaggerUI = useSwaggerUI; - } - @Override public void processOpts() { super.processOpts(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttp4ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttp4ClientCodegen.java index 3d9d3d1f04a7..9c54671b8634 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttp4ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttp4ClientCodegen.java @@ -1,9 +1,6 @@ package org.openapitools.codegen.languages; -import com.samskivert.mustache.Mustache; -import com.samskivert.mustache.Template; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; @@ -16,23 +13,15 @@ import org.openapitools.codegen.model.ModelsMap; import org.openapitools.codegen.model.OperationMap; import org.openapitools.codegen.model.OperationsMap; -import org.openapitools.codegen.utils.CamelizeOption; import org.openapitools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.openapitools.codegen.utils.CamelizeOption.*; -import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER; -import static org.openapitools.codegen.utils.StringUtils.camelize; - public class ScalaSttp4ClientCodegen extends AbstractScalaCodegen implements CodegenConfig { private static final StringProperty STTP_CLIENT_VERSION = new StringProperty("sttpClientVersion", "The version of " + "sttp client", "4.0.0-M1"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java index 4b4f73dd3e3b..9ef0b2255227 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java @@ -16,10 +16,7 @@ package org.openapitools.codegen.languages; -import com.samskivert.mustache.Mustache; -import com.samskivert.mustache.Template; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; @@ -32,23 +29,15 @@ import org.openapitools.codegen.model.ModelsMap; import org.openapitools.codegen.model.OperationMap; import org.openapitools.codegen.model.OperationsMap; -import org.openapitools.codegen.utils.CamelizeOption; import org.openapitools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.openapitools.codegen.utils.CamelizeOption.*; -import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER; -import static org.openapitools.codegen.utils.StringUtils.camelize; - public class ScalaSttpClientCodegen extends AbstractScalaCodegen implements CodegenConfig { private static final StringProperty STTP_CLIENT_VERSION = new StringProperty("sttpClientVersion", "The version of " + "sttp client", "3.3.18"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalazClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalazClientCodegen.java index 720ed0e8853c..3a46fc6a51a3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalazClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalazClientCodegen.java @@ -19,7 +19,6 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; @@ -38,7 +37,6 @@ import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER; import static org.openapitools.codegen.utils.StringUtils.camelize; -import static org.openapitools.codegen.utils.StringUtils.underscore; public class ScalazClientCodegen extends AbstractScalaCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(ScalazClientCodegen.class); @@ -153,24 +151,6 @@ public String toEnumName(CodegenProperty property) { return formatIdentifier(property.baseName, true); } - public String getNameUsingModelPropertyNaming(String name) { - switch (CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.valueOf(getModelPropertyNaming())) { - case original: - return name; - case camelCase: - return camelize(name, LOWERCASE_FIRST_LETTER); - case PascalCase: - return camelize(name); - case snake_case: - return underscore(name); - default: - throw new IllegalArgumentException("Invalid model property naming '" + - name + "'. Must be 'original', 'camelCase', " + - "'PascalCase' or 'snake_case'"); - } - - } - @Override public String toDefaultValue(Schema p) { if (p.getDefault() != null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index bb241bf05014..85943875b653 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -28,7 +28,6 @@ import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.media.MediaType; import io.swagger.v3.oas.models.media.Schema; -import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.tags.Tag; import java.io.File; @@ -37,6 +36,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; + +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.openapitools.codegen.CliOption; @@ -112,15 +114,11 @@ public class SpringCodegen extends AbstractJavaCodegen public static final String USE_REQUEST_MAPPING_ON_CONTROLLER = "useRequestMappingOnController"; public static final String USE_REQUEST_MAPPING_ON_INTERFACE = "useRequestMappingOnInterface"; - public enum RequestMappingMode { + @Getter public enum RequestMappingMode { api_interface("Generate the @RequestMapping annotation on the generated Api Interface."), controller("Generate the @RequestMapping annotation on the generated Api Controller Implementation."), none("Do not add a class level @RequestMapping annotation."); - public String getDescription() { - return description; - } - private String description; RequestMappingMode(String description) { @@ -131,36 +129,42 @@ public String getDescription() { public static final String OPEN_BRACE = "{"; public static final String CLOSE_BRACE = "}"; - protected String title = "OpenAPI Spring"; + @Setter protected String title = "OpenAPI Spring"; + @Getter @Setter protected String configPackage = "org.openapitools.configuration"; + @Getter @Setter protected String basePackage = "org.openapitools"; + @Getter @Setter protected String resourceFolder = projectFolder + "/resources"; - protected boolean interfaceOnly = false; - protected boolean useFeignClientUrl = true; - protected boolean delegatePattern = false; + @Setter protected boolean interfaceOnly = false; + @Setter protected boolean useFeignClientUrl = true; + @Setter protected boolean delegatePattern = false; protected boolean delegateMethod = false; - protected boolean singleContentTypes = false; - protected boolean async = false; - protected boolean reactive = false; - protected boolean sse = false; - protected String responseWrapper = ""; - protected boolean skipDefaultInterface = false; - protected boolean useTags = false; + @Setter protected boolean singleContentTypes = false; + @Setter protected boolean async = false; + @Setter protected boolean reactive = false; + @Setter protected boolean sse = false; + @Setter protected String responseWrapper = ""; + @Setter protected boolean skipDefaultInterface = false; + @Setter protected boolean useTags = false; protected boolean useBeanValidation = true; protected boolean performBeanValidation = false; - protected boolean apiFirst = false; + @Setter protected boolean apiFirst = false; protected boolean useOptional = false; - protected boolean virtualService = false; - protected boolean hateoas = false; - protected boolean returnSuccessCode = false; + @Setter protected boolean virtualService = false; + @Setter protected boolean hateoas = false; + @Setter protected boolean returnSuccessCode = false; + @Getter @Setter protected boolean unhandledException = false; - protected boolean useSpringController = false; + @Setter protected boolean useSpringController = false; protected boolean useSwaggerUI = true; - protected boolean useResponseEntity = true; - protected boolean useEnumCaseInsensitive = false; + @Setter protected boolean useResponseEntity = true; + @Setter protected boolean useEnumCaseInsensitive = false; + @Getter @Setter protected boolean useSpringBoot3 = false; protected boolean generatedConstructorWithRequiredArgs = true; + @Getter @Setter protected RequestMappingMode requestMappingMode = RequestMappingMode.controller; public SpringCodegen() { @@ -296,6 +300,7 @@ public DocumentationProvider defaultDocumentationProvider() { return isLibrary(SPRING_HTTP_INTERFACE) ? null : DocumentationProvider.SPRINGDOC; } + @Override public List supportedDocumentationProvider() { List supportedProviders = new ArrayList<>(); supportedProviders.add(DocumentationProvider.NONE); @@ -1023,102 +1028,6 @@ public void setParameterExampleValue(CodegenParameter p) { } } - public void setTitle(String title) { - this.title = title; - } - - public void setConfigPackage(String configPackage) { - this.configPackage = configPackage; - } - - public String getConfigPackage() { - return configPackage; - } - - public boolean isUnhandledException() { - return unhandledException; - } - - public void setBasePackage(String basePackage) { - this.basePackage = basePackage; - } - - public String getBasePackage() { - return basePackage; - } - - public void setInterfaceOnly(boolean interfaceOnly) { - this.interfaceOnly = interfaceOnly; - } - - public void setUseFeignClientUrl(boolean useFeignClientUrl) { - this.useFeignClientUrl = useFeignClientUrl; - } - - public void setDelegatePattern(boolean delegatePattern) { - this.delegatePattern = delegatePattern; - } - - public void setSingleContentTypes(boolean singleContentTypes) { - this.singleContentTypes = singleContentTypes; - } - - public void setSkipDefaultInterface(boolean skipDefaultInterface) { - this.skipDefaultInterface = skipDefaultInterface; - } - - public void setVirtualService(boolean virtualService) { - this.virtualService = virtualService; - } - - public void setAsync(boolean async) { - this.async = async; - } - - public void setReactive(boolean reactive) { - this.reactive = reactive; - } - - public void setSse(boolean sse) { - this.sse = sse; - } - - public void setResponseWrapper(String responseWrapper) { - this.responseWrapper = responseWrapper; - } - - public void setUseTags(boolean useTags) { - this.useTags = useTags; - } - - public void setApiFirst(boolean apiFirst) { - this.apiFirst = apiFirst; - } - - public void setHateoas(boolean hateoas) { - this.hateoas = hateoas; - } - - public void setUseSpringController(boolean useSpringController) { - this.useSpringController = useSpringController; - } - - public void setReturnSuccessCode(boolean returnSuccessCode) { - this.returnSuccessCode = returnSuccessCode; - } - - public void setUnhandledException(boolean unhandledException) { - this.unhandledException = unhandledException; - } - - public void setUseResponseEntity(boolean useResponseEntity) { - this.useResponseEntity = useResponseEntity; - } - - public void setUseEnumCaseInsensitive(boolean useEnumCaseInsensitive) { - this.useEnumCaseInsensitive = useEnumCaseInsensitive; - } - @Override public void postProcessModelProperty(CodegenModel model, CodegenProperty property) { super.postProcessModelProperty(model, property); @@ -1379,28 +1288,4 @@ public List getSupportedVendorExtensions() { extensions.add(VendorExtension.X_PATTERN_MESSAGE); return extensions; } - - public boolean isUseSpringBoot3() { - return useSpringBoot3; - } - - public void setUseSpringBoot3(boolean useSpringBoot3) { - this.useSpringBoot3 = useSpringBoot3; - } - - public RequestMappingMode getRequestMappingMode() { - return requestMappingMode; - } - - public void setRequestMappingMode(RequestMappingMode requestMappingMode) { - this.requestMappingMode = requestMappingMode; - } - - public void setResourceFolder( String resourceFolder ) { - this.resourceFolder = resourceFolder; - } - - public String getResourceFolder() { - return resourceFolder; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java index 027df764bf75..0b050fbecf1c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java @@ -22,7 +22,6 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.servers.Server; import org.apache.commons.lang3.StringUtils; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java index 7ed7121d5729..a25d32bdee74 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java @@ -21,7 +21,6 @@ import com.samskivert.mustache.Mustache.Compiler; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; @@ -205,6 +204,7 @@ public String toVarName(String name) { } } + @Override public void preprocessOpenAPI(OpenAPI openAPI) { Info info = openAPI.getInfo(); info.setDescription(toHtml(info.getDescription())); @@ -217,6 +217,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { } // override to post-process any parameters + @Override public void postProcessParameter(CodegenParameter parameter) { parameter.description = toHtml(parameter.description); parameter.unescapedDescription = toHtml( @@ -224,6 +225,7 @@ public void postProcessParameter(CodegenParameter parameter) { } // override to post-process any model properties + @Override public void postProcessModelProperty(CodegenModel model, CodegenProperty property) { property.description = toHtml(property.description); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java index e7be47f4c5ac..33e4cdd5c718 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java @@ -17,8 +17,9 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -83,23 +84,24 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig protected static final String RESPONSE_LIBRARY_COMBINE = "Combine"; protected static final String RESPONSE_LIBRARY_ASYNC_AWAIT = "AsyncAwait"; protected static final String[] RESPONSE_LIBRARIES = {RESPONSE_LIBRARY_PROMISE_KIT, RESPONSE_LIBRARY_RX_SWIFT, RESPONSE_LIBRARY_RESULT, RESPONSE_LIBRARY_COMBINE, RESPONSE_LIBRARY_ASYNC_AWAIT}; - protected String projectName = "OpenAPIClient"; - protected boolean nonPublicApi = false; - protected boolean objcCompatible = false; - protected boolean lenientTypeCast = false; - protected boolean readonlyProperties = false; - protected boolean swiftUseApiNamespace = false; - protected boolean useSPMFileStructure = false; - protected String swiftPackagePath = "Classes" + File.separator + "OpenAPIs"; - protected boolean useClasses = false; - protected boolean useBacktickEscapes = false; - protected boolean generateModelAdditionalProperties = true; - protected boolean hashableModels = true; - protected boolean useJsonEncodable = true; + @Setter protected String projectName = "OpenAPIClient"; + @Setter protected boolean nonPublicApi = false; + @Setter protected boolean objcCompatible = false; + @Setter protected boolean lenientTypeCast = false; + @Setter protected boolean readonlyProperties = false; + @Setter protected boolean swiftUseApiNamespace = false; + @Setter protected boolean useSPMFileStructure = false; + @Setter protected String swiftPackagePath = "Classes" + File.separator + "OpenAPIs"; + @Setter protected boolean useClasses = false; + @Setter protected boolean useBacktickEscapes = false; + @Setter protected boolean generateModelAdditionalProperties = true; + @Setter protected boolean hashableModels = true; + @Setter protected boolean useJsonEncodable = true; + @Getter @Setter protected boolean mapFileBinaryToData = false; - protected boolean useCustomDateWithoutTime = false; - protected boolean validatable = true; - protected String[] responseAs = new String[0]; + @Setter protected boolean useCustomDateWithoutTime = false; + @Setter protected boolean validatable = true; + @Setter protected String[] responseAs = new String[0]; protected String sourceFolder = swiftPackagePath; protected HashSet objcReservedWords; protected String apiDocPath = "docs/"; @@ -635,18 +637,6 @@ public void processOpts() { } - public boolean isMapFileBinaryToData() { - return mapFileBinaryToData; - } - - public void setMapFileBinaryToData(boolean mapFileBinaryToData) { - this.mapFileBinaryToData = mapFileBinaryToData; - } - - public void setUseCustomDateWithoutTime(boolean useCustomDateWithoutTime) { - this.useCustomDateWithoutTime = useCustomDateWithoutTime; - } - @Override protected boolean isReservedWord(String word) { return word != null && reservedWords.contains(word); //don't lowercase as super does @@ -952,66 +942,6 @@ public CodegenModel fromModel(String name, Schema model) { return codegenModel; } - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public void setNonPublicApi(boolean nonPublicApi) { - this.nonPublicApi = nonPublicApi; - } - - public void setObjcCompatible(boolean objcCompatible) { - this.objcCompatible = objcCompatible; - } - - public void setLenientTypeCast(boolean lenientTypeCast) { - this.lenientTypeCast = lenientTypeCast; - } - - public void setReadonlyProperties(boolean readonlyProperties) { - this.readonlyProperties = readonlyProperties; - } - - public void setResponseAs(String[] responseAs) { - this.responseAs = responseAs; - } - - public void setSwiftUseApiNamespace(boolean swiftUseApiNamespace) { - this.swiftUseApiNamespace = swiftUseApiNamespace; - } - - public void setUseSPMFileStructure(boolean useSPMFileStructure) { - this.useSPMFileStructure = useSPMFileStructure; - } - - public void setSwiftPackagePath(String swiftPackagePath) { - this.swiftPackagePath = swiftPackagePath; - } - - public void setUseClasses(boolean useClasses) { - this.useClasses = useClasses; - } - - public void setUseBacktickEscapes(boolean useBacktickEscapes) { - this.useBacktickEscapes = useBacktickEscapes; - } - - public void setGenerateModelAdditionalProperties(boolean generateModelAdditionalProperties) { - this.generateModelAdditionalProperties = generateModelAdditionalProperties; - } - - public void setHashableModels(boolean hashableModels) { - this.hashableModels = hashableModels; - } - - public void setUseJsonEncodable(boolean useJsonEncodable) { - this.useJsonEncodable = useJsonEncodable; - } - - public void setValidatable(boolean validatable) { - this.validatable = validatable; - } - @Override public String toEnumValue(String value, String datatype) { // for string, array of string diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java index 74b199979395..1a927937c888 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java @@ -16,10 +16,10 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.StringSchema; +import lombok.Setter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.WordUtils; @@ -54,7 +54,7 @@ public class SwiftCombineClientCodegen extends DefaultCodegen implements Codegen public static final String PROJECT_NAME = "projectName"; public static final String MAP_FILE_BINARY_TO_DATA = "mapFileBinaryToData"; - protected String projectName = "OpenAPIClient"; + @Setter protected String projectName = "OpenAPIClient"; protected String privateFolder = "Sources/Private"; protected String sourceFolder = "Sources"; protected String transportFolder = "OpenAPITransport"; @@ -553,10 +553,6 @@ public CodegenModel fromModel(String name, Schema schema) { return m; } - public void setProjectName(String projectName) { - this.projectName = projectName; - } - @Override public String toEnumValue(String value, String datatype) { // for string, array of string diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index a1b7512c5f11..3dd29e7a11f3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -18,6 +18,9 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.media.Schema; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.DocumentationFeature; import org.openapitools.codegen.meta.features.GlobalFeature; @@ -74,14 +77,15 @@ public static enum PROVIDED_IN_LEVEL {none, root, any, platform} public static final String QUERY_PARAM_OBJECT_FORMAT = "queryParamObjectFormat"; protected String ngVersion = "17.0.0"; + @Getter @Setter protected String npmRepository = null; - private boolean useSingleRequestParameter = false; + @Setter(AccessLevel.PRIVATE) private boolean useSingleRequestParameter = false; protected String serviceSuffix = "Service"; protected String serviceFileSuffix = ".service"; protected String modelSuffix = ""; protected String modelFileSuffix = ""; protected String fileNaming = "camelCase"; - protected Boolean stringEnums = false; + @Getter protected Boolean stringEnums = false; protected QUERY_PARAM_OBJECT_FORMAT_TYPE queryParamObjectFormat = QUERY_PARAM_OBJECT_FORMAT_TYPE.dot; protected PROVIDED_IN_LEVEL providedIn = PROVIDED_IN_LEVEL.root; @@ -397,10 +401,6 @@ public void setStringEnums(boolean value) { stringEnums = value; } - public Boolean getStringEnums() { - return stringEnums; - } - public boolean getQueryParamObjectFormatDot() { return QUERY_PARAM_OBJECT_FORMAT_TYPE.dot.equals(queryParamObjectFormat); } @@ -640,22 +640,10 @@ public String toModelImport(String name) { return DEFAULT_MODEL_IMPORT_DIRECTORY_PREFIX + modelPackage() + "/" + toModelFilename(removeModelPrefixSuffix(name)).substring(DEFAULT_IMPORT_PREFIX.length()); } - public String getNpmRepository() { - return npmRepository; - } - - public void setNpmRepository(String npmRepository) { - this.npmRepository = npmRepository; - } - private boolean getUseSingleRequestParameter() { return useSingleRequestParameter; } - private void setUseSingleRequestParameter(boolean useSingleRequestParameter) { - this.useSingleRequestParameter = useSingleRequestParameter; - } - private String getApiFilenameFromClassname(String classname) { String name = classname.substring(0, classname.length() - serviceSuffix.length()); return toApiFilename(name); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java index a5bc76b874d9..7350642bc6c1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java @@ -58,22 +58,6 @@ public String getHelp() { return "Generates a TypeScript client library for the Aurelia framework (beta)."; } - public String getNpmName() { - return npmName; - } - - public void setNpmName(String npmName) { - this.npmName = npmName; - } - - public String getNpmVersion() { - return npmVersion; - } - - public void setNpmVersion(String npmVersion) { - this.npmVersion = npmVersion; - } - @Override public void processOpts() { super.processOpts(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java index 5b9aba6ab0b3..350b49d5a688 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java @@ -17,9 +17,10 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.DocumentationFeature; @@ -43,6 +44,7 @@ public class TypeScriptAxiosClientCodegen extends AbstractTypeScriptClientCodege public static final String STRING_ENUMS = "stringEnums"; public static final String STRING_ENUMS_DESC = "Generate string enums instead of objects for enum values."; + @Getter @Setter protected String npmRepository = null; protected Boolean stringEnums = false; @@ -87,14 +89,6 @@ public String getHelp() { return "Generates a TypeScript client library using axios."; } - public String getNpmRepository() { - return npmRepository; - } - - public void setNpmRepository(String npmRepository) { - this.npmRepository = npmRepository; - } - private static String getRelativeToRoot(String path) { StringBuilder sb = new StringBuilder(); int slashCount = path.split("/").length; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java index 4e78a623b0e7..7b1e9804e1de 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java @@ -23,13 +23,14 @@ import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.RequestBody; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.CodegenConstants.ENUM_PROPERTY_NAMING_TYPE; import org.openapitools.codegen.CodegenDiscriminator.MappedModel; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; -import org.openapitools.codegen.meta.features.DocumentationFeature; import org.openapitools.codegen.meta.features.SecurityFeature; import org.openapitools.codegen.model.ModelMap; import org.openapitools.codegen.model.ModelsMap; @@ -81,6 +82,7 @@ public class TypeScriptClientCodegen extends AbstractTypeScriptClientCodegen imp private static final String NPM_REPOSITORY = "npmRepository"; // NPM Option Values + @Getter @Setter protected String npmRepository = null; protected String snapshot = null; protected ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = ENUM_PROPERTY_NAMING_TYPE.PascalCase; @@ -171,30 +173,6 @@ public TypeScriptClientCodegen() { apiDocTemplateFiles.put("api_doc.mustache", ".md"); } - public String getNpmName() { - return npmName; - } - - public void setNpmName(String npmName) { - this.npmName = npmName; - } - - public String getNpmRepository() { - return npmRepository; - } - - public void setNpmRepository(String npmRepository) { - this.npmRepository = npmRepository; - } - - public String getNpmVersion() { - return npmVersion; - } - - public void setNpmVersion(String npmVersion) { - this.npmVersion = npmVersion; - } - @Override public Map postProcessSupportingFileData(Map objs) { final Object propFramework = additionalProperties.get(FRAMEWORK_SWITCH); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index e6e49222e2b2..bdf0df06ae97 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java @@ -26,6 +26,8 @@ import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.DocumentationFeature; import org.openapitools.codegen.meta.features.SecurityFeature; @@ -57,7 +59,9 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege public static final String CAMEL_CASE = "camelCase"; public static final String PASCAL_CASE = "PascalCase"; + @Getter @Setter protected String npmRepository = null; + @Getter @Setter protected String importFileExtension = ""; private boolean useSingleRequestParameter = true; private boolean prefixParameterInterfaces = false; @@ -80,10 +84,12 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege private static final String X_KEEP_AS_JS_OBJECT = "x-keepAsJSObject"; protected boolean sagasAndRecords = false; + @Getter @Setter protected String detectPassthroughModelsWithSuffixAndField = null; // Ex: "Response;data" - protected boolean inferUniqueIdFromNameSuffix = false; + @Setter protected boolean inferUniqueIdFromNameSuffix = false; + @Getter @Setter protected String inferEntityFromUniqueIdWithName = null; - protected boolean packageAsSourceOnlyLibrary = false; + @Setter protected boolean packageAsSourceOnlyLibrary = false; public TypeScriptFetchClientCodegen() { @@ -152,22 +158,6 @@ public String getHelp() { return "Generates a TypeScript client library using Fetch API (beta)."; } - public String getNpmRepository() { - return npmRepository; - } - - public void setNpmRepository(String npmRepository) { - this.npmRepository = npmRepository; - } - - public String getImportFileExtension() { - return importFileExtension; - } - - public void setImportFileExtension(String importFileExtension) { - this.importFileExtension = importFileExtension; - } - public Boolean getWithoutRuntimeChecks() { return withoutRuntimeChecks; } @@ -213,38 +203,14 @@ public String getPassthroughField() { return detectPassthroughModelsWithSuffixAndField != null ? detectPassthroughModelsWithSuffixAndField.split("\\.")[1] : null; } - public String getDetectPassthroughModelsWithSuffixAndField() { - return detectPassthroughModelsWithSuffixAndField; - } - - public void setDetectPassthroughModelsWithSuffixAndField(String detectPassthroughModelsWithSuffixAndField) { - this.detectPassthroughModelsWithSuffixAndField = detectPassthroughModelsWithSuffixAndField; - } - public boolean getInferUniqueIdFromNameSuffix() { return inferUniqueIdFromNameSuffix; } - public void setInferUniqueIdFromNameSuffix(boolean inferUniqueIdFromNameSuffix) { - this.inferUniqueIdFromNameSuffix = inferUniqueIdFromNameSuffix; - } - - public String getInferEntityFromUniqueIdWithName() { - return inferEntityFromUniqueIdWithName; - } - - public void setInferEntityFromUniqueIdWithName(String inferEntityFromUniqueIdWithName) { - this.inferEntityFromUniqueIdWithName = inferEntityFromUniqueIdWithName; - } - public boolean getPackageAsSourceOnlyLibrary() { return packageAsSourceOnlyLibrary; } - public void setPackageAsSourceOnlyLibrary(boolean packageAsSourceOnlyLibrary) { - this.packageAsSourceOnlyLibrary = packageAsSourceOnlyLibrary; - } - public boolean isUniqueIdAccordingToNameSuffix(String name) { if (name == null) { return false; @@ -1047,7 +1013,7 @@ private void setPrefixParameterInterfaces(boolean prefixParameterInterfaces) { private static boolean itemsAreUniqueId(CodegenProperty items) { if (items != null && items.items != null) { return itemsAreUniqueId(items.items); - }; + } if (items != null && items.vendorExtensions.get(X_IS_UNIQUE_ID) instanceof Boolean) { return Boolean.TRUE.equals(items.vendorExtensions.get(X_IS_UNIQUE_ID)); } @@ -1060,7 +1026,7 @@ private static boolean itemsAreNullable(CodegenProperty items) { } if (items.items != null) { return itemsAreNullable(items.items); - }; + } return items.isNullable; } @@ -1070,7 +1036,7 @@ private static String getItemsDataType(CodegenProperty items) { } if (items.items != null) { return getItemsDataType(items.items); - }; + } return items.dataType; } @@ -1500,6 +1466,7 @@ public String toString() { } class ExtendedCodegenModel extends CodegenModel { + @Getter @Setter public Set modelImports = new TreeSet(); public boolean isEntity; // Is a model containing an "id" property marked as isUniqueId public String returnPassthrough; @@ -1599,14 +1566,6 @@ public ExtendedCodegenModel(CodegenModel cm) { this.setIsModel(cm.getIsModel()); } - public Set getModelImports() { - return modelImports; - } - - public void setModelImports(Set modelImports) { - this.modelImports = modelImports; - } - @Override public boolean equals(Object o) { if (o == null) @@ -1641,7 +1600,5 @@ public String toString() { sb.append(", hasReturnPassthroughVoid=").append(hasReturnPassthroughVoid); return sb.toString(); } - } - } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java index a9479562c190..63663beaa505 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java @@ -21,6 +21,8 @@ import io.swagger.v3.oas.models.media.FileSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.DocumentationFeature; import org.openapitools.codegen.model.ModelMap; @@ -43,6 +45,7 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo public static final String USE_RXJS6 = "useRxJS6"; public static final String TAGGED_UNIONS = "taggedUnions"; + @Getter @Setter protected String npmRepository = null; private boolean taggedUnions = false; @@ -335,14 +338,6 @@ public String toModelImport(String name) { return modelPackage() + "/" + toModelFilename(name); } - public String getNpmRepository() { - return npmRepository; - } - - public void setNpmRepository(String npmRepository) { - this.npmRepository = npmRepository; - } - private String getApiFilenameFromClassname(String classname) { String name = classname.substring(0, classname.length() - "Service".length()); return toApiFilename(name); @@ -352,5 +347,4 @@ private String getModelnameFromModelFilename(String filename) { String name = filename.substring((modelPackage() + "/").length()); return camelize(name); } - } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java index fed4fca05846..b2ec4d7a5427 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java @@ -19,6 +19,8 @@ import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.SupportingFile; @@ -35,6 +37,7 @@ public class TypeScriptJqueryClientCodegen extends AbstractTypeScriptClientCodeg public static final String NPM_REPOSITORY = "npmRepository"; public static final String JQUERY_ALREADY_IMPORTED = "jqueryAlreadyImported"; + @Getter @Setter protected String npmRepository = null; public TypeScriptJqueryClientCodegen() { @@ -67,14 +70,6 @@ public String getHelp() { return "Generates a TypeScript jquery client library."; } - public String getNpmRepository() { - return npmRepository; - } - - public void setNpmRepository(String npmRepository) { - this.npmRepository = npmRepository; - } - @Override public void processOpts() { super.processOpts(); @@ -164,6 +159,4 @@ private String getIndexDirectory() { String indexPackage = modelPackage.substring(0, Math.max(0, modelPackage.lastIndexOf('.'))); return indexPackage.replace('.', File.separatorChar); } - - } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java index f0c10ee0e73e..520d69e2d62d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java @@ -17,6 +17,8 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.media.Schema; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; @@ -56,13 +58,14 @@ public class TypeScriptNestjsClientCodegen extends AbstractTypeScriptClientCodeg public static final String USE_SINGLE_REQUEST_PARAMETER = "useSingleRequestParameter"; protected String nestVersion = "8.0.0"; + @Getter @Setter protected String npmRepository = null; protected String serviceSuffix = "Service"; protected String serviceFileSuffix = ".service"; protected String modelSuffix = ""; protected String modelFileSuffix = ""; protected String fileNaming = "camelCase"; - protected Boolean stringEnums = false; + @Getter protected Boolean stringEnums = false; private boolean taggedUnions = false; @@ -218,10 +221,6 @@ public void setStringEnums(boolean value) { stringEnums = value; } - public Boolean getStringEnums() { - return stringEnums; - } - @Override public boolean isDataTypeFile(final String dataType) { return "Blob".equals(dataType); @@ -452,14 +451,6 @@ public String toModelImport(String name) { return modelPackage() + "/" + toModelFilename(name); } - public String getNpmRepository() { - return npmRepository; - } - - public void setNpmRepository(String npmRepository) { - this.npmRepository = npmRepository; - } - private String getApiFilenameFromClassname(String classname) { String name = classname.substring(0, classname.length() - serviceSuffix.length()); return toApiFilename(name); @@ -550,6 +541,4 @@ private String convertUsingFileNamingConvention(String originalName) { } return name; } - } - diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java index c4068a21fef3..5f2381510603 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java @@ -18,12 +18,12 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.responses.ApiResponse; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; -import org.openapitools.codegen.meta.features.DocumentationFeature; import org.openapitools.codegen.meta.features.SecurityFeature; import org.openapitools.codegen.model.ModelMap; import org.openapitools.codegen.model.ModelsMap; @@ -47,6 +47,7 @@ public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen private static final String DEFAULT_MODEL_FILENAME_DIRECTORY_PREFIX = "./"; private static final String DEFAULT_MODEL_IMPORT_DIRECTORY_PREFIX = "../"; + @Getter @Setter protected String npmRepository = null; protected String apiSuffix = "Api"; @@ -237,14 +238,6 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap operations, L return operations; } - public String getNpmRepository() { - return npmRepository; - } - - public void setNpmRepository(String npmRepository) { - this.npmRepository = npmRepository; - } - @Override public void processOpts() { super.processOpts(); @@ -355,5 +348,4 @@ public String toDefaultValue(Schema p) { public String toEnumDefaultValue(String value, String datatype) { return datatype + "." + value; } - } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java index 2f2af10c5f34..81ac377f9b19 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java @@ -19,8 +19,9 @@ import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; -import org.openapitools.codegen.meta.features.DocumentationFeature; import org.openapitools.codegen.meta.features.SecurityFeature; import org.openapitools.codegen.model.ModelMap; import org.openapitools.codegen.model.ModelsMap; @@ -38,6 +39,7 @@ public class TypeScriptReduxQueryClientCodegen extends AbstractTypeScriptClientC public static final String WITH_INTERFACES = "withInterfaces"; public static final String USE_SINGLE_REQUEST_PARAMETER = "useSingleRequestParameter"; + @Getter @Setter protected String npmRepository = null; private boolean useSingleRequestParameter = true; protected boolean addedApiIndex = false; @@ -83,14 +85,6 @@ public String getHelp() { return "Generates a TypeScript client library using redux-query API (beta)."; } - public String getNpmRepository() { - return npmRepository; - } - - public void setNpmRepository(String npmRepository) { - this.npmRepository = npmRepository; - } - @Override public void processOpts() { super.processOpts(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java index 3f6d95655ab4..fb51165d0009 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java @@ -18,8 +18,9 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.media.Schema; -import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.parser.util.SchemaTypeUtil; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.DocumentationFeature; import org.openapitools.codegen.model.ModelMap; @@ -38,6 +39,7 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen public static final String NPM_REPOSITORY = "npmRepository"; public static final String WITH_PROGRESS_SUBSCRIBER = "withProgressSubscriber"; + @Getter @Setter protected String npmRepository = null; protected Set reservedParamNames = new HashSet<>(); @@ -77,14 +79,6 @@ public String getHelp() { return "Generates a TypeScript client library using Rxjs API."; } - public String getNpmRepository() { - return npmRepository; - } - - public void setNpmRepository(String npmRepository) { - this.npmRepository = npmRepository; - } - @Override public void processOpts() { super.processOpts(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java index 2dc1e6764a00..b16a66ae0efa 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java @@ -18,6 +18,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; @@ -29,6 +30,7 @@ import java.text.Normalizer; import java.util.*; +@Setter public class WsdlSchemaCodegen extends DefaultCodegen implements CodegenConfig { public static final String PROJECT_NAME = "projectName"; @@ -36,14 +38,17 @@ public class WsdlSchemaCodegen extends DefaultCodegen implements CodegenConfig { protected boolean useSpecifiedOperationId = false; + @Override public CodegenType getTag() { return CodegenType.SCHEMA; } + @Override public String getName() { return "wsdl-schema"; } + @Override public String getHelp() { return "Generates WSDL files."; } @@ -78,6 +83,7 @@ public WsdlSchemaCodegen() { "jaxb-customization.xml")); } + @Override public void preprocessOpenAPI(OpenAPI openAPI) { Info info = openAPI.getInfo(); @@ -372,14 +378,6 @@ public String escapeUnsafeCharacters(String input) { return input; } - public void setContentTypeVersion(String contentTypeVersion) { - this.contentTypeVersion = contentTypeVersion; - } - - public void setUseSpecifiedOperationId(boolean useSpecifiedOperationId) { - this.useSpecifiedOperationId = useSpecifiedOperationId; - } - @Override public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.WSDL; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/XojoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/XojoClientCodegen.java index 2f05000f345d..c9101b863284 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/XojoClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/XojoClientCodegen.java @@ -16,9 +16,10 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; @@ -49,10 +50,10 @@ public class XojoClientCodegen extends DefaultCodegen implements CodegenConfig { public enum SERIALIZATION_LIBRARY_TYPE {xoson} - protected String projectName = "OpenAPIClient"; - protected boolean nonPublicApi = false; + @Setter protected String projectName = "OpenAPIClient"; + @Setter protected boolean nonPublicApi = false; protected boolean supportsAsync = true; - protected SERIALIZATION_LIBRARY_TYPE serializationLibrary = SERIALIZATION_LIBRARY_TYPE.xoson; + @Getter protected SERIALIZATION_LIBRARY_TYPE serializationLibrary = SERIALIZATION_LIBRARY_TYPE.xoson; // Number for each object that appears in the xojo_project file. // We start with a relatively high value, to have space for other static objects. @@ -60,14 +61,6 @@ public enum SERIALIZATION_LIBRARY_TYPE {xoson} private final Logger LOGGER = LoggerFactory.getLogger(XojoClientCodegen.class); - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public void setNonPublicApi(boolean nonPublicApi) { - this.nonPublicApi = nonPublicApi; - } - public void setSupportsAsync(Boolean supportsAsync) { this.supportsAsync = supportsAsync; } @@ -693,10 +686,6 @@ public void setParameterExampleValue(CodegenParameter codegenParameter) { } } - public SERIALIZATION_LIBRARY_TYPE getSerializationLibrary() { - return this.serializationLibrary; - } - /** * Sets the serialization engine for Xojo * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ZapierClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ZapierClientCodegen.java index a4610e3ac0a5..4740460f676e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ZapierClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ZapierClientCodegen.java @@ -35,14 +35,17 @@ public class ZapierClientCodegen extends DefaultCodegen implements CodegenConfig private final Logger LOGGER = LoggerFactory.getLogger(ZapierClientCodegen.class); + @Override public CodegenType getTag() { return CodegenType.CLIENT; } + @Override public String getName() { return "zapier"; } + @Override public String getHelp() { return "Generates a zapier client."; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/features/DocumentationProviderFeatures.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/features/DocumentationProviderFeatures.java index b4edcaea5df8..03ad3c19cae5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/features/DocumentationProviderFeatures.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/features/DocumentationProviderFeatures.java @@ -1,5 +1,7 @@ package org.openapitools.codegen.languages.features; +import lombok.Getter; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -59,7 +61,7 @@ default List supportedAnnotationLibraries() { void setAnnotationLibrary(AnnotationLibrary annotationLibrary); - enum DocumentationProvider { + @Getter enum DocumentationProvider { NONE("withoutDocumentationProvider", "Do not publish an OpenAPI specification.", AnnotationLibrary.NONE, AnnotationLibrary.values()), @@ -78,6 +80,12 @@ enum DocumentationProvider { SPRINGDOC("springDocDocumentationProvider", "Generate an OpenAPI 3 specification using SpringDoc.", AnnotationLibrary.SWAGGER2, AnnotationLibrary.SWAGGER2); + /** + * -- GETTER -- + * The property name should be used in the codegen model as a boolean property. + * + * @return the property name for this documentation provider + */ private final String propertyName; private final String description; @@ -100,27 +108,6 @@ public static DocumentationProvider ofCliOption(String optVal) { return valueOf(optVal); } - /** - * The property name should be used in the codegen model as a boolean property. - * - * @return the property name for this documentation provider - */ - public String getPropertyName() { - return propertyName; - } - - public String getDescription() { - return description; - } - - public AnnotationLibrary getPreferredAnnotationLibrary() { - return preferredAnnotationLibrary; - } - - public AnnotationLibrary[] getSupportedAnnotationLibraries() { - return supportedAnnotationLibraries; - } - public List supportedAnnotationLibraries() { return Arrays.asList(getSupportedAnnotationLibraries()); } @@ -130,7 +117,7 @@ public String toCliOptValue() { } } - enum AnnotationLibrary { + @Getter enum AnnotationLibrary { NONE("withoutAnnotationLibrary", "Do not annotate Model and Api with complementary annotations."), SWAGGER1("swagger1AnnotationLibrary", "Annotate Model and Api using the Swagger Annotations 1.x library."), @@ -139,6 +126,12 @@ enum AnnotationLibrary { MICROPROFILE("microprofileAnnotationLibrary", "Annotate Model and Api using the Microprofile annotations."); + /** + * -- GETTER -- + * The property name is used in the codegen model as a boolean property. + * + * @return the property name for this annotation library + */ private final String propertyName; private final String description; @@ -148,19 +141,6 @@ public static AnnotationLibrary ofCliOption(String optVal) { return valueOf(optVal); } - /** - * The property name is used in the codegen model as a boolean property. - * - * @return the property name for this annotation library - */ - public String getPropertyName() { - return propertyName; - } - - public String getDescription() { - return description; - } - AnnotationLibrary(String propertyName, String description) { this.propertyName = propertyName; this.description = description; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/model/OperationsMap.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/model/OperationsMap.java index 2a24644cbfc1..554843d7e4e1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/model/OperationsMap.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/model/OperationsMap.java @@ -1,12 +1,8 @@ package org.openapitools.codegen.model; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; - -import org.openapitools.codegen.CodegenOperation; public class OperationsMap extends HashMap { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/HandlebarsEngineAdapter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/HandlebarsEngineAdapter.java index e8ecea1b244c..95feb4d6510b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/HandlebarsEngineAdapter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/HandlebarsEngineAdapter.java @@ -30,6 +30,7 @@ import com.github.jknack.handlebars.io.StringTemplateSource; import com.github.jknack.handlebars.io.TemplateLoader; import com.github.jknack.handlebars.io.TemplateSource; +import lombok.Setter; import org.openapitools.codegen.api.AbstractTemplatingEngineAdapter; import org.openapitools.codegen.api.TemplatingExecutor; import org.slf4j.Logger; @@ -50,7 +51,7 @@ public class HandlebarsEngineAdapter extends AbstractTemplatingEngineAdapter { // We use this as a simple lookup for valid file name extensions. This adapter will inspect .mustache (built-in) and infer the relevant handlebars filename private final String[] canCompileFromExtensions = {".handlebars",".hbs",".mustache"}; private boolean infiniteLoops = false; - private boolean prettyPrint = false; + @Setter private boolean prettyPrint = false; /** * Provides an identifier used to load the adapter. This could be a name, uuid, or any other string. @@ -62,6 +63,7 @@ public String getIdentifier() { return "handlebars"; } + @Override public String compileTemplate(TemplatingExecutor executor, Map bundle, String templateFile) throws IOException { TemplateLoader loader = new AbstractTemplateLoader() { @@ -165,8 +167,5 @@ public HandlebarsEngineAdapter infiniteLoops(boolean infiniteLoops) { return this; } - public void setPrettyPrint(boolean prettyPrint) { - this.prettyPrint = prettyPrint; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java index b78199880568..90d8348877d2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java @@ -18,6 +18,8 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; +import lombok.Getter; +import lombok.Setter; import org.openapitools.codegen.api.TemplatingEngineAdapter; import org.openapitools.codegen.api.TemplatingExecutor; import org.slf4j.Logger; @@ -44,6 +46,7 @@ public String getIdentifier() { } private final String[] extensions = {"mustache"}; + @Getter @Setter Mustache.Compiler compiler = Mustache.compiler(); /** @@ -79,14 +82,6 @@ public Reader findTemplate(TemplatingExecutor generator, String name) { throw new TemplateNotFoundException(name); } - public Mustache.Compiler getCompiler() { - return compiler; - } - - public void setCompiler(Mustache.Compiler compiler) { - this.compiler = compiler; - } - @Override public String[] getFileExtensions() { return extensions; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/TemplateManagerOptions.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/TemplateManagerOptions.java index d5e8238f6b9b..1396adbcac00 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/TemplateManagerOptions.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/TemplateManagerOptions.java @@ -1,10 +1,29 @@ package org.openapitools.codegen.templating; +import lombok.Getter; + /** * Holds the options relevant to template management and execution. */ -public class TemplateManagerOptions { +@Getter public class TemplateManagerOptions { + /** + * -- GETTER -- + * Determines whether the template should minimally update a target file. + * A minimal update means the template manager is requested to update a file only if it is newer. + * This option avoids "touching" a file and causing the last modification time (mtime) to change. + * + * @return true to prefer updating only changed files, false to disable that suggestion + */ private final boolean minimalUpdate; + /** + * -- GETTER -- + * Determines whether the template manager should avoid overwriting an existing file. + * This differs from requesting + * which evaluates contents, while this option only + * evaluates whether the file exists. + * + * @return true to avoid overwriting existing files (where supported), false to disable that suggestion. + */ private final boolean skipOverwrite; /** @@ -18,28 +37,4 @@ public TemplateManagerOptions(boolean minimalUpdate, boolean skipOverwrite) { this.skipOverwrite = skipOverwrite; } - /** - * Determines whether the template should minimally update a target file. - * - * A minimal update means the template manager is requested to update a file only if it is newer. - * - * This option avoids "touching" a file and causing the last modification time (mtime) to change. - * - * @return true to prefer updating only changed files, false to disable that suggestion - */ - public boolean isMinimalUpdate() { - return minimalUpdate; - } - - /** - * Determines whether the template manager should avoid overwriting an existing file. - * - * This differs from requesting {@link #isMinimalUpdate()} which evaluates contents, while this option only - * evaluates whether the file exists. - * - * @return true to avoid overwriting existing files (where supported), false to disable that suggestion. - */ - public boolean isSkipOverwrite() { - return skipOverwrite; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/BackSlashLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/BackSlashLambda.java index 50a10b789993..8ada0b4d8721 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/BackSlashLambda.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/BackSlashLambda.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.io.Writer; -import static org.openapitools.codegen.utils.StringUtils.underscore; - /** * Replaces forward slash with backslash in the text. * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/DoubleQuoteLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/DoubleQuoteLambda.java index 9979e0e817eb..1caf4fd2e47f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/DoubleQuoteLambda.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/DoubleQuoteLambda.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.io.Writer; -import static org.openapitools.codegen.utils.StringUtils.underscore; - /** * Double quote the text if it's not already the case. * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/ForwardSlashLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/ForwardSlashLambda.java index a9f39b59ae1b..33b26dd2e9d0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/ForwardSlashLambda.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/ForwardSlashLambda.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.io.Writer; -import static org.openapitools.codegen.utils.StringUtils.underscore; - /** * Replaces backslash with forward slash in the text. * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/KebabCaseLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/KebabCaseLambda.java index 7070df93ad5a..6997666b118e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/KebabCaseLambda.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/KebabCaseLambda.java @@ -23,8 +23,6 @@ import java.io.Writer; import java.util.Locale; -import static org.openapitools.codegen.utils.StringUtils.underscore; - /** * Converts text in a fragment to snake case. * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/UncamelizeLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/UncamelizeLambda.java index 83b739d7a385..ae23a0fa5cbc 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/UncamelizeLambda.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/UncamelizeLambda.java @@ -24,8 +24,6 @@ import java.io.IOException; import java.io.Writer; -import static org.openapitools.codegen.utils.StringUtils.camelize; - /** * Converts text in a fragment from camelCase or PascalCase to a space separated string * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java index 556f696c7834..b2920bd6f101 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java @@ -6,6 +6,8 @@ import java.util.List; import java.util.Map; import java.util.Set; + +import lombok.Getter; import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenProperty; @@ -43,7 +45,7 @@ * needs to be added to `One` and `Two` because of the above point) */ public class OneOfImplementorAdditionalData { - private String implementorName; + @Getter private String implementorName; private List additionalInterfaces = new ArrayList(); private List additionalProps = new ArrayList(); private List> additionalImports = new ArrayList>(); @@ -53,10 +55,6 @@ public OneOfImplementorAdditionalData(String implementorName) { this.implementorName = implementorName; } - public String getImplementorName() { - return implementorName; - } - /** * Add data from a given CodegenModel that the oneOf implementor should implement. For example: * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidations.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidations.java index de00e7e8c8b4..7b725456f404 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidations.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidations.java @@ -1,6 +1,5 @@ package org.openapitools.codegen.validations.oas; -import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.utils.ModelUtils; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OperationWrapper.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OperationWrapper.java index d23ab1f6918b..ab42a52542a1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OperationWrapper.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/OperationWrapper.java @@ -3,6 +3,7 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.OpenAPI; +import lombok.Getter; /** * Encapsulates an operation with its HTTP Method. In OAS, the {@link PathItem} structure contains more than what we'd @@ -10,8 +11,20 @@ */ public class OperationWrapper { OpenAPI specification; - private Operation operation; - private PathItem.HttpMethod httpMethod; + /** + * -- GETTER -- + * Gets the operation associated with the http method + * + * @return An operation instance + */ + @Getter private Operation operation; + /** + * -- GETTER -- + * Gets the http method associated with the operation + * + * @return The http method + */ + @Getter private PathItem.HttpMethod httpMethod; /** * Constructs a new instance of {@link OperationWrapper} @@ -25,24 +38,6 @@ public class OperationWrapper { this.httpMethod = httpMethod; } - /** - * Gets the operation associated with the http method - * - * @return An operation instance - */ - public Operation getOperation() { - return operation; - } - - /** - * Gets the http method associated with the operation - * - * @return The http method - */ - public PathItem.HttpMethod getHttpMethod() { - return httpMethod; - } - /** * Returns the OpenAPI specification. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/ParameterWrapper.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/ParameterWrapper.java index d47738e34de9..ab77acd7f654 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/ParameterWrapper.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/ParameterWrapper.java @@ -2,13 +2,20 @@ import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.OpenAPI; +import lombok.Getter; /** * Encapsulates an OAS parameter. */ public class ParameterWrapper { OpenAPI specification; - private Parameter parameter; + /** + * -- GETTER -- + * Return the OAS parameter + * + * @return the OAS parameter + */ + @Getter private Parameter parameter; /** * Constructs a new instance of {@link ParameterWrapper} @@ -21,15 +28,6 @@ public class ParameterWrapper { this.parameter = parameter; } - /** - * Return the OAS parameter - * - * @return the OAS parameter - */ - public Parameter getParameter() { - return parameter; - } - /** * Returns the OpenAPI specification. * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java index 1f85dad3c674..247eabad547f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java @@ -1,218 +1,154 @@ package org.openapitools.codegen.validations.oas; +import lombok.Getter; +import lombok.Setter; + /** * Allows for configuration of validation rules which will be applied to a specification. */ +@Getter @Setter @SuppressWarnings({"WeakerAccess", "unused"}) public class RuleConfiguration { private static String propertyPrefix = "openapi.generator.rule"; - private boolean enableRecommendations = defaultedBoolean(propertyPrefix + ".recommendations", true); - private boolean enableApacheNginxUnderscoreRecommendation = defaultedBoolean(propertyPrefix + ".apache-nginx-underscore", true); - private boolean enableOneOfWithPropertiesRecommendation = defaultedBoolean(propertyPrefix + ".oneof-properties-ambiguity", true); - private boolean enableUnusedSchemasRecommendation = defaultedBoolean(propertyPrefix + ".unused-schemas", true); - private boolean enableSchemaTypeRecommendation = defaultedBoolean(propertyPrefix + ".schema-type", true); - private boolean enableNullableAttributeRecommendation = defaultedBoolean(propertyPrefix + ".nullable-deprecated", true); - private boolean enableInvalidTypeRecommendation = defaultedBoolean(propertyPrefix + ".invalid-type", true); - - private boolean enableApiRequestUriWithBodyRecommendation = defaultedBoolean(propertyPrefix + ".anti-patterns.uri-unexpected-body", true); - - @SuppressWarnings("SameParameterValue") - private static boolean defaultedBoolean(String key, boolean defaultValue) { - String property = System.getProperty(key); - if (property == null) return defaultValue; - return Boolean.parseBoolean(property); - } - /** - * Gets whether we will raise awareness that header parameters with underscore may be ignored in Apache or Nginx by default. - * For more details, see https://stackoverflow.com/a/22856867/151445. + * -- GETTER -- + * Get whether recommendations are enabled. + *

+ * The 'type' attribute must be one of 'null', 'boolean', 'object', 'array', 'number', 'string', or 'integer' * * @return true if enabled, false if disabled - */ - public boolean isEnableApacheNginxUnderscoreRecommendation() { - return enableApacheNginxUnderscoreRecommendation; - } - - /** - * Enable or Disable the recommendation check for Apache/Nginx potentially ignoring header with underscore by default. - *

- * For more details, see {@link RuleConfiguration#isEnableApacheNginxUnderscoreRecommendation()} + * -- SETTER -- + * Enable or Disable recommendations. Recommendations are either informational or warning level type validations + * which are raised to communicate issues to the user which they may not be aware of, or for which support in the + * tooling/spec may not be clearly defined. * - * @param enableApacheNginxUnderscoreRecommendation true to enable, false to disable + * @param enableRecommendations true to enable, false to disable */ - public void setEnableApacheNginxUnderscoreRecommendation(boolean enableApacheNginxUnderscoreRecommendation) { - this.enableApacheNginxUnderscoreRecommendation = enableApacheNginxUnderscoreRecommendation; - } - + private boolean enableRecommendations = defaultedBoolean(propertyPrefix + ".recommendations", true); /** - * Gets whether we will raise awareness a GET or HEAD operation is defined with body. + * -- GETTER -- + * Gets whether we will raise awareness that header parameters with underscore may be ignored in Apache or Nginx by default. + * For more details, see https://stackoverflow.com/a/22856867/151445. * * @return true if enabled, false if disabled - */ - public boolean isEnableApiRequestUriWithBodyRecommendation() { - return enableApiRequestUriWithBodyRecommendation; - } - - /** - * Enable or Disable the recommendation check for GET or HEAD operations with bodies. - *

- * For more details, see {@link RuleConfiguration#isEnableApiRequestUriWithBodyRecommendation()} + * -- SETTER -- + * Enable or Disable the recommendation check for Apache/Nginx potentially ignoring header with underscore by default. + *

+ * For more details, see * - * @param enableApiRequestUriWithBodyRecommendation true to enable, false to disable + * @param enableApacheNginxUnderscoreRecommendation true to enable, false to disable */ - public void setEnableApiRequestUriWithBodyRecommendation(boolean enableApiRequestUriWithBodyRecommendation) { - this.enableApiRequestUriWithBodyRecommendation = enableApiRequestUriWithBodyRecommendation; - } - + private boolean enableApacheNginxUnderscoreRecommendation = defaultedBoolean(propertyPrefix + ".apache-nginx-underscore", true); /** - * Gets whether the recommendation check for oneOf with sibling properties exists. - *

- * JSON Schema defines oneOf as a validation property which can be applied to any schema. - *

- * OpenAPI Specification is a variant of JSON Schema for which oneOf is defined as: - * "Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema." - *

- * Where the only examples of oneOf in OpenAPI Specification are used to define either/or type structures rather than validations. - * Because of this ambiguity in the spec about what is non-standard about oneOf support, we'll warn as a recommendation that - * properties on the schema defining oneOf relationships may not be intentional in the OpenAPI Specification. + * -- GETTER -- + * Gets whether the recommendation check for oneOf with sibling properties exists. + *

+ * JSON Schema defines oneOf as a validation property which can be applied to any schema. + *

+ * OpenAPI Specification is a variant of JSON Schema for which oneOf is defined as: + * "Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema." + *

+ * Where the only examples of oneOf in OpenAPI Specification are used to define either/or type structures rather than validations. + * Because of this ambiguity in the spec about what is non-standard about oneOf support, we'll warn as a recommendation that + * properties on the schema defining oneOf relationships may not be intentional in the OpenAPI Specification. * * @return true if enabled, false if disabled - */ - public boolean isEnableOneOfWithPropertiesRecommendation() { - return enableOneOfWithPropertiesRecommendation; - } - - /** - * Enable or Disable the recommendation check for schemas containing properties and oneOf definitions. - *

- * For more details, see {@link RuleConfiguration#isEnableOneOfWithPropertiesRecommendation()} + * -- SETTER -- + * Enable or Disable the recommendation check for schemas containing properties and oneOf definitions. + *

+ * For more details, see * * @param enableOneOfWithPropertiesRecommendation true to enable, false to disable */ - public void setEnableOneOfWithPropertiesRecommendation(boolean enableOneOfWithPropertiesRecommendation) { - this.enableOneOfWithPropertiesRecommendation = enableOneOfWithPropertiesRecommendation; - } - - /** - * Enable or Disable the recommendation check for schemas containing type definitions, specifically - * for changes between OpenAPI 3.0.x and 3.1. - * - *

- * For more details, see {@link RuleConfiguration#isEnableSchemaTypeRecommendation()} - * - * @param enableSchemaTypeRecommendation true to enable, false to disable - */ - public void setEnableSchemaTypeRecommendation(boolean enableSchemaTypeRecommendation) { - this.enableSchemaTypeRecommendation = enableSchemaTypeRecommendation; - } - + private boolean enableOneOfWithPropertiesRecommendation = defaultedBoolean(propertyPrefix + ".oneof-properties-ambiguity", true); /** - * Gets whether the recommendation check for schemas containing type definitions. - *

- * In OpenAPI 3.0.x, the "type" attribute must be a string value. - * In OpenAPI 3.1, the type attribute may be: - * A string value - * The 'null' value - * An array containing primitive types and the 'null' value. + * -- GETTER -- + * Gets whether the recommendation to check for unused schemas is enabled. + *

+ * While the tooling may or may not support generation of models representing unused schemas, we take the stance that + * a schema which is defined but not referenced in an operation or by some schema bound to an operation may be a good + * indicator of a programming error. We surface this information to the user in case the orphaned schema(s) are not + * intentional. * * @return true if enabled, false if disabled - */ - public boolean isEnableSchemaTypeRecommendation() { - return enableSchemaTypeRecommendation; - } - - /** - * Enable or Disable the recommendation check for the 'nullable' attribute. + * -- SETTER -- + * Enable or Disable the recommendation check for unused schemas. + *

+ * For more details, see * - *

- * For more details, see {@link RuleConfiguration#isEnableNullableAttributeRecommendation()} - * - * @param enableNullableAttributeRecommendation true to enable, false to disable + * @param enableUnusedSchemasRecommendation true to enable, false to disable */ - public void setEnableNullableAttributeRecommendation(boolean enableNullableAttributeRecommendation) { - this.enableNullableAttributeRecommendation = enableNullableAttributeRecommendation; - } - + private boolean enableUnusedSchemasRecommendation = defaultedBoolean(propertyPrefix + ".unused-schemas", true); /** - * Gets whether the recommendation check for schemas containing the 'nullable' attribute. - *

- * In OpenAPI 3.0.x, the "nullable" attribute is supported. However, because it is deprecated in 3.1 - * and above, a warning is logged to prepare for OpenAPI 3.1 recommendations. - * In OpenAPI 3.1, the 'nullable' attribute is deprecated. Instead the OpenAPI specification should - * use the 'null' type. + * -- GETTER -- + * Gets whether the recommendation check for schemas containing type definitions. + *

+ * In OpenAPI 3.0.x, the "type" attribute must be a string value. + * In OpenAPI 3.1, the type attribute may be: + * A string value + * The 'null' value + * An array containing primitive types and the 'null' value. * * @return true if enabled, false if disabled - */ - public boolean isEnableNullableAttributeRecommendation() { - return enableNullableAttributeRecommendation; - } - - /** - * Enable or Disable the recommendation check for the 'type' attribute. - * - *

- * For more details, see {@link RuleConfiguration#isEnableInvalidTypeRecommendation()} + * -- SETTER -- + * Enable or Disable the recommendation check for schemas containing type definitions, specifically + * for changes between OpenAPI 3.0.x and 3.1. + *

+ * For more details, see * - * @param enableInvalidTypeRecommendation true to enable, false to disable + * @param enableSchemaTypeRecommendation true to enable, false to disable */ - public void setEnableInvalidTypeRecommendation(boolean enableInvalidTypeRecommendation) { - this.enableInvalidTypeRecommendation = enableInvalidTypeRecommendation; - } - + private boolean enableSchemaTypeRecommendation = defaultedBoolean(propertyPrefix + ".schema-type", true); /** - * Gets whether the recommendation check for schemas containing invalid values for the 'type' attribute. - *

+ * -- GETTER -- + * Gets whether the recommendation check for schemas containing the 'nullable' attribute. + *

+ * In OpenAPI 3.0.x, the "nullable" attribute is supported. However, because it is deprecated in 3.1 + * and above, a warning is logged to prepare for OpenAPI 3.1 recommendations. + * In OpenAPI 3.1, the 'nullable' attribute is deprecated. Instead, the OpenAPI specification should + * use the 'null' type. * * @return true if enabled, false if disabled + * -- SETTER -- + * Enable or Disable the recommendation check for the 'nullable' attribute. + *

+ * For more details, see + * @param enableNullableAttributeRecommendation true to enable, false to disable */ - public boolean isEnableInvalidTypeRecommendation() { - return enableInvalidTypeRecommendation; - } - + private boolean enableNullableAttributeRecommendation = defaultedBoolean(propertyPrefix + ".nullable-deprecated", true); /** - * Get whether recommendations are enabled. - *

- * The 'type' attribute must be one of 'null', 'boolean', 'object', 'array', 'number', 'string', or 'integer' + * -- GETTER -- + * Gets whether the recommendation check for schemas containing invalid values for the 'type' attribute. + *

* * @return true if enabled, false if disabled - */ - public boolean isEnableRecommendations() { - return enableRecommendations; - } - - /** - * Enable or Disable recommendations. Recommendations are either informational or warning level type validations - * which are raised to communicate issues to the user which they may not be aware of, or for which support in the - * tooling/spec may not be clearly defined. + * -- SETTER -- + * Enable or Disable the recommendation check for the 'type' attribute. + *

+ * For more details, see * - * @param enableRecommendations true to enable, false to disable + * @param enableInvalidTypeRecommendation true to enable, false to disable */ - public void setEnableRecommendations(boolean enableRecommendations) { - this.enableRecommendations = enableRecommendations; - } + private boolean enableInvalidTypeRecommendation = defaultedBoolean(propertyPrefix + ".invalid-type", true); /** - * Gets whether the recommendation to check for unused schemas is enabled. - *

- * While the tooling may or may not support generation of models representing unused schemas, we take the stance that - * a schema which is defined but not referenced in an operation or by some schema bound to an operation may be a good - * indicator of a programming error. We surface this information to the user in case the orphaned schema(s) are not - * intentional. + * -- GETTER -- + * Gets whether we will raise awareness a GET or HEAD operation is defined with body. * * @return true if enabled, false if disabled - */ - public boolean isEnableUnusedSchemasRecommendation() { - return enableUnusedSchemasRecommendation; - } - - /** - * Enable or Disable the recommendation check for unused schemas. - *

- * For more details, see {@link RuleConfiguration#isEnableUnusedSchemasRecommendation()} + * -- SETTER -- + * Enable or Disable the recommendation check for GET or HEAD operations with bodies. + *

+ * For more details, see * - * @param enableUnusedSchemasRecommendation true to enable, false to disable + * @param enableApiRequestUriWithBodyRecommendation true to enable, false to disable */ - public void setEnableUnusedSchemasRecommendation(boolean enableUnusedSchemasRecommendation) { - this.enableUnusedSchemasRecommendation = enableUnusedSchemasRecommendation; + private boolean enableApiRequestUriWithBodyRecommendation = defaultedBoolean(propertyPrefix + ".anti-patterns.uri-unexpected-body", true); + + @SuppressWarnings("SameParameterValue") + private static boolean defaultedBoolean(String key, boolean defaultValue) { + String property = System.getProperty(key); + if (property == null) return defaultValue; + return Boolean.parseBoolean(property); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/SchemaWrapper.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/SchemaWrapper.java index 1e7e9c0e0ff5..8b95becd6a0b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/SchemaWrapper.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/SchemaWrapper.java @@ -2,13 +2,20 @@ import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.OpenAPI; +import lombok.Getter; /** * Encapsulates an OAS schema. */ public class SchemaWrapper { OpenAPI specification; - private Schema schema; + /** + * -- GETTER -- + * Return the OAS schema + * + * @return the OAS schema + */ + @Getter private Schema schema; /** * Constructs a new instance of {@link SchemaWrapper} @@ -21,15 +28,6 @@ public class SchemaWrapper { this.schema = schema; } - /** - * Return the OAS schema - * - * @return the OAS schema - */ - public Schema getSchema() { - return schema; - } - /** * Returns the OpenAPI specification. * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/SecuritySchemeWrapper.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/SecuritySchemeWrapper.java index 66b65b6bfa9f..3f2d7fbbaacb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/SecuritySchemeWrapper.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/SecuritySchemeWrapper.java @@ -2,13 +2,20 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.security.SecurityScheme; +import lombok.Getter; /** * Encapsulates an OAS parameter. */ public class SecuritySchemeWrapper { OpenAPI specification; - private SecurityScheme securityScheme; + /** + * -- GETTER -- + * Return the OAS securityScheme + * + * @return the OAS securityScheme + */ + @Getter private SecurityScheme securityScheme; /** * Constructs a new instance of {@link SecuritySchemeWrapper} @@ -21,15 +28,6 @@ public class SecuritySchemeWrapper { this.securityScheme = securityScheme; } - /** - * Return the OAS securityScheme - * - * @return the OAS securityScheme - */ - public SecurityScheme getSecurityScheme() { - return securityScheme; - } - /** * Returns the OpenAPI specification. * diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java index 33cee6130212..b456a5f73fa3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java @@ -17,7 +17,6 @@ import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.utils.ModelUtils; import org.testng.Assert; -import org.testng.annotations.Ignore; import org.testng.annotations.Test; import java.io.File; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/MockDefaultGenerator.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/MockDefaultGenerator.java index c9a1cbf4878f..de0e7c4b2599 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/MockDefaultGenerator.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/MockDefaultGenerator.java @@ -15,6 +15,7 @@ */ package org.openapitools.codegen; +import lombok.Getter; import org.openapitools.codegen.templating.TemplateManagerOptions; import java.io.File; @@ -31,15 +32,8 @@ * * @deprecated Please avoid using this type, as it is not a mock and invokes real generation. Prefer {@link DefaultGenerator#DefaultGenerator(Boolean)} with dryRun=true and/or true mocked spies. */ -@Deprecated +@Getter @Deprecated public class MockDefaultGenerator extends DefaultGenerator { - public List getTemplateBasedFiles() { - return templateBasedFiles; - } - - public Map getFiles() { - return files; - } // public static final String INPUT_STREAM_CONTENT = "INPUT STREAM CONTENT"; private List templateBasedFiles = new ArrayList<>(); @@ -61,7 +55,7 @@ public Generator opts(ClientOptInput opts) { return o; } - public static class WrittenTemplateBasedFile { + @Getter public static class WrittenTemplateBasedFile { private Map templateData; private String templateName; private String outputFilename; @@ -72,18 +66,6 @@ public WrittenTemplateBasedFile(Map templateData, String templat this.outputFilename = outputFilename; } - public Map getTemplateData() { - return templateData; - } - - public String getTemplateName() { - return templateName; - } - - public String getOutputFilename() { - return outputFilename; - } - @Override public String toString() { return "WrittenTemplateBasedFile [" + diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java index d7b85e4be6f0..174536e84923 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java @@ -16,43 +16,14 @@ package org.openapitools.codegen; -import com.google.common.collect.Sets; -import com.samskivert.mustache.Mustache.Lambda; - -import io.swagger.parser.OpenAPIParser; -import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; -import io.swagger.v3.oas.models.headers.Header; import io.swagger.v3.oas.models.media.*; -import io.swagger.v3.oas.models.parameters.Parameter; -import io.swagger.v3.oas.models.parameters.QueryParameter; -import io.swagger.v3.oas.models.parameters.RequestBody; -import io.swagger.v3.oas.models.responses.ApiResponse; -import io.swagger.v3.oas.models.responses.ApiResponses; -import io.swagger.v3.oas.models.security.SecurityScheme; -import io.swagger.v3.parser.core.models.ParseOptions; - -import org.openapitools.codegen.config.CodegenConfigurator; -import org.openapitools.codegen.config.GlobalSettings; -import org.openapitools.codegen.model.ModelMap; -import org.openapitools.codegen.model.ModelsMap; -import org.openapitools.codegen.templating.mustache.CamelCaseAndSanitizeLambda; -import org.openapitools.codegen.templating.mustache.IndentedLambda; -import org.openapitools.codegen.templating.mustache.LowercaseLambda; -import org.openapitools.codegen.templating.mustache.TitlecaseLambda; -import org.openapitools.codegen.templating.mustache.UppercaseLambda; + import org.openapitools.codegen.utils.ModelUtils; -import org.openapitools.codegen.utils.SemVer; -import org.testng.Assert; -import org.testng.annotations.Ignore; import org.testng.annotations.Test; -import java.io.File; -import java.nio.file.Files; import java.util.*; -import java.util.stream.Collectors; import static org.testng.Assert.*; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/cpprestbed/CppRestbedServerTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/cpprestbed/CppRestbedServerTest.java index cb47b78b87d7..0fb2360e502e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/cpprestbed/CppRestbedServerTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/cpprestbed/CppRestbedServerTest.java @@ -10,7 +10,6 @@ import org.testng.annotations.Test; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/cpptiny/CppTinyClientModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/cpptiny/CppTinyClientModelTest.java index da97ae456454..462266da88cb 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/cpptiny/CppTinyClientModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/cpptiny/CppTinyClientModelTest.java @@ -1,15 +1,5 @@ package org.openapitools.codegen.cpptiny; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.media.IntegerSchema; -import io.swagger.v3.oas.models.media.ObjectSchema; -import io.swagger.v3.oas.models.media.Schema; -import org.openapitools.codegen.*; -import org.openapitools.codegen.languages.CppTinyClientCodegen; -import org.testng.Assert; -import org.testng.annotations.Test; - - public class CppTinyClientModelTest extends CppTinyBaseTest { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java index 8ee09093d5af..5ab982393833 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java @@ -37,7 +37,6 @@ import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.languages.CSharpClientCodegen; -import org.openapitools.codegen.languages.JavaClientCodegen; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java index 36b3e4edb65a..ae403621c0ae 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java @@ -20,7 +20,6 @@ import java.io.BufferedReader; import java.io.FileInputStream; import java.io.InputStreamReader; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientOptionsTest.java index 90136ff895a5..87dabbbfd00d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientOptionsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientOptionsTest.java @@ -20,7 +20,6 @@ import org.openapitools.codegen.AbstractOptionsTest; import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.languages.DartClientCodegen; -import org.openapitools.codegen.languages.DartDioClientCodegen; import org.openapitools.codegen.options.DartClientOptionsProvider; import static org.mockito.Mockito.mock; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java index 1967ceb66724..a48e2dbbc6c7 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java @@ -33,8 +33,6 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/eiffel/AbstractEiffelCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/eiffel/AbstractEiffelCodegenTest.java index e0b2dc42507b..144bfe7c2d00 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/eiffel/AbstractEiffelCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/eiffel/AbstractEiffelCodegenTest.java @@ -17,17 +17,32 @@ package org.openapitools.codegen.eiffel; +import org.mockito.Answers; import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.languages.AbstractEiffelCodegen; import org.testng.Assert; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.withSettings; + public class AbstractEiffelCodegenTest { + private AbstractEiffelCodegen codegen; + + /** + * In TEST-NG, test class (and its fields) is only constructed once (vs. for every test in Jupiter), + * using @BeforeMethod to have a fresh codegen mock for each test + */ + @BeforeMethod void mockAbstractCodegen() { + codegen = mock( + AbstractEiffelCodegen.class, withSettings().defaultAnswer(Answers.CALLS_REAL_METHODS).useConstructor() + ); + } + @Test public void testInitialConfigValues() throws Exception { - final AbstractEiffelCodegen codegen = new P_AbstractEiffelCodegen(); codegen.processOpts(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); @@ -36,7 +51,6 @@ public void testInitialConfigValues() throws Exception { @Test public void testSettersForConfigValues() throws Exception { - final AbstractEiffelCodegen codegen = new P_AbstractEiffelCodegen(); codegen.setHideGenerationTimestamp(true); codegen.processOpts(); @@ -46,28 +60,10 @@ public void testSettersForConfigValues() throws Exception { @Test public void testAdditionalPropertiesPutForConfigValues() throws Exception { - final AbstractEiffelCodegen codegen = new P_AbstractEiffelCodegen(); codegen.additionalProperties().put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, true); codegen.processOpts(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); Assert.assertTrue(codegen.isHideGenerationTimestamp()); } - - private static class P_AbstractEiffelCodegen extends AbstractEiffelCodegen { - @Override - public CodegenType getTag() { - return null; - } - - @Override - public String getName() { - return null; - } - - @Override - public String getHelp() { - return null; - } - } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/AbstractGoCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/AbstractGoCodegenTest.java index c232ff4d8eaa..af4f8bdfdd36 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/AbstractGoCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/AbstractGoCodegenTest.java @@ -24,18 +24,33 @@ import io.swagger.v3.oas.models.media.MapSchema; import io.swagger.v3.oas.models.media.ObjectSchema; import io.swagger.v3.oas.models.media.Schema; +import org.mockito.Answers; import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.languages.AbstractGoCodegen; import org.openapitools.codegen.utils.ModelUtils; import org.testng.Assert; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.withSettings; + public class AbstractGoCodegenTest { + private AbstractGoCodegen codegen; + + /** + * In TEST-NG, test class (and its fields) is only constructed once (vs. for every test in Jupiter), + * using @BeforeMethod to have a fresh codegen mock for each test + */ + @BeforeMethod void mockAbstractCodegen() { + codegen = mock( + AbstractGoCodegen.class, withSettings().defaultAnswer(Answers.CALLS_REAL_METHODS).useConstructor() + ); + } + @Test public void testInitialConfigValues() throws Exception { - final AbstractGoCodegen codegen = new P_AbstractGoCodegen(); codegen.processOpts(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); @@ -44,7 +59,6 @@ public void testInitialConfigValues() throws Exception { @Test public void testSettersForConfigValues() throws Exception { - final AbstractGoCodegen codegen = new P_AbstractGoCodegen(); codegen.setHideGenerationTimestamp(true); codegen.processOpts(); @@ -54,7 +68,6 @@ public void testSettersForConfigValues() throws Exception { @Test public void testAdditionalPropertiesPutForConfigValues() throws Exception { - final AbstractGoCodegen codegen = new P_AbstractGoCodegen(); codegen.additionalProperties().put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, true); codegen.processOpts(); @@ -64,7 +77,6 @@ public void testAdditionalPropertiesPutForConfigValues() throws Exception { @Test public void getTypeDeclarationTest() { - final AbstractGoCodegen codegen = new P_AbstractGoCodegen(); // Create an alias to an array schema Schema nestedArraySchema = new ArraySchema().items(new IntegerSchema().format("int32")); @@ -99,21 +111,4 @@ public void getTypeDeclarationTest() { defaultValue = codegen.getTypeDeclaration(schema); Assert.assertEquals(defaultValue, "map[string]interface{}"); } - - private static class P_AbstractGoCodegen extends AbstractGoCodegen { - @Override - public CodegenType getTag() { - return null; - } - - @Override - public String getName() { - return null; - } - - @Override - public String getHelp() { - return null; - } - } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellservant/HaskellModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellservant/HaskellModelTest.java index 82e4f915fdea..b3f2dcda3d14 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellservant/HaskellModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellservant/HaskellModelTest.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.haskellservant; -import org.testng.Assert; import org.testng.annotations.Test; public class HaskellModelTest { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellyesod/HaskellYesodServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellyesod/HaskellYesodServerCodegenTest.java index 830c159f08d5..548e08aaa573 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellyesod/HaskellYesodServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/haskellyesod/HaskellYesodServerCodegenTest.java @@ -1,7 +1,7 @@ package org.openapitools.codegen.haskellyesod; import java.util.*; -import org.openapitools.codegen.TestUtils; + import org.openapitools.codegen.languages.HaskellYesodServerCodegen; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaCXFClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaCXFClientCodegenTest.java index 0f1b2315f2ac..85e7fad645b6 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaCXFClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaCXFClientCodegenTest.java @@ -36,7 +36,6 @@ import org.testng.annotations.Test; import java.io.File; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java index 848d5d7edf0b..91c36f642936 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java @@ -31,7 +31,6 @@ import org.openapitools.codegen.*; import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.languages.JavaClientCodegen; -import org.openapitools.codegen.languages.features.DocumentationProviderFeatures; import org.openapitools.codegen.languages.features.DocumentationProviderFeatures.AnnotationLibrary; import org.testng.Assert; import org.testng.annotations.DataProvider; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java index fac2af8f7b08..921f5ac50510 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java @@ -23,6 +23,7 @@ protected AbstractAnnotationAssert(final List annotationExpr) { super(annotationExpr); } + @Override public ACTUAL hasSize(final int size) { super.hasSize(size); return myself(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/AbstractJavaJAXRSServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/AbstractJavaJAXRSServerCodegenTest.java index e1c3d5f710ab..897f9bc6d139 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/AbstractJavaJAXRSServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/AbstractJavaJAXRSServerCodegenTest.java @@ -19,33 +19,46 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.servers.Server; +import org.mockito.Answers; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenOperation; -import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.languages.AbstractJavaJAXRSServerCodegen; import org.openapitools.codegen.model.OperationMap; import org.openapitools.codegen.model.OperationsMap; import org.testng.Assert; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.util.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.withSettings; + public class AbstractJavaJAXRSServerCodegenTest { - private final AbstractJavaJAXRSServerCodegen fakeJavaJAXRSCodegen = new P_AbstractJavaJAXRSServerCodegen(); + private AbstractJavaJAXRSServerCodegen codegen; + + /** + * In TEST-NG, test class (and its fields) is only constructed once (vs. for every test in Jupiter), + * using @BeforeMethod to have a fresh codegen mock for each test + */ + @BeforeMethod void mockAbstractCodegen() { + codegen = mock( + AbstractJavaJAXRSServerCodegen.class, withSettings().defaultAnswer(Answers.CALLS_REAL_METHODS).useConstructor() + ); + } @Test public void convertApiName() { - Assert.assertEquals(fakeJavaJAXRSCodegen.toApiName("name"), "NameApi"); - Assert.assertEquals(fakeJavaJAXRSCodegen.toApiName("$name"), "NameApi"); - Assert.assertEquals(fakeJavaJAXRSCodegen.toApiName("nam#e"), "NameApi"); - Assert.assertEquals(fakeJavaJAXRSCodegen.toApiName("$another-fake?"), "AnotherFakeApi"); - Assert.assertEquals(fakeJavaJAXRSCodegen.toApiName("fake_classname_tags 123#$%^"), "FakeClassnameTags123Api"); + Assert.assertEquals(codegen.toApiName("name"), "NameApi"); + Assert.assertEquals(codegen.toApiName("$name"), "NameApi"); + Assert.assertEquals(codegen.toApiName("nam#e"), "NameApi"); + Assert.assertEquals(codegen.toApiName("$another-fake?"), "AnotherFakeApi"); + Assert.assertEquals(codegen.toApiName("fake_classname_tags 123#$%^"), "FakeClassnameTags123Api"); } @Test public void testInitialConfigValues() throws Exception { - final AbstractJavaJAXRSServerCodegen codegen = new P_AbstractJavaJAXRSServerCodegen(); codegen.processOpts(); OpenAPI openAPI = new OpenAPI(); @@ -65,7 +78,6 @@ public void testInitialConfigValues() throws Exception { @Test public void testSettersForConfigValues() throws Exception { - final AbstractJavaJAXRSServerCodegen codegen = new P_AbstractJavaJAXRSServerCodegen(); codegen.setHideGenerationTimestamp(true); codegen.setModelPackage("xx.yyyyyyyy.model"); codegen.setApiPackage("xx.yyyyyyyy.api"); @@ -84,7 +96,6 @@ public void testSettersForConfigValues() throws Exception { @Test public void testAdditionalPropertiesPutForConfigValues() throws Exception { - final AbstractJavaJAXRSServerCodegen codegen = new P_AbstractJavaJAXRSServerCodegen(); codegen.additionalProperties().put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, "true"); codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, "xyz.yyyyy.mmmmm.model"); codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xyz.yyyyy.aaaaa.api"); @@ -109,7 +120,6 @@ public void testAdditionalPropertiesPutForConfigValues() throws Exception { @Test public void testCommonPath() { - final AbstractJavaJAXRSServerCodegen codegen = new P_AbstractJavaJAXRSServerCodegen(); OperationsMap objs = new OperationsMap(); OperationMap opMap = new OperationMap(); List operations = new ArrayList<>(); @@ -176,22 +186,4 @@ private CodegenOperation getCo(final String path) { co.path = path; return co; } - - private static class P_AbstractJavaJAXRSServerCodegen extends AbstractJavaJAXRSServerCodegen { - - @Override - public CodegenType getTag() { - return null; - } - - @Override - public String getName() { - return null; - } - - @Override - public String getHelp() { - return null; - } - } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java index d63754a27470..adeef95722f8 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java @@ -3,10 +3,8 @@ import io.swagger.parser.OpenAPIParser; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.parser.core.models.ParseOptions; -import org.assertj.core.condition.AllOf; import org.openapitools.codegen.*; import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.java.assertions.JavaFileAssert; @@ -30,7 +28,6 @@ import static org.openapitools.codegen.TestUtils.assertFileContains; import static org.openapitools.codegen.TestUtils.validateJavaSourceFiles; -import static org.openapitools.codegen.languages.AbstractJavaJAXRSServerCodegen.USE_TAGS; import static org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen.*; import static org.openapitools.codegen.languages.features.GzipFeatures.USE_GZIP_FEATURE; import static org.testng.Assert.assertTrue; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java index b820edc33848..6ab3fd698784 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java @@ -5,31 +5,42 @@ import io.swagger.v3.oas.models.media.ObjectSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.StringSchema; +import org.mockito.Answers; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenProperty; -import org.openapitools.codegen.CodegenType; -import org.openapitools.codegen.DefaultCodegen; import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.languages.AbstractKotlinCodegen; import org.testng.Assert; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.File; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.withSettings; import static org.openapitools.codegen.CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.*; import static org.openapitools.codegen.TestUtils.createCodegenModelWrapper; import static org.testng.Assert.*; public class AbstractKotlinCodegenTest { - private final AbstractKotlinCodegen codegen = new P_AbstractKotlinCodegen(); + private AbstractKotlinCodegen codegen; + + /** + * In TEST-NG, test class (and its fields) is only constructed once (vs. for every test in Jupiter), + * using @BeforeMethod to have a fresh codegen mock for each test + */ + @BeforeMethod void mockAbstractCodegen() { + codegen = mock( + AbstractKotlinCodegen.class, withSettings().defaultAnswer(Answers.CALLS_REAL_METHODS).useConstructor() + ); + } @Test public void camlCaseEnumConverter() { @@ -82,23 +93,6 @@ public void toEnumValue() { assertEquals(codegen.toEnumValue("data/*", "Something"), "\"data/*\""); } - private static class P_AbstractKotlinCodegen extends AbstractKotlinCodegen { - @Override - public CodegenType getTag() { - return null; - } - - @Override - public String getName() { - return null; - } - - @Override - public String getHelp() { - return null; - } - } - @Test public void isDataTypeString() { assertFalse(codegen.isDataTypeString("kotlin.Int")); @@ -241,7 +235,6 @@ public void handleInheritance() { openAPI.getComponents().addSchemas(parent.getName(), parent); openAPI.getComponents().addSchemas(child.getName(), child); - final DefaultCodegen codegen = new P_AbstractKotlinCodegen(); codegen.setOpenAPI(openAPI); final CodegenModel pm = codegen @@ -267,7 +260,6 @@ public void handleInheritance() { @Test(description = "Issue #10591") public void testEnumPropertyWithDefaultValue() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/kotlin/issue10591-enum-defaultValue.yaml"); - final AbstractKotlinCodegen codegen = new P_AbstractKotlinCodegen(); codegen.setOpenAPI(openAPI); Schema test1 = openAPI.getComponents().getSchemas().get("ModelWithEnumPropertyHavingDefault"); @@ -289,7 +281,6 @@ public void testEnumPropertyWithDefaultValue() { @Test(description = "Issue #3804") public void testEnumPropertyWithCapitalization() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/kotlin/issue3804-enum-enum-capitalization.yaml"); - final AbstractKotlinCodegen codegen = new P_AbstractKotlinCodegen(); Schema test1 = openAPI.getComponents().getSchemas().get("ModelWithEnumPropertyHavingDefault"); CodegenModel cm1 = codegen.fromModel("ModelWithEnumPropertyHavingDefault", test1); @@ -312,7 +303,6 @@ public void testEnumPropertyWithCapitalization() { @Test(description = "Issue #3804") public void testEnumPropertyDefaultWithCapitalization() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/kotlin/issue3804-enum-enum-capitalization.yaml"); - final AbstractKotlinCodegen codegen = new P_AbstractKotlinCodegen(); Schema test1 = openAPI.getComponents().getSchemas().get("ModelWithEnumPropertyHavingDefault"); CodegenModel cm1 = codegen.fromModel("ModelWithEnumPropertyHavingDefault", test1); @@ -332,7 +322,6 @@ public void testEnumPropertyDefaultWithCapitalization() { @Test(description = "Issue #3804") public void testEnumPropertyWithKeyword() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/kotlin/issue3804-enum-enum-capitalization.yaml"); - final AbstractKotlinCodegen codegen = new P_AbstractKotlinCodegen(); Schema test1 = openAPI.getComponents().getSchemas().get("ModelWithEnumPropertyHavingDefault"); CodegenModel cm1 = codegen.fromModel("ModelWithEnumPropertyHavingDefault", test1); @@ -373,7 +362,6 @@ public void handleInheritanceWithObjectTypeShouldNotBeAMap() { openAPI.getComponents().addSchemas(child.getName(), child); openAPI.getComponents().addSchemas(mapSchema.getName(), mapSchema); - final DefaultCodegen codegen = new P_AbstractKotlinCodegen(); codegen.setOpenAPI(openAPI); final CodegenModel pm = codegen diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/JetbrainsHttpClientClientCodegenOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/JetbrainsHttpClientClientCodegenOptionsProvider.java index bcc397589cbb..f5d7706402aa 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/JetbrainsHttpClientClientCodegenOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/JetbrainsHttpClientClientCodegenOptionsProvider.java @@ -1,6 +1,5 @@ package org.openapitools.codegen.options; -import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.languages.JetbrainsHttpClientClientCodegen; import com.google.common.collect.ImmutableMap; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/Swift5OptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/Swift5OptionsProvider.java index 33e4d608b65f..c9a5c4b2ae4f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/Swift5OptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/Swift5OptionsProvider.java @@ -21,7 +21,6 @@ import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.languages.Swift5ClientCodegen; -import java.io.File; import java.util.Map; public class Swift5OptionsProvider implements OptionsProvider { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/XojoClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/XojoClientOptionsProvider.java index 05a6f60a4347..a7f9a8697658 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/XojoClientOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/XojoClientOptionsProvider.java @@ -19,9 +19,7 @@ import com.google.common.collect.ImmutableMap; import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.languages.XojoClientCodegen; -import java.io.File; import java.util.Map; public class XojoClientOptionsProvider implements OptionsProvider { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java index f89f5f95ea1a..a73cb73a76a0 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java @@ -20,25 +20,40 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.Schema; +import org.mockito.Answers; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenProperty; -import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.languages.AbstractPhpCodegen; import org.openapitools.codegen.TestUtils; import org.testng.Assert; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import java.util.Arrays; import java.util.HashMap; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.withSettings; + public class AbstractPhpCodegenTest { + private AbstractPhpCodegen codegen; + + /** + * In TEST-NG, test class (and its fields) is only constructed once (vs. for every test in Jupiter), + * using @BeforeMethod to have a fresh codegen mock for each test + */ + @BeforeMethod void mockAbstractCodegen() { + codegen = mock( + AbstractPhpCodegen.class, withSettings().defaultAnswer(Answers.CALLS_REAL_METHODS).useConstructor() + ); + } + @Test public void testInitialConfigValues() throws Exception { - final AbstractPhpCodegen codegen = new P_AbstractPhpCodegen(); codegen.processOpts(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); @@ -53,7 +68,6 @@ public void testInitialConfigValues() throws Exception { @Test public void testSettersForConfigValues() throws Exception { - final AbstractPhpCodegen codegen = new P_AbstractPhpCodegen(); codegen.setHideGenerationTimestamp(false); codegen.setModelPackage("My\\Client\\Model"); codegen.setApiPackage("My\\Client\\Api"); @@ -72,7 +86,6 @@ public void testSettersForConfigValues() throws Exception { @Test public void testAdditionalPropertiesPutForConfigValues() throws Exception { - final AbstractPhpCodegen codegen = new P_AbstractPhpCodegen(); codegen.additionalProperties().put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, false); codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, "PHPmodel"); codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "PHPapi"); @@ -100,7 +113,6 @@ public void testEscapeMediaType() throws Exception { codegenOperation.hasProduces = true; codegenOperation.produces = Arrays.asList(all, applicationJson); - final AbstractPhpCodegen codegen = new P_AbstractPhpCodegen(); codegen.escapeMediaType(Arrays.asList(codegenOperation)); Assert.assertEquals(codegenOperation.produces.get(0).get("mediaType"), "*_/_*"); @@ -109,7 +121,6 @@ public void testEscapeMediaType() throws Exception { @Test(dataProvider = "composerNames", description = "Issue #9998") public void testGetComposerPackageName(String gitUserId, String gitRepoId, String result) { - final AbstractPhpCodegen codegen = new P_AbstractPhpCodegen(); codegen.processOpts(); codegen.setGitUserId(gitUserId); @@ -131,7 +142,6 @@ public static Object[][] composerNames() { @Test(description = "Issue #8945") public void testArrayOfArrays() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_8945.yaml"); - final AbstractPhpCodegen codegen = new P_AbstractPhpCodegen(); codegen.setOpenAPI(openAPI); Schema test1 = openAPI.getComponents().getSchemas().get("MyResponse"); @@ -150,7 +160,6 @@ public void testArrayOfArrays() { @Test(description = "Issue #10244") public void testEnumPropertyWithDefaultValue() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/php/issue_10244.yaml"); - final AbstractPhpCodegen codegen = new P_AbstractPhpCodegen(); codegen.setOpenAPI(openAPI); Schema test1 = openAPI.getComponents().getSchemas().get("ModelWithEnumPropertyHavingDefault"); @@ -167,21 +176,4 @@ public void testEnumPropertyWithDefaultValue() { CodegenProperty cp1 = cm1.vars.get(0); Assert.assertEquals(cp1.getDefaultValue(), "'VALUE'"); } - - private static class P_AbstractPhpCodegen extends AbstractPhpCodegen { - @Override - public CodegenType getTag() { - return null; - } - - @Override - public String getName() { - return null; - } - - @Override - public String getHelp() { - return null; - } - } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/plantuml/PlantumlDocumentationCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/plantuml/PlantumlDocumentationCodegenTest.java index 6e96ae888d13..358948df3b70 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/plantuml/PlantumlDocumentationCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/plantuml/PlantumlDocumentationCodegenTest.java @@ -7,7 +7,6 @@ import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.languages.PlantumlDocumentationCodegen; import org.openapitools.codegen.model.ModelMap; -import org.openapitools.codegen.model.ModelsMap; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonPydanticV1ClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonPydanticV1ClientCodegenTest.java index 837c7ad3f7da..109112b9d99c 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonPydanticV1ClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonPydanticV1ClientCodegenTest.java @@ -29,7 +29,7 @@ import org.openapitools.codegen.languages.features.CXFServerFeatures; import static org.openapitools.codegen.TestUtils.assertFileContains; import static org.openapitools.codegen.TestUtils.assertFileExists; -import org.openapitools.codegen.TestUtils; + import org.testng.Assert; import org.testng.annotations.Test; import java.io.File; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java index 2d54a75582a5..07362649ff64 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.ruby; -import com.google.common.collect.ImmutableMap; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.Schema; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java index 52e07fa5f17b..bd4c1eda369b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java @@ -19,9 +19,6 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; -import org.openapitools.codegen.CodegenOperation; -import org.openapitools.codegen.DefaultCodegen; -import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.languages.Swift5ClientCodegen; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/IntegrationTestPathsConfig.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/IntegrationTestPathsConfig.java index fdfd30230cb7..404d36e086e2 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/IntegrationTestPathsConfig.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/IntegrationTestPathsConfig.java @@ -17,10 +17,12 @@ package org.openapitools.codegen.testutils; +import lombok.Getter; + import java.nio.file.Path; import java.nio.file.Paths; -public class IntegrationTestPathsConfig { +@Getter public class IntegrationTestPathsConfig { private static final Path INTEGRATION_TEST_PATH = Paths.get("target/test-classes/integrationtests").toAbsolutePath(); private final Path outputPath; private final Path specPath; @@ -38,19 +40,4 @@ public IntegrationTestPathsConfig(String specLocation, String outputLocation, St ignoreFilePath = INTEGRATION_TEST_PATH.resolve(ignoreFileLocation); } - public Path getOutputPath() { - return outputPath; - } - - public Path getSpecPath() { - return specPath; - } - - public Path getExpectedPath() { - return expectedPath; - } - - public Path getIgnoreFilePath() { - return ignoreFilePath; - } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java index 319e2db9bf4f..f58571df9b75 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java @@ -15,7 +15,6 @@ import org.testng.Assert; import org.testng.annotations.Test; -import java.io.File; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java index 32e5e42e3255..411d35827e37 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java @@ -9,12 +9,6 @@ import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.config.CodegenConfigurator; -import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenOperation; -import org.openapitools.codegen.DefaultGenerator; -import org.openapitools.codegen.Generator; -import org.openapitools.codegen.SupportingFile; -import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.languages.AbstractTypeScriptClientCodegen; import org.openapitools.codegen.languages.TypeScriptFetchClientCodegen; import org.openapitools.codegen.typescript.TypeScriptGroups; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java index 0c2ad39f41fa..a7a3e644f0bd 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java @@ -21,7 +21,6 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.*; import io.swagger.v3.parser.util.SchemaTypeUtil; -import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.DefaultCodegen; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/xojo/client/ModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/xojo/client/ModelTest.java index 18c8cff07917..32f1a317d684 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/xojo/client/ModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/xojo/client/ModelTest.java @@ -5,7 +5,6 @@ import io.swagger.models.*; import io.swagger.models.properties.*; -import org.testng.Assert; import org.testng.annotations.Test; @SuppressWarnings("static-method") diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/xojo/client/OptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/xojo/client/OptionsTest.java index 3cd79d3ba607..e620e9ff6165 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/xojo/client/OptionsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/xojo/client/OptionsTest.java @@ -3,7 +3,6 @@ import org.openapitools.codegen.AbstractOptionsTest; import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.languages.XojoClientCodegen; -import org.openapitools.codegen.options.OptionsProvider; import org.openapitools.codegen.options.XojoClientOptionsProvider; import static org.mockito.Mockito.mock;