#66 Generate multiple clients (#71)

* #67 Add clientPackage to FileSpec object and check that the client packages do not match

* #66 Fix tests and update pom version

* #66 Update pom version

* #66 Update pom version

README.md

@@ -55,7 +55,7 @@ As commented above, they both could be used at the same time, setting a double
 <plugin>
   <groupId>net.coru</groupId>
   <artifactId>scs-multiapi-maven-plugin</artifactId>
-  <version>1.6.2</version>
+  <version>1.6.3</version>
   <executions>
     <execution>
       <id>asyncapi</id>
@@ -111,7 +111,7 @@ which the plugin is designed.
 <plugin>
 <groupId>net.coru</groupId>
 <artifactId>scs-multiapi-maven-plugin</artifactId>
-<version>1.6.2</version>
+<version>1.6.3</version>
 <executions>
   <execution>
     <phase>generate-sources</phase>
@@ -464,7 +464,7 @@ file. Here is an example of a basic configuration:
 <plugin>
   <groupId>net.coru</groupId>
   <artifactId>scs-multiapi-maven-plugin</artifactId>
-  <version>1.6.2</version>
+  <version>1.6.3</version>
   <executions>
     <execution>
         <goals>

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>net.coru</groupId>
   <artifactId>scs-multiapi-maven-plugin</artifactId>
-  <version>1.6.2</version>
+  <version>1.6.3</version>
   <packaging>maven-plugin</packaging>
 
   <name>AsyncApi - OpenApi Code Generator Maven Plugin</name>

src/main/java/net/coru/api/generator/plugin/OpenapiMultiFileMojo.java

@@ -61,9 +61,6 @@ public final class OpenapiMultiFileMojo extends AbstractMojo {
   @Parameter(property = "fileSpecs")
   private List<FileSpec> fileSpecs;
 
-  @Parameter(name = "clientPackage", property = "clientPackage")
-  private String clientPackage;
-
   @Parameter(name = "overwriteModel", property = "overwriteModel", defaultValue = "true")
   private Boolean overwriteModel;
 
@@ -82,7 +79,6 @@ public void execute() throws MojoExecutionException {
     templateFactory = new TemplateFactory();
     if (null != fileSpecs && !fileSpecs.isEmpty()) {
       processFileSpec(fileSpecs);
-      createClients();
     } else {
       throw new MojoExecutionException("Code generation failed. Not exists FileSpec configuration to generate package and class");
     }
@@ -97,7 +93,7 @@ private void processFileSpec(final List<FileSpec> fileSpecsList) throws MojoExec
         final String filePathToSave = processPath(fileSpec.getApiPackage(), false);
         project.addCompileSourceRoot(filePathToSave);
         processFile(fileSpec, filePathToSave);
-
+        createClients(fileSpec);
       } catch (final MojoExecutionException e) {
         getLog().error(e);
         throw new MojoExecutionException("Code generation failed. See above for the full exception.");
@@ -108,6 +104,7 @@ private void processFileSpec(final List<FileSpec> fileSpecsList) throws MojoExec
   private void processFile(final FileSpec fileSpec, final String filePathToSave) throws MojoExecutionException {
 
     final OpenAPI openAPI = OpenApiUtil.getPojoFromSwagger(fileSpec);
+    final String clientPackage = fileSpec.getClientPackage();
 
     if (fileSpec.getCallMode()) {
       templateFactory.setWebClientPackageName(StringUtils.isNotBlank(clientPackage) ? clientPackage : DEFAULT_OPENAPI_CLIENT_PACKAGE);
@@ -122,7 +119,8 @@ private void processFile(final FileSpec fileSpec, final String filePathToSave) t
 
   }
 
-  private void createClients() {
+  private void createClients(final FileSpec fileSpec) {
+    final String clientPackage = fileSpec.getClientPackage();
 
     if (isWebClient || isRestClient) {
       final String clientPath = processPath(StringUtils.isNotBlank(clientPackage) ? clientPackage : DEFAULT_OPENAPI_CLIENT_PACKAGE, false);
@@ -134,17 +132,18 @@ private void createClients() {
         if (isRestClient) {
           templateFactory.fillTemplateRestClient(clientPath);
         }
-        createAuthTemplates();
+        createAuthTemplates(fileSpec);
       } catch (IOException | TemplateException e) {
         e.printStackTrace();
       }
     }
   }
 
-  private void createAuthTemplates() throws TemplateException, IOException {
-
+  private void createAuthTemplates(final FileSpec fileSpec) throws TemplateException, IOException {
+    final String clientPackage = fileSpec.getClientPackage();
     final var authFileRoot = (StringUtils.isNotBlank(clientPackage) ? clientPackage : DEFAULT_OPENAPI_CLIENT_PACKAGE) + ".auth";
     final String authFileToSave = processPath(authFileRoot, false);
+
     templateFactory.setAuthPackageName(authFileRoot);
     templateFactory.fillTemplateAuth(authFileToSave, "Authentication");
 

src/main/java/net/coru/api/generator/plugin/openapi/parameter/FileSpec.java

@@ -27,6 +27,9 @@ public class FileSpec {
   @Parameter(name = "modelNameSuffix", property = "modelNameSuffix")
   private String modelNameSuffix;
 
+  @Parameter(name = "clientPackage", property = "clientPackage")
+  private String clientPackage;
+
   @Parameter(name = "callMode", property = "callMode")
   private Boolean callMode = false;
 

src/test/resources/net/coru/api/generator/openapi/integration/test/OpenApiGenerationTest/testClientPackageWebClientApiGeneration/pom.xml

@@ -44,10 +44,10 @@
               <inputSpec>api-test.yml</inputSpec>
               <apiPackage>net.coru.multifileplugin.testclientpackage</apiPackage>
               <modelPackage>net.coru.multifileplugin.testclientpackage.model</modelPackage>
+              <clientPackage>net.coru.multifileplugin.testclientpackage.client</clientPackage>
               <callMode>true</callMode>
             </fileSpec>
           </fileSpecs>
-          <clientPackage>net.coru.multifileplugin.testclientpackage.client</clientPackage>
         </configuration>
       </plugin>
     </plugins>