Merge branch '3.0.0' into kotlin

Author: tcslater

bin/dynamic-html.sh

@@ -28,4 +28,4 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l dynamic-html  -o samples/dynamic-html"
 
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/html-markdown.sh

@@ -28,4 +28,4 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/markdown.yaml -l html  -o samples/html.md"
 
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/html-petstore.sh

@@ -28,4 +28,4 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l html  -o samples/html"
 
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/windows/dynamic-html-petstore.bat

@@ -7,4 +7,4 @@ If Not Exist %executable% (
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
 set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l dynamic-html -o samples\client\petstore\dynamic-html
 
-REM java %JAVA_OPTS% -jar %executable% %ags%
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/html-petstore.bat

@@ -7,4 +7,4 @@ If Not Exist %executable% (
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
 set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l html -o samples\client\petstore\html
 
-REM java %JAVA_OPTS% -jar %executable% %ags%
+java %JAVA_OPTS% -jar %executable% %ags%

docker-entrypoint.sh

@@ -10,7 +10,7 @@ cli="${GEN_DIR}/modules/swagger-codegen-cli"
 codegen="${cli}/target/swagger-codegen-cli.jar"
 cmdsrc="${cli}/src/main/java/io/swagger/codegen/cmd"
 
-pattern="@Command(name = \"$1\""
+pattern="${1^} implements Runnable"
 if expr "x$1" : 'x[a-z][a-z-]*$' > /dev/null && fgrep -qe "$pattern" "$cmdsrc"/*.java || expr "$1" = 'help' > /dev/null; then
     # If ${GEN_DIR} has been mapped elsewhere from default, and that location has not been built
     if [[ ! -f "${codegen}" ]]; then

modules/swagger-codegen/pom.xml

@@ -268,11 +268,6 @@
             <artifactId>commons-cli</artifactId>
             <version>${commons-cli-version}</version>
         </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.9.7</version>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

modules/swagger-codegen/src/main/java/config/Config.java

@@ -1,7 +1,6 @@
 package config;
 
-import com.google.common.collect.ImmutableMap;
-
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -17,7 +16,7 @@ public Config(Map<String, String> properties) {
     }
 
     public Map<String, String> getOptions() {
-        return ImmutableMap.copyOf(options);
+        return Collections.unmodifiableMap(options);
     }
 
     public boolean hasOption(String opt) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java

@@ -5,8 +5,6 @@
 import java.util.Set;
 
 import com.github.jknack.handlebars.Handlebars;
-import com.github.jknack.handlebars.Helper;
-import com.samskivert.mustache.Mustache.Compiler;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.Schema;
@@ -127,8 +125,6 @@ public interface CodegenConfig {
 
     void processOpenAPI(OpenAPI openAPI);
 
-    Compiler processCompiler(Compiler compiler);
-
     String sanitizeTag(String tag);
 
     String toApiFilename(String name);

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java

@@ -304,4 +304,9 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case,
     public static final String HAS_REFERENCE_EXT_NAME = PREFIX_HAS + "reference";
     public static final String HAS_HEADERS_EXT_NAME = PREFIX_HAS + "headers";
 
+    public static final String MODEL_DOCS_OPTION = "--model-docs";
+    public static final String API_DOCS_OPTION = "--api-docs";
+    public static final String MODEL_TESTS_OPTION = "--model-tests";
+    public static final String API_TESTS_OPTION = "--api-tests";
+
 }