Refactoring: Use lombok for simple getters & setters

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;

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;

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;

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;

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;

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
 }

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

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

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

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

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<String, String> options;
+    @Getter private JsonNode spec;
+    @Getter private Map<String, String> 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<String, String> getOptions() {
-        return options;
-    }
-
-    public void setOptions(Map<String, String> 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;
-    }
 }

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

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<String, String> 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;

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<AuthorizationValue> auths;
-    private List<TemplateDefinition> userDefinedTemplates;
+    // not deprecated as this is added to match other functionality, we need to move to Context<?> instead of ClientOptInput.
+    @Getter private List<TemplateDefinition> userDefinedTemplates;
 
     public ClientOptInput openAPI(OpenAPI openAPI) {
         this.setOpenAPI(openAPI);
@@ -79,11 +81,6 @@ public CodegenConfig getConfig() {
         return config;
     }
 
-    public List<TemplateDefinition> 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
      *