From 7ff10ecc935d5fa444df87808447856b529805f5 Mon Sep 17 00:00:00 2001 From: schegolevalex Date: Wed, 7 Jun 2023 19:29:03 +0300 Subject: [PATCH 1/5] fix repositories paths --- .attach_pid33921 | 0 .attach_pid34172 | 0 .../cmeza/sdgenerator/SDGeneratorManager.java | 12 ---------- .../cmeza/sdgenerator/plugin/CommonsMojo.java | 7 +++--- .../sdgenerator/plugin/SDRepositoryMojo.java | 9 +++++++- .../support/ManagerTemplateSupport.java | 2 +- .../sdgenerator/util/GeneratorUtils.java | 22 ++++++++++--------- 7 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 .attach_pid33921 create mode 100644 .attach_pid34172 diff --git a/.attach_pid33921 b/.attach_pid33921 new file mode 100644 index 0000000..e69de29 diff --git a/.attach_pid34172 b/.attach_pid34172 new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmeza/sdgenerator/SDGeneratorManager.java b/src/main/java/com/cmeza/sdgenerator/SDGeneratorManager.java index 4ca72d6..aef8210 100644 --- a/src/main/java/com/cmeza/sdgenerator/SDGeneratorManager.java +++ b/src/main/java/com/cmeza/sdgenerator/SDGeneratorManager.java @@ -7,27 +7,19 @@ import com.cmeza.sdgenerator.util.GeneratorUtils; import com.cmeza.sdgenerator.util.SDLogger; import com.google.common.collect.Iterables; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; import org.springframework.context.EnvironmentAware; import org.springframework.context.ResourceLoaderAware; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.env.Environment; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.ResourceLoader; import org.springframework.core.type.AnnotationMetadata; import org.springframework.util.Assert; import java.util.Collection; import java.util.LinkedHashSet; -import java.util.Map; import java.util.Set; /** @@ -73,10 +65,6 @@ public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanD Collection candidates = configurationSource.getCandidates(resourceLoader); String absolutePath = GeneratorUtils.getAbsolutePath(); - if (absolutePath == null) { - SDLogger.addError("Could not define the absolute path!"); - return; - } if (!repositoryPackage.isEmpty()){ diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java index fb930c1..9cc4ea7 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java @@ -1,8 +1,9 @@ package com.cmeza.sdgenerator.plugin; -import com.cmeza.sdgenerator.util.*; +import com.cmeza.sdgenerator.util.Constants; +import com.cmeza.sdgenerator.util.SDLogger; +import com.cmeza.sdgenerator.util.SDMojoException; import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; @@ -44,7 +45,7 @@ public abstract class CommonsMojo extends AbstractMojo { @Parameter(name = Constants.EXTENDS) protected String[] additionalExtends; - @Component + @Parameter(defaultValue = "${project}", readonly = true) protected MavenProject project; protected Set additionalExtendsList = new LinkedHashSet<>(); diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java index 45a6316..f8bdbda 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java @@ -5,9 +5,12 @@ import com.cmeza.sdgenerator.util.*; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugins.annotations.*; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.project.MavenProject; +import java.io.IOException; import java.util.Set; /** @@ -29,8 +32,12 @@ public void execute() throws MojoExecutionException, MojoFailureException { this.validateField(Constants.EXTENDS); try { + GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath()); this.executeInternalMojo(project, repositoryPostfix, overwrite, repositoryPackage, entityPackage, onlyAnnotations, additionalExtendsList, withComments); SDLogger.printGeneratedTables(true); + } catch (IOException e) { + SDLogger.addError("Could not define the absolute path!"); + throw new SDMojoException(); } catch (Exception e) { SDLogger.addError(e.getMessage()); throw new SDMojoException(e.getMessage(), e); diff --git a/src/main/java/com/cmeza/sdgenerator/support/ManagerTemplateSupport.java b/src/main/java/com/cmeza/sdgenerator/support/ManagerTemplateSupport.java index 4730ea4..97b144a 100644 --- a/src/main/java/com/cmeza/sdgenerator/support/ManagerTemplateSupport.java +++ b/src/main/java/com/cmeza/sdgenerator/support/ManagerTemplateSupport.java @@ -40,7 +40,7 @@ public ManagerTemplateSupport(CustomResourceLoader customResourceLoader, boolean } private void findFilterRepositories() { - String repositoryPath = GeneratorUtils.getAbsolutePath() + repositoryPackage.replace(".", "/"); + String repositoryPath = GeneratorUtils.getAbsolutePath(repositoryPackage); File[] repositoryFiles = GeneratorUtils.getFileList(repositoryPath, repositoryPostfix); this.setIncludeFilter(Arrays.asList(repositoryFiles)); this.setIncludeFilterPostfix(repositoryPostfix); diff --git a/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java b/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java index 1a69a2e..92cd6a2 100644 --- a/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java +++ b/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java @@ -16,20 +16,14 @@ public class GeneratorUtils { private GeneratorUtils() { } + private static String baseDir; + public static String getAbsolutePath(){ - try { - return new File(".").getCanonicalPath() + "/src/main/java/"; - } catch (IOException e) { - return null; - } + return baseDir + "/src/main/java/"; } public static String getAbsolutePath(String strPackage){ - String absolute = getAbsolutePath(); - if (absolute == null) { - return null; - } - return absolute + strPackage.replace(".", "/"); + return getAbsolutePath() + strPackage.replace(".", "/"); } public static boolean verifyPackage(String stringPath){ @@ -82,4 +76,12 @@ private static void findFiles(String directoryName, List files, String pre } } } + + public static String getBaseDir() { + return baseDir; + } + + public static void setBaseDir(String baseDir) { + GeneratorUtils.baseDir = baseDir; + } } From 465dd7d52df191ef62d1c283c07d0b27d2aae1b4 Mon Sep 17 00:00:00 2001 From: schegolevalex Date: Wed, 7 Jun 2023 22:31:06 +0300 Subject: [PATCH 2/5] fix managers paths --- .../java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java index eb0590b..7185033 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java @@ -8,6 +8,8 @@ import org.apache.maven.plugins.annotations.*; import org.apache.maven.project.MavenProject; +import java.io.IOException; + /** * Created by carlos on 22/04/17. */ @@ -26,10 +28,14 @@ public void execute() throws MojoExecutionException, MojoFailureException { this.validateField(Constants.REPOSITORY_PACKAGE); try { + GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath()); this.executeInternalMojo(project, managerPostfix, repositoryPackage, repositoryPostfix, overwrite, managerPackage, entityPackage, onlyAnnotations, lombokAnnotations, withComments); SDLogger.printGeneratedTables(true); + } catch (IOException e) { + SDLogger.addError("Could not define the absolute path!"); + throw new SDMojoException(); } catch (Exception e) { SDLogger.addError(e.getMessage()); throw new SDMojoException(e.getMessage(), e); From 92e5624d665d410a198659993320f6e58054817d Mon Sep 17 00:00:00 2001 From: schegolevalex Date: Wed, 7 Jun 2023 22:32:52 +0300 Subject: [PATCH 3/5] fix allMojo paths --- src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java index cc27cdb..6bc2629 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java @@ -7,6 +7,8 @@ import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; +import java.io.IOException; + /** * Created by carlos on 25/04/22. */ @@ -25,6 +27,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { this.validateField(Constants.EXTENDS); try { + GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath()); SDRepositoryMojo sdRepositoryMojo = new SDRepositoryMojo(); sdRepositoryMojo.executeInternalMojo(project, repositoryPostfix, overwrite, repositoryPackage, entityPackage, onlyAnnotations, additionalExtendsList, withComments); @@ -32,6 +35,9 @@ public void execute() throws MojoExecutionException, MojoFailureException { sdManagerMojo.executeInternalMojo(project, managerPostfix, repositoryPackage, repositoryPostfix, overwrite, managerPackage, entityPackage, onlyAnnotations, lombokAnnotations, withComments); SDLogger.printGeneratedTables(true); + } catch (IOException e) { + SDLogger.addError("Could not define the absolute path!"); + throw new SDMojoException(); } catch (Exception e) { SDLogger.addError(e.getMessage()); throw new SDMojoException(e.getMessage(), e); From d36a907a364b9c021f2e66d1368f6ea5c08adb3f Mon Sep 17 00:00:00 2001 From: schegolevalex Date: Thu, 8 Jun 2023 18:24:53 +0300 Subject: [PATCH 4/5] add generateDirectory option --- src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java | 3 +++ src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java | 2 +- src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java | 2 +- .../java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java | 3 ++- src/main/java/com/cmeza/sdgenerator/util/Constants.java | 1 + src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java index 9cc4ea7..0b19784 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java @@ -45,6 +45,9 @@ public abstract class CommonsMojo extends AbstractMojo { @Parameter(name = Constants.EXTENDS) protected String[] additionalExtends; + @Parameter(name = Constants.GENERATE_DIRECTORY, defaultValue = "/generated-sources") + protected String generateDirectory; + @Parameter(defaultValue = "${project}", readonly = true) protected MavenProject project; diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java index 6bc2629..f05adf1 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java @@ -27,7 +27,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { this.validateField(Constants.EXTENDS); try { - GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath()); + GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath() + Constants.GENERATE_DIRECTORY); SDRepositoryMojo sdRepositoryMojo = new SDRepositoryMojo(); sdRepositoryMojo.executeInternalMojo(project, repositoryPostfix, overwrite, repositoryPackage, entityPackage, onlyAnnotations, additionalExtendsList, withComments); diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java index 7185033..c0f8483 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java @@ -28,7 +28,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { this.validateField(Constants.REPOSITORY_PACKAGE); try { - GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath()); + GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath() + Constants.GENERATE_DIRECTORY); this.executeInternalMojo(project, managerPostfix, repositoryPackage, repositoryPostfix, overwrite, managerPackage, entityPackage, onlyAnnotations, lombokAnnotations, withComments); SDLogger.printGeneratedTables(true); diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java index f8bdbda..216c9fe 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java @@ -32,7 +32,8 @@ public void execute() throws MojoExecutionException, MojoFailureException { this.validateField(Constants.EXTENDS); try { - GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath()); + + GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath() + Constants.GENERATE_DIRECTORY); this.executeInternalMojo(project, repositoryPostfix, overwrite, repositoryPackage, entityPackage, onlyAnnotations, additionalExtendsList, withComments); SDLogger.printGeneratedTables(true); } catch (IOException e) { diff --git a/src/main/java/com/cmeza/sdgenerator/util/Constants.java b/src/main/java/com/cmeza/sdgenerator/util/Constants.java index a084056..e42076b 100644 --- a/src/main/java/com/cmeza/sdgenerator/util/Constants.java +++ b/src/main/java/com/cmeza/sdgenerator/util/Constants.java @@ -15,6 +15,7 @@ public class Constants { public static final String EXTENDS = "additional-extends"; public static final String LOMBOK_ANOTATIONS = "lombok-annotations"; public static final String WITH_COMMENTS = "with-comments"; + public static final String GENERATE_DIRECTORY = "generate-directory"; public static final String PROJECT_NAME = "Spring Data Generator"; diff --git a/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java b/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java index 92cd6a2..9512567 100644 --- a/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java +++ b/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java @@ -19,7 +19,7 @@ private GeneratorUtils() { private static String baseDir; public static String getAbsolutePath(){ - return baseDir + "/src/main/java/"; + return getBaseDir(); } public static String getAbsolutePath(String strPackage){ From 358e6e7e5bd178467b6173c30850b1bcd1e1bab3 Mon Sep 17 00:00:00 2001 From: schegolevalex Date: Thu, 8 Jun 2023 22:47:50 +0300 Subject: [PATCH 5/5] add generateDirectory option dev --- .../com/cmeza/sdgenerator/plugin/CommonsMojo.java | 2 +- .../java/com/cmeza/sdgenerator/plugin/SDAllMojo.java | 12 +++++------- .../com/cmeza/sdgenerator/plugin/SDManagerMojo.java | 11 ++++------- .../cmeza/sdgenerator/plugin/SDRepositoryMojo.java | 7 +------ .../com/cmeza/sdgenerator/util/GeneratorUtils.java | 6 +++++- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java index 0b19784..fddb318 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/CommonsMojo.java @@ -45,7 +45,7 @@ public abstract class CommonsMojo extends AbstractMojo { @Parameter(name = Constants.EXTENDS) protected String[] additionalExtends; - @Parameter(name = Constants.GENERATE_DIRECTORY, defaultValue = "/generated-sources") + @Parameter(name = Constants.GENERATE_DIRECTORY, defaultValue = "/${project.build.directory}/generated-sources/") protected String generateDirectory; @Parameter(defaultValue = "${project}", readonly = true) diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java index f05adf1..08c47a9 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/SDAllMojo.java @@ -1,14 +1,15 @@ package com.cmeza.sdgenerator.plugin; -import com.cmeza.sdgenerator.util.*; +import com.cmeza.sdgenerator.util.Constants; +import com.cmeza.sdgenerator.util.GeneratorUtils; +import com.cmeza.sdgenerator.util.SDLogger; +import com.cmeza.sdgenerator.util.SDMojoException; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Execute; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; -import java.io.IOException; - /** * Created by carlos on 25/04/22. */ @@ -27,7 +28,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { this.validateField(Constants.EXTENDS); try { - GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath() + Constants.GENERATE_DIRECTORY); + GeneratorUtils.setBaseDir(generateDirectory); SDRepositoryMojo sdRepositoryMojo = new SDRepositoryMojo(); sdRepositoryMojo.executeInternalMojo(project, repositoryPostfix, overwrite, repositoryPackage, entityPackage, onlyAnnotations, additionalExtendsList, withComments); @@ -35,9 +36,6 @@ public void execute() throws MojoExecutionException, MojoFailureException { sdManagerMojo.executeInternalMojo(project, managerPostfix, repositoryPackage, repositoryPostfix, overwrite, managerPackage, entityPackage, onlyAnnotations, lombokAnnotations, withComments); SDLogger.printGeneratedTables(true); - } catch (IOException e) { - SDLogger.addError("Could not define the absolute path!"); - throw new SDMojoException(); } catch (Exception e) { SDLogger.addError(e.getMessage()); throw new SDMojoException(e.getMessage(), e); diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java index c0f8483..759b31f 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/SDManagerMojo.java @@ -5,11 +5,11 @@ import com.cmeza.sdgenerator.util.*; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugins.annotations.*; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.project.MavenProject; -import java.io.IOException; - /** * Created by carlos on 22/04/17. */ @@ -28,14 +28,11 @@ public void execute() throws MojoExecutionException, MojoFailureException { this.validateField(Constants.REPOSITORY_PACKAGE); try { - GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath() + Constants.GENERATE_DIRECTORY); + GeneratorUtils.setBaseDir(generateDirectory); this.executeInternalMojo(project, managerPostfix, repositoryPackage, repositoryPostfix, overwrite, managerPackage, entityPackage, onlyAnnotations, lombokAnnotations, withComments); SDLogger.printGeneratedTables(true); - } catch (IOException e) { - SDLogger.addError("Could not define the absolute path!"); - throw new SDMojoException(); } catch (Exception e) { SDLogger.addError(e.getMessage()); throw new SDMojoException(e.getMessage(), e); diff --git a/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java b/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java index 216c9fe..af4c318 100644 --- a/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java +++ b/src/main/java/com/cmeza/sdgenerator/plugin/SDRepositoryMojo.java @@ -10,7 +10,6 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.project.MavenProject; -import java.io.IOException; import java.util.Set; /** @@ -32,13 +31,9 @@ public void execute() throws MojoExecutionException, MojoFailureException { this.validateField(Constants.EXTENDS); try { - - GeneratorUtils.setBaseDir(project.getBasedir().getCanonicalPath() + Constants.GENERATE_DIRECTORY); + GeneratorUtils.setBaseDir(generateDirectory); this.executeInternalMojo(project, repositoryPostfix, overwrite, repositoryPackage, entityPackage, onlyAnnotations, additionalExtendsList, withComments); SDLogger.printGeneratedTables(true); - } catch (IOException e) { - SDLogger.addError("Could not define the absolute path!"); - throw new SDMojoException(); } catch (Exception e) { SDLogger.addError(e.getMessage()); throw new SDMojoException(e.getMessage(), e); diff --git a/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java b/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java index 9512567..ab9a68f 100644 --- a/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java +++ b/src/main/java/com/cmeza/sdgenerator/util/GeneratorUtils.java @@ -82,6 +82,10 @@ public static String getBaseDir() { } public static void setBaseDir(String baseDir) { - GeneratorUtils.baseDir = baseDir; + if (baseDir.endsWith("/")) { + GeneratorUtils.baseDir = baseDir; + } else { + GeneratorUtils.baseDir = baseDir + "/"; + } } }