整理代码结构

杨利兵 · 杨利兵 · commit 96093bab3eca · 2020-05-29T20:30:01.000+08:00
diff --git a/src/main/java/com/yanglb/codegen/core/parser/IParser.java b/src/main/java/com/yanglb/codegen/core/parser/IParser.java
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanglb.codegen.shell;
+package com.yanglb.codegen.core.parser;
 
 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.core.parser.impl.BaseParser;
 import com.yanglb.codegen.utils.Conf;
 
-public interface ICmdParser {
+public interface IParser {
     void setArgs(String[] args);
 
     /**
@@ -36,8 +35,8 @@ public interface ICmdParser {
      */
     ParamaModel parsing() throws IllegalArgumentException;
 
-    static ICmdParser parserByArgs(String[] args) {
-        ICmdParser parser;
+    static IParser parserByArgs(String[] args) {
+        IParser parser;
         String cmd = args[0];
         CmdModel model = Conf.getCmdModel(cmd);
 
diff --git a/src/main/java/com/yanglb/codegen/core/parser/impl/BaseParser.java b/src/main/java/com/yanglb/codegen/core/parser/impl/BaseParser.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yanglb.codegen.shell.parsers;
+package com.yanglb.codegen.core.parser.impl;
 
 import com.yanglb.codegen.core.model.ParamaModel;
-import com.yanglb.codegen.shell.ICmdParser;
+import com.yanglb.codegen.core.parser.IParser;
 import com.yanglb.codegen.utils.Conf;
 import com.yanglb.codegen.utils.Infos;
 import com.yanglb.codegen.utils.Resources;
@@ -26,7 +26,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class BaseParser implements ICmdParser {
+public class BaseParser implements IParser {
     protected String[] args;
     @Override
     public void setArgs(String[] args) {
diff --git a/src/main/java/com/yanglb/codegen/core/parser/impl/MsgJSONParser.java b/src/main/java/com/yanglb/codegen/core/parser/impl/MsgJSONParser.java
@@ -1,4 +1,4 @@
-package com.yanglb.codegen.shell.parsers;
+package com.yanglb.codegen.core.parser.impl;
 
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
diff --git a/src/main/java/com/yanglb/codegen/core/parser/impl/MsgParser.java b/src/main/java/com/yanglb/codegen/core/parser/impl/MsgParser.java
@@ -1,4 +1,4 @@
-package com.yanglb.codegen.shell.parsers;
+package com.yanglb.codegen.core.parser.impl;
 
 public class MsgParser extends BaseParser {
     @Override
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
@@ -68,7 +68,7 @@ private List<DdlDetail> readerTable(XSSFSheet sheet) throws CodeGenException {
 		List<DdlDetail> result = null;
 		
 		// 通过 TableReader读取表格内容
-		ITableReader tableReader = GenFactory.createByName(Conf.getString(Conf.CATEGORY_READER, "table"));
+		ITableReader tableReader = GenFactory.createByName(Conf.getString(Conf.CATEGORY_READER, SupportGen.Reader.table.name()));
 		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.getString(Conf.CATEGORY_READER, "table"));
+		ITableReader tableReader = GenFactory.createByName(Conf.getString(Conf.CATEGORY_READER, SupportGen.Reader.table.name()));
 		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
@@ -18,6 +18,7 @@
 import com.yanglb.codegen.core.GenFactory;
 import com.yanglb.codegen.core.generator.IGenerator;
 import com.yanglb.codegen.core.model.ParamaModel;
+import com.yanglb.codegen.core.parser.IParser;
 import com.yanglb.codegen.exceptions.CodeGenException;
 import com.yanglb.codegen.exceptions.ParamaCheckException;
 
@@ -31,7 +32,7 @@ public boolean invoke(String[] args) {
 //		args = new String[] {"dml2", "-h"};
 		args = new String[] {"msg.prop", "src/main/resources/i18n.xlsx", "-fn", "message"};
 
-		ICmdParser parser = ICmdParser.parserByArgs(args);
+		IParser parser = IParser.parserByArgs(args);
 		ParamaModel model;
 		try {
 			model = parser.parsing();
diff --git a/src/main/resources/conf.yaml b/src/main/resources/conf.yaml
@@ -1,47 +1,47 @@
 # Commands
 command:
   ddl.mysql:
-    parser: .shell.parsers.BaseParser
+    parser: .core.parser.BaseParser
     generator: .core.generator.impl.DdlGeneratorImpl
     reader: .core.reader.impl.DdlReaderImpl
     translator: .core.translator.impl.DdlMysqlTranslatorImpl
   ddl.mssql:
-    parser: .shell.parsers.BaseParser
+    parser: .core.parser.BaseParser
     generator: .core.generator.impl.DdlGeneratorImpl
     reader: .core.reader.impl.DdlReaderImpl
     translator: .core.translator.impl.DdlSqlServerTranslatorImpl
   ddl.sqlite:
-    parser: .shell.parsers.BaseParser
+    parser: .core.parser.BaseParser
     generator: .core.generator.impl.DdlGeneratorImpl
     reader: .core.reader.impl.DdlReaderImpl
     translator: .core.translator.impl.DdlSqliteTranslatorImpl
   dml:
-    parser: .shell.parsers.BaseParser
+    parser: .core.parser.BaseParser
     generator: .core.generator.impl.DmlGeneratorImpl
     reader: .core.reader.impl.DmlReaderImpl
     translator: .core.translator.impl.DmlTranslatorImpl
   msg.resx:
-    parser: .shell.parsers.BaseParser
+    parser: .core.parser.BaseParser
     generator: .core.generator.impl.MsgGeneratorImpl
     reader: .core.reader.impl.TableReaderImpl
     translator: .core.translator.impl.MsgCSTranslatorImpl
   msg.json:
-    parser: .shell.parsers.BaseParser
+    parser: .core.parser.BaseParser
     generator: .core.generator.impl.MsgGeneratorImpl
     reader: .core.reader.impl.TableReaderImpl
     translator: .core.translator.impl.MsgJsonTranslatorImpl
   msg.ios:
-    parser: .shell.parsers.BaseParser
+    parser: .core.parser.BaseParser
     generator: .core.generator.impl.MsgGeneratorImpl
     reader: .core.reader.impl.TableReaderImpl
     translator: .core.translator.impl.MsgIOSTranslatorImpl
   msg.android:
-    parser: .shell.parsers.BaseParser
+    parser: .core.parser.BaseParser
     generator: .core.generator.impl.MsgGeneratorImpl
     reader: .core.reader.impl.TableReaderImpl
     translator: .core.translator.impl.MsgAndroidTranslatorImpl
   msg.prop:
-    parser: .shell.parsers.BaseParser
+    parser: .core.parser.BaseParser
     generator: .core.generator.impl.MsgGeneratorImpl
     reader: .core.reader.impl.TableReaderImpl
     translator: .core.translator.impl.MsgJavaTranslatorImpl

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.yanglb.codegen.shell.parsers;`
	`1`	`+package com.yanglb.codegen.core.parser.impl;`
`2`	`2`
`3`	`3`	`import org.apache.commons.cli.Option;`
`4`	`4`	`import org.apache.commons.cli.Options;`
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.getString(Conf.CATEGORY_READER, "table"));`
	`65`	`+ ITableReader tableReader = GenFactory.createByName(Conf.getString(Conf.CATEGORY_READER, SupportGen.Reader.table.name()));`
`66`	`66`	`tableReader.setStartPoint(7, 2);`
`67`	`67`	`return tableReader.reader(sheet);`
`68`	`68`	`}`