优化: 代码结构优化

master
曹世达 6 months ago
parent c5e34d2f54
commit d7751083b6

@ -12,15 +12,15 @@ import space.caoshd.otone.util.VelocityUtils;
import java.nio.file.Paths; 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 static final PropTools CONFIG = new PropTools(PathConsts.CONFIG_PROPERTIES_PATH);
private final OutputInfo outputInfo; private final OutputInfo outputInfo;
public OutputBuilder(OutputInfo outputInfo) { public SourceBuilder(OutputInfo outputInfo) {
this.outputInfo = outputInfo; this.outputInfo = outputInfo;
} }

@ -43,4 +43,5 @@ public class OutputInfo {
public void setNameSuffix(String nameSuffix) { public void setNameSuffix(String nameSuffix) {
this.nameSuffix = nameSuffix; this.nameSuffix = nameSuffix;
} }
} }

@ -14,8 +14,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
public class DBUtils { public class DBUtils {
private DBUtils() {}
private DBUtils() {}
public static Connection getConnection() { public static Connection getConnection() {
try { try {

@ -15,7 +15,7 @@ public class PathUtils {
} }
public static String getProjectName() { public static String getProjectName() {
return StrUtils.last(getProjectBasePath(), "/"); return StrUtils.getSuffix(getProjectBasePath(), "/");
} }
public static String getProjectPath(String moduleName) { public static String getProjectPath(String moduleName) {

@ -2,7 +2,6 @@ package space.caoshd.otone.util;
public class SqlConsts { public class SqlConsts {
public static final String TABLE_SQL = "table.sql"; 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.sql.schema";
public static final String TABLE_SQL_SCHEMA_TABLE = "table.sql.schema.table"; public static final String TABLE_SQL_SCHEMA_TABLE = "table.sql.schema.table";

@ -4,12 +4,12 @@ public class StrUtils {
private StrUtils() {} private StrUtils() {}
public static String last(String str, String regex) { public static String getSuffix(String str, String regex) {
String[] split = str.split(regex); String[] split = str.split(regex);
return split.length >= 1 ? split[split.length - 1] : ""; 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); String[] split = str.split(regex);
return split.length >= 1 ? split[0] : ""; 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) { public static String defaultIfBlank(String str, String defaultStr) {
if (str == null || str.trim().isEmpty()) { if (str == null || str.trim().isEmpty()) {
return defaultStr; return defaultStr;

@ -8,7 +8,7 @@ import space.caoshd.otone.util.PathUtils;
import java.util.List; import java.util.List;
class OutputBuilderTest { class SourceBuilderTest {
@Test @Test
void build() { void build() {
@ -38,7 +38,7 @@ class OutputBuilderTest {
voOutputInfo.setNameSuffix("View"); voOutputInfo.setNameSuffix("View");
voOutputInfo.setTemplatePath(PathConsts.VIEW_TEMPLATE_PATH); voOutputInfo.setTemplatePath(PathConsts.VIEW_TEMPLATE_PATH);
voOutputInfo.setPackagePath(PathUtils.getViewPackagePath()); voOutputInfo.setPackagePath(PathUtils.getViewPackagePath());
new OutputBuilder(voOutputInfo).build(); new SourceBuilder(voOutputInfo).build();
} }
Loading…
Cancel
Save