From 218c2e75aba79264c55f3e39a05e5106b8fb0eee Mon Sep 17 00:00:00 2001
From: Vincent Devos <46601673+karismann@users.noreply.github.com>
Date: Wed, 20 Mar 2019 09:16:59 +0100
Subject: [PATCH] [MAVEN PLUGIN] fix javadoc + sonarlint (#2399)

---
 .../java/org/openapitools/codegen/OpenAPIGenerator.java     | 1 -
 .../main/java/org/openapitools/codegen/cmd/Generate.java    | 2 +-
 .../java/org/openapitools/codegen/cmd/ListGenerators.java   | 3 +--
 .../main/java/org/openapitools/codegen/cmd/Validate.java    | 6 +++---
 .../java/org/openapitools/codegen/plugin/CodeGenMojo.java   | 3 ---
 pom.xml                                                     | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java
index 3650c72ffa7..f81019b7788 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java
@@ -37,7 +37,6 @@ public class OpenAPIGenerator {
 
     public static void main(String[] args) {
         String version = Version.readVersionFromResources();
-        @SuppressWarnings("unchecked")
         Cli.CliBuilder<Runnable> builder =
                 Cli.<Runnable>builder("openapi-generator-cli")
                         .withDescription(
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
index f68e93ce29f..1907231e9fc 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
 @Command(name = "generate", description = "Generate code with the specified generator.")
 public class Generate implements Runnable {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(Generate.class);
+    // private static final Logger LOGGER = LoggerFactory.getLogger(Generate.class);
 
     @Option(name = {"-v", "--verbose"}, description = "verbose mode")
     private Boolean verbose;
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java
index d75f3d46972..18fb5839161 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java
@@ -9,7 +9,6 @@ import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConfigLoader;
 import org.openapitools.codegen.CodegenType;
 
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
@@ -62,7 +61,7 @@ public class ListGenerators implements Runnable {
                 .sorted(Comparator.comparing(CodegenConfig::getName))
                 .collect(Collectors.toList());
 
-        if(list.size() > 0) {
+        if(!list.isEmpty()) {
             if (docusaurus) {
                 sb.append("## ").append(typeName).append(" generators");
             } else {
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Validate.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Validate.java
index fc8624586d6..8520114fd46 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Validate.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Validate.java
@@ -45,8 +45,8 @@ public class Validate implements Runnable {
 
         SwaggerParseResult result = new OpenAPIParser().readLocation(spec, null, null);
         List<String> messageList = result.getMessages();
-        Set<String> errors = new HashSet<String>(messageList);
-        Set<String> warnings = new HashSet<String>();
+        Set<String> errors = new HashSet<>(messageList);
+        Set<String> warnings = new HashSet<>();
 
         StringBuilder sb = new StringBuilder();
         OpenAPI specification = result.getOpenAPI();
@@ -61,7 +61,7 @@ public class Validate implements Runnable {
             }
         }
 
-        if (errors.size() > 0) {
+        if (!errors.isEmpty()) {
             sb.append("Errors:").append(System.lineSeparator());
             errors.forEach(msg ->
                     sb.append("\t-").append(msg).append(System.lineSeparator())
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 4bbb3b9c0eb..fdefbc3b19f 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
@@ -267,9 +267,6 @@ public class CodeGenMojo extends AbstractMojo {
 
     /**
      * A map of additional properties that can be referenced by the mustache templates
-     * <additionalProperties>
-     *     <additionalProperty>key=value</additionalProperty>
-     * </additionalProperties>
      */
     @Parameter(name = "additionalProperties")
     private List<String> additionalProperties;
diff --git a/pom.xml b/pom.xml
index a0ba2f2f8b0..400453462c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,13 +226,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
                 <configuration>
                     <source>1.8</source>
                     <encoding>UTF-8</encoding>
                     <maxmemory>1g</maxmemory>
                     <failOnWarnings>true</failOnWarnings>
-                    <excludePackageNames></excludePackageNames>
                 </configuration>
                 <executions>
                     <execution>