#67 Add clientPackage to FileSpec object and check that the client pa…

…ckages do not match
sngular · Jun 17, 2022 · 5b8924e · 5b8924e
1 parent 107e64d
commit 5b8924e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/README.md b/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.5.3</version>
+  <version>1.5.4</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.5.3</version>
+<version>1.5.4</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.5.3</version>
+  <version>1.5.4</version>
   <executions>
     <execution>
         <goals>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>net.coru</groupId>
   <artifactId>scs-multiapi-maven-plugin</artifactId>
-  <version>1.5.3</version>
+  <version>1.5.4</version>
   <packaging>maven-plugin</packaging>
 
   <name>AsyncApi - OpenApi Code Generator Maven Plugin</name>

diff --git a/src/main/java/net/coru/api/generator/plugin/OpenapiMultiFileMojo.java b/src/main/java/net/coru/api/generator/plugin/OpenapiMultiFileMojo.java
@@ -63,9 +63,6 @@ public class OpenapiMultiFileMojo extends AbstractMojo {
   @Parameter(property = "fileSpecs")
   public List<FileSpec> fileSpecs;
 
-  @Parameter(name = "clientPackage", property = "clientPackage")
-  private String clientPackage;
-
   @Parameter(name = "overwriteModel", property = "overwriteModel", defaultValue = "true")
   private Boolean overwriteModel;
 
@@ -84,7 +81,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");
     }
@@ -99,7 +95,7 @@ private void processFileSpec(List<FileSpec> fileSpecsList) throws MojoExecutionE
         String filePathToSave = processPath(fileSpec.getApiPackage(), false);
         project.addCompileSourceRoot(filePathToSave);
         processFile(fileSpec, filePathToSave);
-
+        createClients(fileSpec);
       } catch (Exception e) {
         getLog().error(e);
         throw new MojoExecutionException("Code generation failed. See above for the full exception.");
@@ -112,12 +108,13 @@ private void processFile(FileSpec fileSpec, String filePathToSave) throws MojoEx
     try {
 
       OpenAPI openAPI = OpenApiUtil.getPojoFromSwagger(fileSpec);
+      String clientPackage = fileSpec.getClientPackage();
 
       if (fileSpec.getCallMode()) {
         templateFactory.setWebClientPackageName(StringUtils.isNotBlank(clientPackage) ? clientPackage : DEFAULT_OPENAPI_CLIENT_PACKAGE);
         templateFactory.setAuthPackageName((StringUtils.isNotBlank(clientPackage) ? clientPackage : DEFAULT_OPENAPI_CLIENT_PACKAGE) + ".auth");
         isWebClient = fileSpec.getIsReactive();
-        isRestClient = fileSpec.getIsReactive() ? false : true;
+        isRestClient = !fileSpec.getIsReactive();
       }
 
       createApiTemplate(fileSpec, filePathToSave, openAPI);
@@ -131,7 +128,8 @@ private void processFile(FileSpec fileSpec, String filePathToSave) throws MojoEx
 
   }
 
-  private void createClients() {
+  private void createClients(final FileSpec fileSpec) {
+    String clientPackage = fileSpec.getClientPackage();
 
     if (isWebClient || isRestClient) {
       String clientPath = processPath(StringUtils.isNotBlank(clientPackage) ? clientPackage : DEFAULT_OPENAPI_CLIENT_PACKAGE, false);
@@ -145,15 +143,16 @@ private void createClients() {
           templateFactory.fillTemplateRestClient(clientPath);
         }
 
-        createAuthTemplates();
+        createAuthTemplates(fileSpec);
       } catch (Exception e) {
         e.printStackTrace();
       }
 
     }
   }
 
-  private void createAuthTemplates() throws TemplateException, IOException {
+  private void createAuthTemplates(final FileSpec fileSpec) throws TemplateException, IOException {
+    String clientPackage = fileSpec.getClientPackage();
 
     var authFileRoot = (StringUtils.isNotBlank(clientPackage) ? clientPackage : DEFAULT_OPENAPI_CLIENT_PACKAGE) + ".auth";
     String authFileToSave = processPath(authFileRoot, false);

diff --git a/src/main/java/net/coru/api/generator/plugin/openapi/parameter/FileSpec.java b/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;
 

diff --git a/src/main/java/net/coru/api/generator/plugin/openapi/template/TemplateFactory.java b/src/main/java/net/coru/api/generator/plugin/openapi/template/TemplateFactory.java
@@ -18,12 +18,15 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import net.coru.api.generator.plugin.exception.SCSMultiApiMavenPluginException;
 import net.coru.api.generator.plugin.openapi.parameter.FileSpec;
 import net.coru.api.generator.plugin.openapi.model.AuthObject;
 import net.coru.api.generator.plugin.openapi.model.PathObject;
@@ -120,9 +123,13 @@ public void fillTemplate(
   private void writeTemplateToFile(String templateName, Map<String, Object> root, String path) throws IOException, TemplateException {
     Template template = cfg.getTemplate(templateName);
 
-    FileWriter writer = new FileWriter(path);
-    template.process(root, writer);
-    writer.close();
+    if (!Files.exists(Path.of(path))) {
+      FileWriter writer = new FileWriter(path);
+      template.process(root, writer);
+      writer.close();
+    } else {
+      throw new SCSMultiApiMavenPluginException("The fileSpecs packets cannot be the same.");
+    }
   }
 
   public void setPackageName(String packageName) {