代码优化

杨利兵 · 杨利兵 · commit 8c475ef309fc · 2020-05-31T09:56:36.000+08:00
diff --git a/message.xlsx b/message.xlsx
diff --git a/src/main/java/com/yanglb/codegen/core/GenFactory.java b/src/main/java/com/yanglb/codegen/core/GenFactory.java
@@ -16,6 +16,7 @@
 package com.yanglb.codegen.core;
 
 import com.yanglb.codegen.exceptions.CodeGenException;
+import com.yanglb.codegen.utils.ObjectUtil;
 import com.yanglb.codegen.utils.Resources;
 
 public class GenFactory<T> {
@@ -41,9 +42,9 @@ public static <T> T createByName(String className) throws CodeGenException {
 
 	private T create(String implName)
 			throws InstantiationException, IllegalAccessException, ClassNotFoundException  {
-		T instance = null;
 		if (implName.startsWith(".")) implName = "com.yanglb.codegen" + implName;
-		instance = (T) Class.forName(implName).newInstance();
-		return instance;
+
+		Object instance = Class.forName(implName).newInstance();
+		return ObjectUtil.cast(instance);
 	}
 }
diff --git a/src/main/java/com/yanglb/codegen/core/parser/BaseParser.java b/src/main/java/com/yanglb/codegen/core/parser/BaseParser.java
@@ -152,7 +152,7 @@ public ParamaModel parsing() {
             file = as[1];
 
             // 检查参数是否正确
-            if (Conf.supportCommands().indexOf(cmd) < 0) {
+            if (!Conf.supportCommands().contains(cmd)) {
                 throw new IllegalArgumentException(String.format("未知命令: %s，请使用 --help 命令查看用法。", cmd));
             }
             File f = new File(file);
diff --git a/src/main/java/com/yanglb/codegen/core/reader/BaseReader.java b/src/main/java/com/yanglb/codegen/core/reader/BaseReader.java
@@ -172,10 +172,7 @@ private void doReader() throws CodeGenException {
 	 * @return
 	 */
 	private boolean isReadable(String sheetName) {
-		if(sheetName.equals("说明") || sheetName.startsWith("#")) {
-			return false;
-		}
-		return true;
+		return !sheetName.equals("说明") && !sheetName.startsWith("#");
 	}
 	
 	/**
diff --git a/src/main/java/com/yanglb/codegen/core/reader/IReader.java b/src/main/java/com/yanglb/codegen/core/reader/IReader.java
@@ -26,7 +26,7 @@ public interface IReader<T> {
 	 * @return
 	 * @throws CodeGenException 
 	 */
-	public List<T> reader(String excelFile) throws CodeGenException;
+	List<T> reader(String excelFile) throws CodeGenException;
 	
 	/**
 	 * 读取Excel中指定的几个Sheet
@@ -35,7 +35,7 @@ public interface IReader<T> {
 	 * @return
 	 * @throws CodeGenException 
 	 */
-	public List<T> reader(String excelFile, String[] sheets) throws CodeGenException;
+	List<T> reader(String excelFile, String[] sheets) throws CodeGenException;
 	
 	/**
 	 * 读取Excel中指定的一个Sheet
@@ -44,41 +44,12 @@ public interface IReader<T> {
 	 * @return
 	 * @throws CodeGenException 
 	 */
-	public T reader(String excelFile, String sheet) throws CodeGenException;
-	
-//	/**
-//	 * 子类必须实现
-//	 * @param sheet
-//	 * @return
-//	 * @throws UnImplementException 
-//	 * @throws CodeGenException 
-//	 */
-//	protected T onReader(XSSFSheet sheet) throws UnImplementException, CodeGenException;
-//	
-//	/**
-//	 * 进行读取
-//	 * @throws CodeGenException 
-//	 */
-//	private void doReader() throws CodeGenException;
-//	
-//	/**
-//	 * 检查特定的Sheet名是否可读
-//	 * @param sheetName
-//	 * @return
-//	 */
-//	private boolean isReadable(String sheetName);
-	
-//	/**
-//	 * 取得Cell的字符串数据，当不是字符串时进行转换
-//	 * @param cell
-//	 * @return
-//	 */
-//	public String getCellStringValue(XSSFCell cell);
-	
+	T reader(String excelFile, String sheet) throws CodeGenException;
+
 	/**
 	 * 设置开始位置
 	 * @param startRowNo 开始行
 	 * @param startColNo 开始列
 	 */
-	public void setStartPoint(int startRowNo, int startColNo);
+	void setStartPoint(int startRowNo, int startColNo);
 }
diff --git a/src/main/java/com/yanglb/codegen/core/reader/ISettingReader.java b/src/main/java/com/yanglb/codegen/core/reader/ISettingReader.java
@@ -26,21 +26,21 @@ public interface ISettingReader extends IReader<HashMap<String, String>> {
 	 * @return
 	 * @throws CodeGenException
 	 */
-	public HashMap<String, String> settingReader() throws CodeGenException;
+	HashMap<String, String> settingReader() throws CodeGenException;
 	
 	/**
 	 * 读取一个配置项目（会将Infos内容添加到结果集中，且属性添加generator前缀）
 	 * @param settingSheet
 	 * @return
 	 * @throws CodeGenException
 	 */
-	public HashMap<String, String> settingReader(String settingSheet) throws CodeGenException;
+	HashMap<String, String> settingReader(String settingSheet) throws CodeGenException;
 	
 	/**
 	 * 读取多个配置项目（会将Infos内容添加到结果集中，且属性添加generator前缀）
 	 * @param settingSheets
 	 * @return
 	 * @throws CodeGenException
 	 */
-	public HashMap<String, String> settingReader(String[] settingSheets) throws CodeGenException;
+	HashMap<String, String> settingReader(String[] settingSheets) throws CodeGenException;
 }
diff --git a/src/main/java/com/yanglb/codegen/core/reader/ITableReader.java b/src/main/java/com/yanglb/codegen/core/reader/ITableReader.java
@@ -32,5 +32,5 @@ public interface ITableReader extends IReader<TableModel> {
 	 * @return
 	 * @throws CodeGenException 
 	 */
-	public TableModel reader(XSSFSheet sheet) throws CodeGenException;
+	TableModel reader(XSSFSheet sheet) throws CodeGenException;
 }
diff --git a/src/main/java/com/yanglb/codegen/core/translator/BaseDdlTranslator.java b/src/main/java/com/yanglb/codegen/core/translator/BaseDdlTranslator.java
@@ -28,7 +28,7 @@
 
 public class BaseDdlTranslator extends BaseSqlTranslator<DdlModel> {
 	// 外键关系列表
-	protected List<ForeignModel> foreignKeyList = new ArrayList<ForeignModel>();
+	protected final List<ForeignModel> foreignKeyList = new ArrayList<>();
 	
 	@Override
 	protected void onBeforeTranslate() throws CodeGenException {
diff --git a/src/main/java/com/yanglb/codegen/core/translator/BaseTranslator.java b/src/main/java/com/yanglb/codegen/core/translator/BaseTranslator.java
@@ -28,7 +28,7 @@
 
 public class BaseTranslator<T> implements ITranslator<T> {
 	protected T model;
-	protected WritableModel writableModel;
+	protected final WritableModel writableModel;
 	protected HashMap<String, String> settingMap;
 	protected ParamaModel paramaModel;
 	
@@ -89,52 +89,4 @@ private void doTranslate() throws CodeGenException{
 		this.onTranslate();
 		this.onAfterTranslate();
 	}
-	
-	/**
-	 * 模板替换
-	 * @param template 模板内容
-	 * @param replaceModel 
-	 * @return
-	 * @throws CodeGenException
-	 */
-	protected String replaceFlags(String template, Object replaceModel) throws CodeGenException {
-		List<String> flags = StringUtil.findFlags(template);
-		String data = new String(template);
-		for(String key:flags) {
-			// Map元素
-			String value = null;
-			boolean hasKey = false;
-			if(this.settingMap.containsKey(key)) {
-				hasKey = true;
-				value = this.settingMap.get(key);
-			} else if(replaceModel != null) {
-				// Model元素
-				Field field = null;
-				hasKey = true;
-				// 在replaceModel查找key属性，如果有则使用该属性值。
-				try {
-					field = ObjectUtil.getDeepField(replaceModel.getClass(), key);
-					field.setAccessible(true);
-					if(field.get(replaceModel) != null) {
-						value = field.get(replaceModel).toString();
-					}
-				} catch (NoSuchFieldException e) {
-					// 没有此属性
-					hasKey = false;
-				} catch (Exception e) {
-					throw new CodeGenException(String.format(Resources.getString("E_006"),
-							replaceModel.getClass().toString(),
-							field.getName(),
-							e.getMessage()));
-				}
-			}
-			
-			// 如果有值则替换
-			if(hasKey) {
-				String f = String.format("\\$\\{%s\\}", key);
-				data = data.replaceAll(f, value);
-			}
-		}
-		return data;
-	}
 }
diff --git a/src/main/java/com/yanglb/codegen/core/translator/ITranslator.java b/src/main/java/com/yanglb/codegen/core/translator/ITranslator.java
@@ -30,7 +30,7 @@ public interface ITranslator<T> {
 	 * @return WritableModel 一个可写的Model
 	 * @throws CodeGenException 翻译出错时抛出此异常
 	 */
-	public WritableModel translate(HashMap<String, String> settingMap, ParamaModel paramaModel, T model) throws CodeGenException;
+    WritableModel translate(HashMap<String, String> settingMap, ParamaModel paramaModel, T model) throws CodeGenException;
 	
 //	/**
 //	 * 预翻译器（子类如果重写，则必须显示调用超类的此方法）
diff --git a/src/main/java/com/yanglb/codegen/core/translator/impl/DdlMysqlTranslatorImpl.java b/src/main/java/com/yanglb/codegen/core/translator/impl/DdlMysqlTranslatorImpl.java
@@ -200,9 +200,8 @@ private String indexUniqueSql(List<DdlDetail> list, boolean isIndex) {
 		// 名字加后缀
 		name += isIndex ? "INDEX":"UNIQUE";
 		sb.deleteCharAt(sb.lastIndexOf(","));
-		
-		String result = String.format("%s %s(%s)", isIndex ? "INDEX":"UNIQUE INDEX", name, sb.toString());
-		return result;
+
+		return String.format("%s %s(%s)", isIndex ? "INDEX":"UNIQUE INDEX", name, sb.toString());
 	}
 
 	private String genDdlDetail(DdlDetail detail) {
diff --git a/src/main/java/com/yanglb/codegen/core/writer/IWriter.java b/src/main/java/com/yanglb/codegen/core/writer/IWriter.java
@@ -25,5 +25,5 @@ public interface IWriter {
 	 * @param writableModel
 	 * @throws CodeGenException
 	 */
-	public void writer(WritableModel writableModel) throws CodeGenException;
+    void writer(WritableModel writableModel) throws CodeGenException;
 }
diff --git a/src/main/java/com/yanglb/codegen/core/writer/impl/AsciiWriterImpl.java b/src/main/java/com/yanglb/codegen/core/writer/impl/AsciiWriterImpl.java
@@ -17,6 +17,7 @@
 
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 import com.yanglb.codegen.core.writer.BaseWriter;
 import com.yanglb.codegen.exceptions.CodeGenException;
@@ -38,7 +39,7 @@ protected void onWriter() throws CodeGenException {
 		FileOutputStream fos = null;
 		try {
 			fos = new FileOutputStream(this.writableModel.getFullPath());
-			fos.write(this.writableModel.getData().toString().getBytes("ASCII"));
+			fos.write(this.writableModel.getData().toString().getBytes(StandardCharsets.US_ASCII));
 			fos.flush();
 	        
 		} catch (IOException e) {
diff --git a/src/main/java/com/yanglb/codegen/core/writer/impl/Utf8WriterImpl.java b/src/main/java/com/yanglb/codegen/core/writer/impl/Utf8WriterImpl.java
@@ -18,6 +18,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 
 import com.yanglb.codegen.core.writer.BaseWriter;
 import com.yanglb.codegen.exceptions.CodeGenException;
@@ -36,7 +37,7 @@ protected void onWriter() throws CodeGenException {
 		OutputStreamWriter osw = null;
 		try {
 			fos = new FileOutputStream(this.writableModel.getFullPath());
-			osw = new OutputStreamWriter(fos, "UTF-8");
+			osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
 	        osw.write(this.writableModel.getData().toString()); 
 	        osw.flush();
 	        
diff --git a/src/main/java/com/yanglb/codegen/model/TableModel.java b/src/main/java/com/yanglb/codegen/model/TableModel.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 
 public class TableModel extends BaseModel {
-	private List<Map<String, String>> metaData;
+	private final List<Map<String, String>> metaData;
 	private String[] columns;
 	
 	public TableModel() {
diff --git a/src/main/java/com/yanglb/codegen/utils/Conf.java b/src/main/java/com/yanglb/codegen/utils/Conf.java
@@ -16,7 +16,6 @@
 package com.yanglb.codegen.utils;
 
 import com.yanglb.codegen.model.CmdModel;
-import org.omg.CORBA.SetOverrideType;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.InputStream;
@@ -40,25 +39,23 @@ private static void init() {
 	public static CmdModel getCmdModel(String cmd) {
 		init();
 
-		Map<String, Map<String, String>> values = (Map<String, Map<String, String>>) settings.get("command");
+		Map<String, Map<String, String>> values = ObjectUtil.cast(settings.get("command"));
 		Map<String, String> map = values.get(cmd);
 		if (map == null) return null;
 
-		CmdModel model = new CmdModel(map);
-		return model;
+		return new CmdModel(map);
 	}
 
-	public static String CATEGORY_READER = "reader";
-	public static String CATEGORY_WRITER = "writer";
-	public static String CATEGORY_SETTINGS = "settings";
+	public static final String CATEGORY_READER = "reader";
+	public static final String CATEGORY_WRITER = "writer";
+	public static final String CATEGORY_SETTINGS = "settings";
 
 	public static String getString(String category, String key) {
 		// 初始化
 		init();
 
-		Map<String, Object> values = (Map<String, Object>) settings.get(category);
-		String value = values.get(key).toString();
-		return value;
+		Map<String, Object> values = ObjectUtil.cast(settings.get(category));
+		return values.get(key).toString();
 	}
 
 	public static String getSetting(String key) {
@@ -68,7 +65,7 @@ public static String getSetting(String key) {
 	public static List<String> supportCommands() {
 		init();
 
-		Map<String, Map<String, String>> values = (Map<String, Map<String, String>>) settings.get("command");
+		Map<String, Map<String, String>> values = ObjectUtil.cast(settings.get("command"));
 		return new ArrayList<>(values.keySet());
 	}
 }
diff --git a/src/main/java/com/yanglb/codegen/utils/DataFormatType.java b/src/main/java/com/yanglb/codegen/utils/DataFormatType.java
@@ -21,9 +21,9 @@
  *
  */
 public class DataFormatType {
-	public static final short FRAMAT_GENERAL = 0;
-	
-	public static final short FORMAT_INTERAGE = 59;
+	public static final short FORMAT_GENERAL = 0;
+
+	public static final short FORMAT_INTEGER = 59;
 	
 	public static final short FORMAT_DATE = 60;
 }
diff --git a/src/main/java/com/yanglb/codegen/utils/GenTypes.java b/src/main/java/com/yanglb/codegen/utils/GenTypes.java
@@ -18,9 +18,9 @@
 public class GenTypes {
     public enum Reader {
         ddl, dml, hashmap, setting, table
-    };
+    }
 
     public enum Writer {
         utf8, ascii
-    };
+    }
 }
diff --git a/src/main/java/com/yanglb/codegen/utils/Infos.java b/src/main/java/com/yanglb/codegen/utils/Infos.java
diff --git a/src/main/java/com/yanglb/codegen/utils/ObjectUtil.java b/src/main/java/com/yanglb/codegen/utils/ObjectUtil.java
diff --git a/src/main/java/com/yanglb/codegen/utils/Resources.java b/src/main/java/com/yanglb/codegen/utils/Resources.java
diff --git a/src/main/java/com/yanglb/codegen/utils/StringUtil.java b/src/main/java/com/yanglb/codegen/utils/StringUtil.java
diff --git a/src/main/resources/message.properties b/src/main/resources/message.properties

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public ParamaModel parsing() {`
`152`	`152`	`file = as[1];`
`153`	`153`
`154`	`154`	`// 检查参数是否正确`
`155`		`- if (Conf.supportCommands().indexOf(cmd) < 0) {`
	`155`	`+ if (!Conf.supportCommands().contains(cmd)) {`
`156`	`156`	`throw new IllegalArgumentException(String.format("未知命令: %s，请使用 --help 命令查看用法。", cmd));`
`157`	`157`	`}`
`158`	`158`	`File f = new File(file);`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ public interface ITableReader extends IReader<TableModel> {`
`32`	`32`	`* @return`
`33`	`33`	`* @throws CodeGenException`
`34`	`34`	`*/`
`35`		`- public TableModel reader(XSSFSheet sheet) throws CodeGenException;`
	`35`	`+ TableModel reader(XSSFSheet sheet) throws CodeGenException;`
`36`	`36`	`}`