删除Setting相关内容

杨利兵 · 杨利兵 · commit 32ec2504d62a · 2020-05-29T20:22:17.000+08:00
diff --git a/src/main/java/com/yanglb/codegen/core/GenFactory.java b/src/main/java/com/yanglb/codegen/core/GenFactory.java
@@ -26,39 +26,37 @@ public class GenFactory<T> {
 	private GenFactory() {
 		
 	}
-
-	/**
-	 * 创建生成器
-	 * @param paramaModel 参数模型
-	 * @return IGenerator
-	 * @throws CodeGenException
-	 */
-	public static IGenerator createGenerator(ParamaModel paramaModel) throws CodeGenException{
-		IGenerator generator = null;
-		try {
-			GenFactory<IGenerator> factory = new GenFactory<IGenerator>(); 
-			generator = factory.createFromProperties(Conf.CATEGORY_GENERATOR, paramaModel.getCmd());
-			generator.init(paramaModel);
-		} catch (Exception e) {
-			throw new CodeGenException(Resources.getString("E_010"));
-		}
-		return generator;
-	}
+//
+//	/**
+//	 * 创建生成器
+//	 * @param paramaModel 参数模型
+//	 * @return IGenerator
+//	 * @throws CodeGenException
+//	 */
+//	public static IGenerator createGenerator(ParamaModel paramaModel) throws CodeGenException{
+//		IGenerator generator = null;
+//		try {
+//			generator = createByName(paramaModel.getCmdModel().getGenerator());
+//			generator.init(paramaModel);
+//		} catch (Exception e) {
+//			throw new CodeGenException(Resources.getString("E_010"));
+//		}
+//		return generator;
+//	}
 	
 	/**
 	 * 根据配置文件中配置的名字创建
 	 * @param <T> 创建接口类型
- 	 * @param name 名称
 	 * @return T的接口实例
 	 * @throws CodeGenException 错误信息
 	 */
-	public static <T> T createByName(String category, String name) throws CodeGenException {
+	public static <T> T createByName(String className) throws CodeGenException {
 		T result = null;
 		try {
 			GenFactory<T> factory = new GenFactory<T>();
-			result = factory.createFromProperties(category, name);
+			result = factory.create(className);
 		} catch (Exception e) {
-			throw new CodeGenException(String.format(Resources.getString("E_011"), name, e.getMessage()));
+			throw new CodeGenException(String.format(Resources.getString("E_011"), className, e.getMessage()));
 		}
 		return result;
 	}
@@ -71,26 +69,11 @@ public static <T> T createByName(String category, String name) throws CodeGenExc
 	 * @throws IllegalAccessException
 	 * @throws ClassNotFoundException
 	 */
-	@SuppressWarnings("unchecked")
-	protected T create(String implName) 
+	protected 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;
 	}
-	
-	/**
-	 * 根据配置文件创建
-	 * @param key
-	 * @return
-	 * @throws InstantiationException
-	 * @throws IllegalAccessException
-	 * @throws ClassNotFoundException
-	 */
-	protected T createFromProperties(String category, String key)
-			throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-		String className = Conf.getString(category, key);
-		return this.create(className);
-	}
 }
diff --git a/src/main/java/com/yanglb/codegen/core/generator/BaseGenerator.java b/src/main/java/com/yanglb/codegen/core/generator/BaseGenerator.java
@@ -56,8 +56,7 @@ protected void printInfo() {
 	 * 初始化
 	 * @param paramaModel
 	 */
-	@Override
-	public void init(ParamaModel paramaModel) {
+	protected void init(ParamaModel paramaModel) {
 		this.paramaModel = paramaModel;
 		this.supportOptions = new ArrayList<OptionModel>();
 		this.settingMap = new HashMap<String, String>();
@@ -66,13 +65,15 @@ public void init(ParamaModel paramaModel) {
 	}
 
 	@Override
-	public final void invoke() throws CodeGenException, ParamaCheckException {
-		this.onCheck();
+	public final void invoke(ParamaModel paramaModel) throws CodeGenException, ParamaCheckException {
+		init(paramaModel);
+
+		onCheck();
 		
-		this.printInfo();
+		printInfo();
 		
 		// 生成代码
-		this.onGeneration();
+		onGeneration();
 	}
 
 	@Override
diff --git a/src/main/java/com/yanglb/codegen/core/generator/IGenerator.java b/src/main/java/com/yanglb/codegen/core/generator/IGenerator.java
@@ -23,18 +23,12 @@
 import com.yanglb.codegen.exceptions.ParamaCheckException;
 
 public interface IGenerator {
-	
-	/**
-	 * 初始化
-	 * @param paramaModel 参数模型
-	 */
-	void init(ParamaModel paramaModel);
-
 	/**
 	 * 执行生成工作
+	 * @param paramaModel 参数模型
 	 * @throws CodeGenException 出错信息
 	 */
-	void invoke() throws CodeGenException, ParamaCheckException;
+	void invoke(ParamaModel paramaModel) throws CodeGenException, ParamaCheckException;
 	
 	/**
 	 * 取得该生成器支持的选项
diff --git a/src/main/java/com/yanglb/codegen/core/generator/impl/DdlGeneratorImpl.java b/src/main/java/com/yanglb/codegen/core/generator/impl/DdlGeneratorImpl.java
@@ -36,23 +36,23 @@ protected void onGeneration() throws CodeGenException {
 		super.onGeneration();
 
 		// 读取DB信息表
-		IReader<DdlModel> ddlReader = GenFactory.createByName(Conf.CATEGORY_READER, SupportGen.Reader.ddl.name());
+		IReader<DdlModel> ddlReader = GenFactory.createByName(paramaModel.getCmdModel().getReader());
 		List<DdlModel> list = ddlReader.reader(this.paramaModel.getFile(), this.paramaModel.getSheets());
 		if(list.size() == 0) {
 			throw new CodeGenException(Resources.getString("E_003"));
 		}
 
 		// 转换为可写入的Model（单个文件）
 		String trans = paramaModel.getCmd();
-		ITranslator<List<DdlModel>> translator = GenFactory.createByName(Conf.CATEGORY_TRANSLATOR, trans);
+		ITranslator<List<DdlModel>> translator = GenFactory.createByName(paramaModel.getCmdModel().getTranslator());
 		WritableModel writableModel = translator.translate(settingMap, this.paramaModel, list);
 
 		// 默认使用UTF-8编码
 		SupportGen.Writer supportWriter = SupportGen.Writer.utf8;
 		if (writableModel.getEncode() == "ascii") supportWriter = SupportGen.Writer.ascii;
 
 		// 写入到文件中
-		IWriter writer = GenFactory.createByName(Conf.CATEGORY_WRITER, supportWriter.name());
+		IWriter writer = GenFactory.createByName(Conf.getString(Conf.CATEGORY_WRITER, supportWriter.name()));
 		writer.writer(writableModel);
 	}
 }
diff --git a/src/main/java/com/yanglb/codegen/core/generator/impl/DmlGeneratorImpl.java b/src/main/java/com/yanglb/codegen/core/generator/impl/DmlGeneratorImpl.java
@@ -36,22 +36,22 @@ protected void onGeneration() throws CodeGenException {
 		super.onGeneration();
 
 		// 读取DML信息表
-		IReader<DdlModel> ddlReader = GenFactory.createByName(Conf.CATEGORY_READER, SupportGen.Reader.dml.name());
+		IReader<DdlModel> ddlReader = GenFactory.createByName(paramaModel.getCmdModel().getReader());
 		List<DdlModel> list = ddlReader.reader(this.paramaModel.getFile(), this.paramaModel.getSheets());
 		if(list.size() == 0) {
 			throw new CodeGenException(Resources.getString("E_003"));
 		}
 
 		// 转换为可写入的Model（单个文件）
-		ITranslator<List<DdlModel>> translator = GenFactory.createByName(Conf.CATEGORY_TRANSLATOR, "dml");
+		ITranslator<List<DdlModel>> translator = GenFactory.createByName(paramaModel.getCmdModel().getTranslator());
 		WritableModel writableModel = translator.translate(settingMap, this.paramaModel, list);
 
 		// 默认使用UTF-8编码
 		SupportGen.Writer supportWriter = SupportGen.Writer.utf8;
 		if (writableModel.getEncode() == "ascii") supportWriter = SupportGen.Writer.ascii;
 
 		// 写入到文件中
-		IWriter writer = GenFactory.createByName(Conf.CATEGORY_WRITER, supportWriter.name());
+		IWriter writer = GenFactory.createByName(Conf.getString(Conf.CATEGORY_WRITER, supportWriter.name()));
 		writer.writer(writableModel);
 	}
 }
diff --git a/src/main/java/com/yanglb/codegen/core/generator/impl/MsgGeneratorImpl.java b/src/main/java/com/yanglb/codegen/core/generator/impl/MsgGeneratorImpl.java
@@ -37,7 +37,7 @@ protected void onGeneration() throws CodeGenException {
 		super.onGeneration();
 
 		// 读取DB信息表
-		ITableReader tableReader = GenFactory.createByName(Conf.CATEGORY_READER, SupportGen.Reader.table.name());
+		ITableReader tableReader = GenFactory.createByName(paramaModel.getCmdModel().getReader());
 		tableReader.setStartPoint(3, 2);
 		List<TableModel> list = tableReader.reader(this.paramaModel.getFile(), this.paramaModel.getSheets());
 		if(list.size() == 0) {
@@ -55,15 +55,15 @@ protected void onGeneration() throws CodeGenException {
 				String trans = paramaModel.getCmd();
 
 				// 转换为可写入的Model（单个文件）
-				ITranslator<List<TableModel>> translator = GenFactory.createByName(Conf.CATEGORY_TRANSLATOR, trans);
+				ITranslator<List<TableModel>> translator = GenFactory.createByName(paramaModel.getCmdModel().getTranslator());
 				WritableModel writableModel = translator.translate(settingMap, paramaModel, list);
 
 				// 默认使用UTF-8编码
 				SupportGen.Writer supportWriter = SupportGen.Writer.utf8;
 				if (writableModel.getEncode() == "ascii") supportWriter = SupportGen.Writer.ascii;
 
 				// 写入到文件中
-				IWriter writer = GenFactory.createByName(Conf.CATEGORY_WRITER, supportWriter.name());
+				IWriter writer = GenFactory.createByName(Conf.getString(Conf.CATEGORY_WRITER, supportWriter.name()));
 				writer.writer(writableModel);
 			}
 		}
diff --git a/src/main/java/com/yanglb/codegen/core/model/CmdModel.java b/src/main/java/com/yanglb/codegen/core/model/CmdModel.java
@@ -0,0 +1,51 @@
+package com.yanglb.codegen.core.model;
+
+import java.util.Map;
+
+public class CmdModel {
+    private String parser;
+    private String generator;
+    private String reader;
+    private String translator;
+
+    public CmdModel() {
+    }
+    public CmdModel(Map<String, String> values){
+        parser = values.get("parser");
+        generator = values.get("generator");
+        reader = values.get("reader");
+        translator = values.get("translator");
+    }
+
+    public String getParser() {
+        return parser;
+    }
+
+    public void setParser(String parser) {
+        this.parser = parser;
+    }
+
+    public String getGenerator() {
+        return generator;
+    }
+
+    public void setGenerator(String generator) {
+        this.generator = generator;
+    }
+
+    public String getReader() {
+        return reader;
+    }
+
+    public void setReader(String reader) {
+        this.reader = reader;
+    }
+
+    public String getTranslator() {
+        return translator;
+    }
+
+    public void setTranslator(String translator) {
+        this.translator = translator;
+    }
+}
diff --git a/src/main/java/com/yanglb/codegen/core/model/ParamaModel.java b/src/main/java/com/yanglb/codegen/core/model/ParamaModel.java
@@ -21,6 +21,7 @@ public class ParamaModel {
 	private String cmd;
 	private String file;
 	CommandLine options;
+	CmdModel cmdModel;
 
 	public String[] getSheets() {
 		return options.getOptionValues("sheets");
@@ -55,4 +56,12 @@ public CommandLine getOptions() {
 	public void setOptions(CommandLine options) {
 		this.options = options;
 	}
+
+	public CmdModel getCmdModel() {
+		return cmdModel;
+	}
+
+	public void setCmdModel(CmdModel cmdModel) {
+		this.cmdModel = cmdModel;
+	}
 }
diff --git a/src/main/java/com/yanglb/codegen/core/reader/impl/DdlReaderImpl.java b/src/main/java/com/yanglb/codegen/core/reader/impl/DdlReaderImpl.java
@@ -32,7 +32,6 @@
 import com.yanglb.codegen.support.SupportGen;
 
 public class DdlReaderImpl extends BaseModelReader<DdlModel> {
-	
 	/**
 	 * 读取DB定义Sheet
 	 * @throws CodeGenException 
@@ -48,9 +47,7 @@ protected DdlModel onReader(XSSFSheet sheet) throws CodeGenException {
 		model.setAuthor(this.getCellStringValue(row.getCell(4)));
 		model.setVersion(this.getCellStringValue(row.getCell(6)));
 		model.setDescription(this.getCellStringValue(row.getCell(8)));
-//		model.setIndex(this.getCellStringValue(row.getCell(8)));
-//		model.setForeign(this.getCellStringValue(row.getCell(12)));
-		
+
 		row = sheet.getRow(2);
 		model.setName(this.getCellStringValue(row.getCell(2)));
 		model.setResponsibility(this.getCellStringValue(row.getCell(4)));
@@ -71,7 +68,7 @@ private List<DdlDetail> readerTable(XSSFSheet sheet) throws CodeGenException {
 		List<DdlDetail> result = null;
 		
 		// 通过 TableReader读取表格内容
-		ITableReader tableReader = GenFactory.createByName(Conf.CATEGORY_READER, "table");
+		ITableReader tableReader = GenFactory.createByName(Conf.getString(Conf.CATEGORY_READER, "table"));
 		tableReader.setStartPoint(6, 2);
 		TableModel tableModel = tableReader.reader(sheet);
 		
diff --git a/src/main/java/com/yanglb/codegen/core/reader/impl/DmlReaderImpl.java b/src/main/java/com/yanglb/codegen/core/reader/impl/DmlReaderImpl.java
@@ -62,7 +62,7 @@ protected DmlModel onReader(XSSFSheet sheet) throws CodeGenException {
 	 */
 	private TableModel readerTable(XSSFSheet sheet) throws CodeGenException {
 		// 通过 TableReader读取表格内容
-		ITableReader tableReader = GenFactory.createByName(Conf.CATEGORY_READER, "table");
+		ITableReader tableReader = GenFactory.createByName(Conf.getString(Conf.CATEGORY_READER, "table"));
 		tableReader.setStartPoint(7, 2);
 		return tableReader.reader(sheet);
 	}
diff --git a/src/main/java/com/yanglb/codegen/shell/CodeGenShell.java b/src/main/java/com/yanglb/codegen/shell/CodeGenShell.java
@@ -28,8 +28,8 @@ public boolean invoke(String[] args) {
 //		args = new String[] {"msg.json", "/Users/yanglibing/Work/cg/tests/msg.xlsx", "-c1", "-fn", "ttt"};
 //		args = new String[] {"ddl.mysql", "/Users/yanglibing/Work/cg/tests/ddl.xlsx"};
 //		args = new String[] {"dml", "/Users/yanglibing/Work/cg/tests/dml.xlsx"};
-		args = new String[] {"dml2", "-h"};
-//		args = new String[] {"msg.prop", "src/main/resources/i18n.xlsx", "-fn", "message"};
+//		args = new String[] {"dml2", "-h"};
+		args = new String[] {"msg.prop", "src/main/resources/i18n.xlsx", "-fn", "message"};
 
 		ICmdParser parser = ICmdParser.parserByArgs(args);
 		ParamaModel model;
@@ -44,8 +44,8 @@ public boolean invoke(String[] args) {
 
 		// 执行
 		try {
-			IGenerator generator = GenFactory.createGenerator(model);
-			generator.invoke();
+			IGenerator generator = GenFactory.createByName(model.getCmdModel().getGenerator());
+			generator.invoke(model);
 		}
 		catch (ParamaCheckException | CodeGenException e) {
 			System.out.println("生成失败!");
diff --git a/src/main/java/com/yanglb/codegen/shell/ICmdParser.java b/src/main/java/com/yanglb/codegen/shell/ICmdParser.java
@@ -16,13 +16,11 @@
 package com.yanglb.codegen.shell;
 
 import com.yanglb.codegen.core.GenFactory;
+import com.yanglb.codegen.core.model.CmdModel;
 import com.yanglb.codegen.core.model.ParamaModel;
-
 import com.yanglb.codegen.exceptions.CodeGenException;
 import com.yanglb.codegen.shell.parsers.BaseParser;
-import com.yanglb.codegen.shell.parsers.MsgJSONParser;
 import com.yanglb.codegen.utils.Conf;
-import org.apache.commons.cli.Options;
 
 public interface ICmdParser {
     void setArgs(String[] args);
@@ -41,14 +39,11 @@ public interface ICmdParser {
     static ICmdParser parserByArgs(String[] args) {
         ICmdParser parser;
         String cmd = args[0];
-        if (Conf.supportCommands().indexOf(cmd) >= 0) {
-            try {
-                parser = GenFactory.createByName(Conf.CATEGORY_PARSER, cmd);
-            } catch (CodeGenException e) {
-                parser = new BaseParser();
-                e.printStackTrace();
-            }
-        } else {
+        CmdModel model = Conf.getCmdModel(cmd);
+
+        try {
+            parser = GenFactory.createByName(model.getParser());
+        } catch (Exception e) {
             parser = new BaseParser();
         }
 
diff --git a/src/main/java/com/yanglb/codegen/shell/parsers/BaseParser.java b/src/main/java/com/yanglb/codegen/shell/parsers/BaseParser.java
@@ -170,6 +170,7 @@ public ParamaModel parsing() {
         model.setCmd(cmd);
         model.setFile(file);
         model.setOptions(commandLine);
+        model.setCmdModel(Conf.getCmdModel(cmd));
         return model;
     }
 }
diff --git a/src/main/java/com/yanglb/codegen/utils/Conf.java b/src/main/java/com/yanglb/codegen/utils/Conf.java
diff --git a/src/main/resources/conf.yaml b/src/main/resources/conf.yaml

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ protected DmlModel onReader(XSSFSheet sheet) throws CodeGenException {`
`62`	`62`	`*/`
`63`	`63`	`private TableModel readerTable(XSSFSheet sheet) throws CodeGenException {`
`64`	`64`	`// 通过 TableReader读取表格内容`
`65`		`- ITableReader tableReader = GenFactory.createByName(Conf.CATEGORY_READER, "table");`
	`65`	`+ ITableReader tableReader = GenFactory.createByName(Conf.getString(Conf.CATEGORY_READER, "table"));`
`66`	`66`	`tableReader.setStartPoint(7, 2);`
`67`	`67`	`return tableReader.reader(sheet);`
`68`	`68`	`}`