[CLI] Improvements for meta and list command

bin/meta-codegen.sh

@@ -30,7 +30,7 @@ ags="meta -n myClientCodegen -p com.my.company.codegen -o samples/meta-codegen/l
 
 java $JAVA_OPTS -jar $executable $ags
 
-mvn verify -f samples/meta-codegen/lib/pom.xml
+mvn clean package -f samples/meta-codegen/pom.xml
 
 ags2="generate -g myClientCodegen -i modules/openapi-generator/src/test/resources/2_0/petstore.json -o samples/meta-codegen/usage $@"
 

bin/utils/ensure-up-to-date

@@ -32,6 +32,7 @@ sleep 5
 ./bin/rust-server-petstore.sh > /dev/null 2>&1
 ./bin/openapi3/haskell-http-client-petstore.sh > /dev/null 2>&1
 ./bin/csharp-petstore.sh > /dev/null 2>&1
+./bin/meta-codegen.sh > /dev/null 2>&1
 
 # Check:
 if [ -n "$(git status --porcelain)" ]; then

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java

@@ -1,14 +1,18 @@
 package org.openapitools.codegen.cmd;
 
+import com.google.common.base.Objects;
+
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
+
 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.stream.Collectors;
 
 // NOTE: List can later have subcommands such as list languages, list types, list frameworks, etc.
 @Command(name = "list", description = "Lists the available generators")
@@ -40,19 +44,29 @@ public void run() {
             sb.append(System.lineSeparator());
 
             for (CodegenType type : types) {
-                sb.append(type.name()).append(" generators:");
-                sb.append(System.lineSeparator());
-
-                generators.stream()
-                        .filter(g -> g.getTag().equals(type))
-                        .sorted(Comparator.comparing(CodegenConfig::getName))
-                        .forEach(generator -> sb.append("    - ").append(generator.getName()).append(System.lineSeparator()));
-
-                sb.append(System.lineSeparator());
-                sb.append(System.lineSeparator());
+                appendForType(sb, type, type.name(), generators);
             }
+            appendForType(sb, null, "UNSPECIFIED", generators);
         }
 
         System.out.printf("%s%n", sb.toString());
     }
+
+    private void appendForType(StringBuilder sb, CodegenType type, String typeName, List<CodegenConfig> generators) {
+        List<CodegenConfig> list = generators.stream()
+                .filter(g -> Objects.equal(type, g.getTag()))
+                .sorted(Comparator.comparing(CodegenConfig::getName))
+                .collect(Collectors.toList());
+
+        if(list.size() > 0) {
+            sb.append(typeName).append(" generators:");
+            sb.append(System.lineSeparator());
+
+            list.stream()
+                    .forEach(generator -> sb.append("    - ").append(generator.getName()).append(System.lineSeparator()));
+
+            sb.append(System.lineSeparator());
+            sb.append(System.lineSeparator());
+        }
+    }
 }

modules/openapi-generator/src/main/resources/codegen/generatorClass.mustache

@@ -19,7 +19,7 @@ public class {{generatorClass}} extends DefaultCodegen implements CodegenConfig
    * @see     org.openapitools.codegen.CodegenType
    */
   public CodegenType getTag() {
-    return CodegenType.CLIENT;
+    return CodegenType.OTHER;
   }
 
   /**

modules/openapi-generator/src/main/resources/codegen/pom.mustache

@@ -100,8 +100,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>

samples/meta-codegen/lib/README.md

@@ -62,7 +62,7 @@ the object you have available during client generation:
 
 ```
 # The following additional debug options are available for all codegen targets:
-# -DdebugSwagger prints the OpenAPI Specification as interpreted by the codegen
+# -DdebugOpenAPI prints the OpenAPI Specification as interpreted by the codegen
 # -DdebugModels prints models passed to the template engine
 # -DdebugOperations prints operations passed to the template engine
 # -DdebugSupportingFiles prints additional data passed to the template engine

samples/meta-codegen/lib/pom.xml

@@ -100,8 +100,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
@@ -116,7 +116,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <openapi-generator-version>3.0.0-SNAPSHOT</openapi-generator-version>
+        <openapi-generator-version>3.2.2-SNAPSHOT</openapi-generator-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.8.1</junit-version>
     </properties>

samples/meta-codegen/lib/src/main/java/com/my/company/codegen/MyclientcodegenGenerator.java

@@ -19,7 +19,7 @@ public class MyclientcodegenGenerator extends DefaultCodegen implements CodegenC
    * @see     org.openapitools.codegen.CodegenType
    */
   public CodegenType getTag() {
-    return CodegenType.CLIENT;
+    return CodegenType.OTHER;
   }
 
   /**

samples/meta-codegen/pom.xml

@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>meta-codegen</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+    <modules>
+        <module>lib/</module>
+        <module>../../modules/openapi-generator</module>
+    </modules>
+</project>

samples/meta-codegen/usage/.openapi-generator/VERSION

@@ -1 +1 @@
-3.0.0-SNAPSHOT
+3.2.2-SNAPSHOT