Merge pull request #8786 from swagger-api/fix-meta

refs #8784 - fix meta generator

Author: frantuma

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Meta.java

@@ -23,7 +23,7 @@ public class Meta implements Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Meta.class);
 
-    private static final String TEMPLATE_DIR_CLASSPATH = "v2/codegen";
+    private static final String TEMPLATE_DIR_CLASSPATH = "handlebars/codegen";
     private static final String MUSTACHE_EXTENSION = ".mustache";
 
     private String outputFolder = "";

samples/meta-codegen/README.md

@@ -26,7 +26,7 @@ At this point, you've likely generated a client setup.  It will include somethin
 |----- myClientCodegen // template files
 |----- META-INF
 |------ services
-|------- io.swagger.codegen.v3.CodegenConfig
+|------- io.swagger.codegen.CodegenConfig
 ```
 
 You _will_ need to make changes in at least the following:
@@ -46,7 +46,7 @@ mvn package
 In your generator project.  A single jar file will be produced in `target`.  You can now use that with codegen:
 
 ```
-java -cp /path/to/swagger-codegen-cli.jar:/path/to/your.jar io.swagger.codegen.v3.Codegen -l myClientCodegen -i /path/to/swagger.yaml -o ./test
+java -cp /path/to/swagger-codegen-cli.jar:/path/to/your.jar io.swagger.codegen.Codegen -l myClientCodegen -i /path/to/swagger.yaml -o ./test
 ```
 
 Now your templates are available to the client generator and you can write output values
@@ -67,7 +67,7 @@ the object you have available during client generation:
 # -DdebugOperations prints operations passed to the template engine
 # -DdebugSupportingFiles prints additional data passed to the template engine
 
-java -DdebugOperations -cp /path/to/swagger-codegen-cli.jar:/path/to/your.jar io.swagger.codegen.v3.Codegen -l myClientCodegen -i /path/to/swagger.yaml -o ./test
+java -DdebugOperations -cp /path/to/swagger-codegen-cli.jar:/path/to/your.jar io.swagger.codegen.Codegen -l myClientCodegen -i /path/to/swagger.yaml -o ./test
 ```
 
 Will, for example, output the debug info for operations.  You can use this info

samples/meta-codegen/pom.xml

@@ -106,22 +106,22 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.codegen.v3</groupId>
             <artifactId>swagger-codegen</artifactId>
             <version>${swagger-codegen-version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.swagger.codegen.v3</groupId>
             <artifactId>swagger-codegen-generators</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${swagger-codegen-generators-version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-codegen-version>3.0.0-SNAPSHOT</swagger-codegen-version>
-        <swagger-codegen-generators-version>1.0.0-SNAPSHOT</swagger-codegen-generators-version>
+        <swagger-codegen-version>3.0.2-SNAPSHOT</swagger-codegen-version>
+        <swagger-codegen-generators-version>1.0.2-SNAPSHOT</swagger-codegen-generators-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.8.1</junit-version>
         <build-helper-maven-plugin>3.0.0</build-helper-maven-plugin>

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

@@ -1,12 +1,12 @@
 package com.my.company.codegen;
 
-import io.swagger.codegen.*;
-import io.swagger.codegen.languages.DefaultCodegenConfig;
+import io.swagger.codegen.v3.*;
+import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
 
 import java.util.*;
 import java.io.File;
 
-public class MyclientcodegenGenerator extends DefaultCodegenConfig implements CodegenConfig {
+public class MyclientcodegenGenerator extends DefaultCodegenConfig {
 
   // source folder where to write the files
   protected String sourceFolder = "src";
@@ -151,4 +151,14 @@ public String apiFileFolder() {
   public String getArgumentsLocation() {
     return null;
   }
+
+  @Override
+  protected String getTemplateDir() {
+    return templateDir;
+  }
+
+  @Override
+  public String getDefaultTemplateDir() {
+    return templateDir;
+  }
 }

samples/meta-codegen/src/main/resources/META-INF/services/io.swagger.codegen.v3.CodegenConfig

@@ -0,0 +1 @@
+com.my.company.codegen.MyclientcodegenGenerator