diff --git a/src/main/java/space/caoshd/otone/builder/OutputBuilder.java b/src/main/java/space/caoshd/otone/builder/SourceBuilder.java similarity index 95% rename from src/main/java/space/caoshd/otone/builder/OutputBuilder.java rename to src/main/java/space/caoshd/otone/builder/SourceBuilder.java index 28511e7..79c8eab 100644 --- a/src/main/java/space/caoshd/otone/builder/OutputBuilder.java +++ b/src/main/java/space/caoshd/otone/builder/SourceBuilder.java @@ -12,15 +12,15 @@ import space.caoshd.otone.util.VelocityUtils; import java.nio.file.Paths; -public class OutputBuilder { +public class SourceBuilder { - private static final Logger LOGGER = LoggerFactory.getLogger(OutputBuilder.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SourceBuilder.class); private static final PropTools CONFIG = new PropTools(PathConsts.CONFIG_PROPERTIES_PATH); private final OutputInfo outputInfo; - public OutputBuilder(OutputInfo outputInfo) { + public SourceBuilder(OutputInfo outputInfo) { this.outputInfo = outputInfo; } diff --git a/src/main/java/space/caoshd/otone/entity/OutputInfo.java b/src/main/java/space/caoshd/otone/entity/OutputInfo.java index 659f590..a6c8e10 100644 --- a/src/main/java/space/caoshd/otone/entity/OutputInfo.java +++ b/src/main/java/space/caoshd/otone/entity/OutputInfo.java @@ -43,4 +43,5 @@ public class OutputInfo { public void setNameSuffix(String nameSuffix) { this.nameSuffix = nameSuffix; } + } diff --git a/src/main/java/space/caoshd/otone/util/DBUtils.java b/src/main/java/space/caoshd/otone/util/DBUtils.java index 4c3a741..b97c99d 100644 --- a/src/main/java/space/caoshd/otone/util/DBUtils.java +++ b/src/main/java/space/caoshd/otone/util/DBUtils.java @@ -14,8 +14,8 @@ import java.util.List; import java.util.Map; public class DBUtils { - private DBUtils() {} + private DBUtils() {} public static Connection getConnection() { try { diff --git a/src/main/java/space/caoshd/otone/util/PathUtils.java b/src/main/java/space/caoshd/otone/util/PathUtils.java index 8d010d1..f73327d 100644 --- a/src/main/java/space/caoshd/otone/util/PathUtils.java +++ b/src/main/java/space/caoshd/otone/util/PathUtils.java @@ -15,7 +15,7 @@ public class PathUtils { } public static String getProjectName() { - return StrUtils.last(getProjectBasePath(), "/"); + return StrUtils.getSuffix(getProjectBasePath(), "/"); } public static String getProjectPath(String moduleName) { diff --git a/src/main/java/space/caoshd/otone/util/SqlConsts.java b/src/main/java/space/caoshd/otone/util/SqlConsts.java index e0878c7..76a6f9c 100644 --- a/src/main/java/space/caoshd/otone/util/SqlConsts.java +++ b/src/main/java/space/caoshd/otone/util/SqlConsts.java @@ -1,8 +1,7 @@ package space.caoshd.otone.util; public class SqlConsts { - - + public static final String TABLE_SQL = "table.sql"; public static final String TABLE_SQL_SCHEMA = "table.sql.schema"; public static final String TABLE_SQL_SCHEMA_TABLE = "table.sql.schema.table"; diff --git a/src/main/java/space/caoshd/otone/util/StrUtils.java b/src/main/java/space/caoshd/otone/util/StrUtils.java index 263c207..6a03c39 100644 --- a/src/main/java/space/caoshd/otone/util/StrUtils.java +++ b/src/main/java/space/caoshd/otone/util/StrUtils.java @@ -4,12 +4,12 @@ public class StrUtils { private StrUtils() {} - public static String last(String str, String regex) { + public static String getSuffix(String str, String regex) { String[] split = str.split(regex); return split.length >= 1 ? split[split.length - 1] : ""; } - public static String first(String str, String regex) { + public static String getPrefix(String str, String regex) { String[] split = str.split(regex); return split.length >= 1 ? split[0] : ""; } @@ -22,6 +22,14 @@ public class StrUtils { } } + public static String removeSuffix(String str, String suffix) { + if (str.endsWith(suffix)) { + return str.substring(0, str.length() - suffix.length()); + } else { + return str; + } + } + public static String defaultIfBlank(String str, String defaultStr) { if (str == null || str.trim().isEmpty()) { return defaultStr; diff --git a/src/test/java/space/caoshd/otone/builder/OutputBuilderTest.java b/src/test/java/space/caoshd/otone/builder/SourceBuilderTest.java similarity index 95% rename from src/test/java/space/caoshd/otone/builder/OutputBuilderTest.java rename to src/test/java/space/caoshd/otone/builder/SourceBuilderTest.java index 0a40229..5136a92 100644 --- a/src/test/java/space/caoshd/otone/builder/OutputBuilderTest.java +++ b/src/test/java/space/caoshd/otone/builder/SourceBuilderTest.java @@ -8,7 +8,7 @@ import space.caoshd.otone.util.PathUtils; import java.util.List; -class OutputBuilderTest { +class SourceBuilderTest { @Test void build() { @@ -38,7 +38,7 @@ class OutputBuilderTest { voOutputInfo.setNameSuffix("View"); voOutputInfo.setTemplatePath(PathConsts.VIEW_TEMPLATE_PATH); voOutputInfo.setPackagePath(PathUtils.getViewPackagePath()); - new OutputBuilder(voOutputInfo).build(); + new SourceBuilder(voOutputInfo).build(); }