Skip to content

Commit 2be3105

Browse files
author
杨利兵
committed
优化代码
1 parent 6d2f6dd commit 2be3105

16 files changed

+54
-63
lines changed

‎src/main/java/com/yanglb/codegen/core/generator/BaseGenerator.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717

1818
import com.yanglb.codegen.exceptions.CodeGenException;
1919
import com.yanglb.codegen.exceptions.ParamaCheckException;
20-
import com.yanglb.codegen.model.ParamaModel;
20+
import com.yanglb.codegen.model.ParameterModel;
2121
import org.apache.commons.cli.CommandLine;
2222
import org.apache.commons.cli.Option;
2323

2424
import java.util.Date;
2525
import java.util.HashMap;
2626

2727
public class BaseGenerator implements IGenerator{
28-
protected ParamaModel paramaModel;
28+
protected ParameterModel parameterModel;
2929
protected HashMap<String, String> settingMap;
3030

3131
protected void printInfo() {
3232
System.out.println("生成信息:");
33-
System.out.printf("%8s: %s\n", "cmd", paramaModel.getCmd());
34-
System.out.printf("%8s: %s\n", "file", paramaModel.getFile());
33+
System.out.printf("%8s: %s\n", "cmd", parameterModel.getCmd());
34+
System.out.printf("%8s: %s\n", "file", parameterModel.getFile());
3535
System.out.printf("%8s: \n", "options");
36-
CommandLine cl = paramaModel.getOptions();
36+
CommandLine cl = parameterModel.getOptions();
3737
for(Option opt : cl.getOptions()) {
3838
String s = opt.getLongOpt();
3939
if (s == null) s = opt.getOpt();
@@ -50,18 +50,18 @@ protected void printInfo() {
5050

5151
/**
5252
* 初始化
53-
* @param paramaModel
53+
* @param parameterModel
5454
*/
55-
protected void init(ParamaModel paramaModel) {
56-
this.paramaModel = paramaModel;
55+
protected void init(ParameterModel parameterModel) {
56+
this.parameterModel = parameterModel;
5757
this.settingMap = new HashMap<>();
5858

5959
this.settingMap.put("generationDate", new Date().toString());
6060
}
6161

6262
@Override
63-
public final void invoke(ParamaModel paramaModel) throws CodeGenException, ParamaCheckException {
64-
init(paramaModel);
63+
public final void invoke(ParameterModel parameterModel) throws CodeGenException, ParamaCheckException {
64+
init(parameterModel);
6565

6666
printInfo();
6767

‎src/main/java/com/yanglb/codegen/core/generator/IGenerator.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,15 @@
1515
*/
1616
package com.yanglb.codegen.core.generator;
1717

18-
import java.util.List;
19-
20-
import com.yanglb.codegen.model.OptionModel;
21-
import com.yanglb.codegen.model.ParamaModel;
18+
import com.yanglb.codegen.model.ParameterModel;
2219
import com.yanglb.codegen.exceptions.CodeGenException;
2320
import com.yanglb.codegen.exceptions.ParamaCheckException;
2421

2522
public interface IGenerator {
2623
/**
2724
* 执行生成工作
28-
* @param paramaModel 参数模型
25+
* @param parameterModel 参数模型
2926
* @throws CodeGenException 出错信息
3027
*/
31-
void invoke(ParamaModel paramaModel) throws CodeGenException, ParamaCheckException;
28+
void invoke(ParameterModel parameterModel) throws CodeGenException, ParamaCheckException;
3229
}

‎src/main/java/com/yanglb/codegen/core/generator/impl/DdlGeneratorImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ protected void onGeneration() throws CodeGenException {
3636
super.onGeneration();
3737

3838
// 读取DB信息表
39-
IReader<DdlModel> ddlReader = GenFactory.createByName(paramaModel.getCmdModel().getReader());
40-
List<DdlModel> list = ddlReader.reader(this.paramaModel.getFile(), this.paramaModel.getSheets());
39+
IReader<DdlModel> ddlReader = GenFactory.createByName(parameterModel.getCmdModel().getReader());
40+
List<DdlModel> list = ddlReader.reader(this.parameterModel.getFile(), this.parameterModel.getSheets());
4141
if(list.size() == 0) {
4242
throw new CodeGenException(Resources.getString("E_003"));
4343
}
4444

4545
// 转换为可写入的Model（单个文件）
46-
String trans = paramaModel.getCmd();
47-
ITranslator<List<DdlModel>> translator = GenFactory.createByName(paramaModel.getCmdModel().getTranslator());
48-
WritableModel writableModel = translator.translate(settingMap, this.paramaModel, list);
46+
String trans = parameterModel.getCmd();
47+
ITranslator<List<DdlModel>> translator = GenFactory.createByName(parameterModel.getCmdModel().getTranslator());
48+
WritableModel writableModel = translator.translate(settingMap, this.parameterModel, list);
4949

5050
// 默认使用UTF-8编码
5151
GenTypes.Writer supportWriter = GenTypes.Writer.utf8;

‎src/main/java/com/yanglb/codegen/core/generator/impl/DmlGeneratorImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ protected void onGeneration() throws CodeGenException {
3636
super.onGeneration();
3737

3838
// 读取DML信息表
39-
IReader<DdlModel> ddlReader = GenFactory.createByName(paramaModel.getCmdModel().getReader());
40-
List<DdlModel> list = ddlReader.reader(this.paramaModel.getFile(), this.paramaModel.getSheets());
39+
IReader<DdlModel> ddlReader = GenFactory.createByName(parameterModel.getCmdModel().getReader());
40+
List<DdlModel> list = ddlReader.reader(this.parameterModel.getFile(), this.parameterModel.getSheets());
4141
if(list.size() == 0) {
4242
throw new CodeGenException(Resources.getString("E_003"));
4343
}
4444

4545
// 转换为可写入的Model（单个文件）
46-
ITranslator<List<DdlModel>> translator = GenFactory.createByName(paramaModel.getCmdModel().getTranslator());
47-
WritableModel writableModel = translator.translate(settingMap, this.paramaModel, list);
46+
ITranslator<List<DdlModel>> translator = GenFactory.createByName(parameterModel.getCmdModel().getTranslator());
47+
WritableModel writableModel = translator.translate(settingMap, this.parameterModel, list);
4848

4949
// 默认使用UTF-8编码
5050
GenTypes.Writer supportWriter = GenTypes.Writer.utf8;

‎src/main/java/com/yanglb/codegen/core/generator/impl/MsgGeneratorImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ protected void onGeneration() throws CodeGenException {
3737
super.onGeneration();
3838

3939
// 读取DB信息表
40-
ITableReader tableReader = GenFactory.createByName(paramaModel.getCmdModel().getReader());
40+
ITableReader tableReader = GenFactory.createByName(parameterModel.getCmdModel().getReader());
4141
tableReader.setStartPoint(3, 2);
42-
List<TableModel> list = tableReader.reader(this.paramaModel.getFile(), this.paramaModel.getSheets());
42+
List<TableModel> list = tableReader.reader(this.parameterModel.getFile(), this.parameterModel.getSheets());
4343
if(list.size() == 0) {
4444
throw new CodeGenException(Resources.getString("E_003"));
4545
}
@@ -52,11 +52,11 @@ protected void onGeneration() throws CodeGenException {
5252
langList.add(key);
5353

5454
settingMap.put("MsgLang", key);
55-
String trans = paramaModel.getCmd();
55+
String trans = parameterModel.getCmd();
5656

5757
// 转换为可写入的Model（单个文件）
58-
ITranslator<List<TableModel>> translator = GenFactory.createByName(paramaModel.getCmdModel().getTranslator());
59-
WritableModel writableModel = translator.translate(settingMap, paramaModel, list);
58+
ITranslator<List<TableModel>> translator = GenFactory.createByName(parameterModel.getCmdModel().getTranslator());
59+
WritableModel writableModel = translator.translate(settingMap, parameterModel, list);
6060

6161
// 默认使用UTF-8编码
6262
GenTypes.Writer supportWriter = GenTypes.Writer.utf8;

‎src/main/java/com/yanglb/codegen/core/parser/BaseParser.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
*/
1616
package com.yanglb.codegen.core.parser;
1717

18-
import com.yanglb.codegen.model.ParamaModel;
19-
import com.yanglb.codegen.core.parser.IParser;
18+
import com.yanglb.codegen.model.ParameterModel;
2019
import com.yanglb.codegen.utils.Conf;
2120
import com.yanglb.codegen.utils.Infos;
2221
import com.yanglb.codegen.utils.Resources;
@@ -127,7 +126,7 @@ protected void printVersion() {
127126
}
128127

129128
@Override
130-
public ParamaModel parsing() {
129+
public ParameterModel parsing() {
131130
CommandLineParser parser = new DefaultParser();
132131
CommandLine commandLine;
133132
String cmd;
@@ -166,7 +165,7 @@ public ParamaModel parsing() {
166165
throw new IllegalArgumentException("您输入的参数不正确，请使用 --help 命令查看用法。");
167166
}
168167

169-
ParamaModel model = new ParamaModel();
168+
ParameterModel model = new ParameterModel();
170169
model.setCmd(cmd);
171170
model.setFile(file);
172171
model.setOptions(commandLine);

‎src/main/java/com/yanglb/codegen/core/parser/IParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.yanglb.codegen.core.GenFactory;
1919
import com.yanglb.codegen.model.CmdModel;
20-
import com.yanglb.codegen.model.ParamaModel;
20+
import com.yanglb.codegen.model.ParameterModel;
2121
import com.yanglb.codegen.utils.Conf;
2222

2323
public interface IParser {
@@ -32,7 +32,7 @@ public interface IParser {
3232
* 解析命令数据
3333
* @return 命令行参数
3434
*/
35-
ParamaModel parsing() throws IllegalArgumentException;
35+
ParameterModel parsing() throws IllegalArgumentException;
3636

3737
static IParser parserByArgs(String[] args) {
3838
IParser parser;

‎src/main/java/com/yanglb/codegen/core/translator/BaseDdlTranslator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,28 @@ protected ForeignDetailModel getForeignByDdlDetail(DdlModel model, DdlDetail det
144144
do{
145145
// 外键名
146146
String referenceName = detail.getColForeign();
147-
String[] foreigns = referenceName.split("\\.");
147+
String[] foreign = referenceName.split("\\.");
148148

149149
// 外键表
150150
DdlModel foreignTableModel = null;
151151
// 外键表
152152
DdlDetail foreignColumnModel = null;
153153

154-
if(foreigns.length != 2) {
154+
if(foreign.length != 2) {
155155
result = false;
156156
break;
157157
}
158158

159159
// 获取外键表
160-
foreignTableModel = this.findFullTableModel(foreigns[0]);
160+
foreignTableModel = this.findFullTableModel(foreign[0]);
161161
if(foreignTableModel == null) {
162162
result = false;
163163
break;
164164
}
165165

166166
// 获取外键表
167167
for(DdlDetail item:foreignTableModel.getDetail()) {
168-
if(item.getColName().equals(foreigns[1])) {
168+
if(item.getColName().equals(foreign[1])) {
169169
foreignColumnModel = item;
170170
break;
171171
}

‎src/main/java/com/yanglb/codegen/core/translator/BaseMsgTranslator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected String getSplitString() {
5454
* @return 文件名
5555
*/
5656
protected String getFileName() {
57-
String fileName = this.paramaModel.getFileName();
57+
String fileName = this.parameterModel.getFileName();
5858
if (fileName != null) {
5959
fileName.replaceAll("\"", "");
6060
} else {

‎src/main/java/com/yanglb/codegen/core/translator/BaseTranslator.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,17 @@
1515
*/
1616
package com.yanglb.codegen.core.translator;
1717

18-
import java.lang.reflect.Field;
1918
import java.util.HashMap;
20-
import java.util.List;
2119

22-
import com.yanglb.codegen.model.ParamaModel;
20+
import com.yanglb.codegen.model.ParameterModel;
2321
import com.yanglb.codegen.model.WritableModel;
2422
import com.yanglb.codegen.exceptions.CodeGenException;
25-
import com.yanglb.codegen.utils.Resources;
26-
import com.yanglb.codegen.utils.ObjectUtil;
27-
import com.yanglb.codegen.utils.StringUtil;
2823

2924
public class BaseTranslator<T> implements ITranslator<T> {
3025
protected T model;
3126
protected final WritableModel writableModel;
3227
protected HashMap<String, String> settingMap;
33-
protected ParamaModel paramaModel;
28+
protected ParameterModel parameterModel;
3429

3530
protected BaseTranslator() {
3631
this.writableModel = new WritableModel();
@@ -40,15 +35,15 @@ protected BaseTranslator() {
4035
* 进行翻译处理
4136
* @param settingMap 配置信息
4237
* @param model 等待翻译的Model
43-
* @param paramaModel 参数/选项模型
38+
* @param parameterModel 参数/选项模型
4439
* @return WritableModel 一个可写的Model
4540
* @throws CodeGenException 翻译出错时抛出此异常
4641
*/
47-
public WritableModel translate(HashMap<String, String> settingMap, ParamaModel paramaModel, T model)
42+
public WritableModel translate(HashMap<String, String> settingMap, ParameterModel parameterModel, T model)
4843
throws CodeGenException {
4944
this.settingMap = settingMap;
5045
this.model = model;
51-
this.paramaModel = paramaModel;
46+
this.parameterModel = parameterModel;
5247

5348
this.doTranslate();
5449
return this.writableModel;
@@ -63,7 +58,7 @@ protected void onBeforeTranslate() throws CodeGenException {
6358
this.writableModel.setEncode("utf-8");
6459
this.writableModel.setFileName("untitled");
6560
this.writableModel.setData(new StringBuilder());
66-
this.writableModel.setOutputDir(this.paramaModel.getOptDir());
61+
this.writableModel.setOutputDir(this.parameterModel.getOptDir());
6762
}
6863

6964
/**

‎src/main/java/com/yanglb/codegen/core/translator/ITranslator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import java.util.HashMap;
1919

20-
import com.yanglb.codegen.model.ParamaModel;
20+
import com.yanglb.codegen.model.ParameterModel;
2121
import com.yanglb.codegen.model.WritableModel;
2222
import com.yanglb.codegen.exceptions.CodeGenException;
2323

@@ -26,9 +26,9 @@ public interface ITranslator<T> {
2626
* 进行翻译处理
2727
* @param settingMap 配置信息
2828
* @param model 等待翻译的Model
29-
* @param paramaModel 参数/选项模型
29+
* @param parameterModel 参数/选项模型
3030
* @return WritableModel 一个可写的Model
3131
* @throws CodeGenException 翻译出错时抛出此异常
3232
*/
33-
WritableModel translate(HashMap<String, String> settingMap, ParamaModel paramaModel, T model) throws CodeGenException;
33+
WritableModel translate(HashMap<String, String> settingMap, ParameterModel parameterModel, T model) throws CodeGenException;
3434
}

‎src/main/java/com/yanglb/codegen/core/translator/impl/DdlMysqlTranslatorImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ public String genDdl(DdlModel model) throws CodeGenException {
165165
}
166166

167167
private String engine() {
168-
return paramaModel.getOptions().getOptionValue("engine", Conf.getSetting("mysql.engine"));
168+
return parameterModel.getOptions().getOptionValue("engine", Conf.getSetting("mysql.engine"));
169169
}
170170
private String charset() {
171-
return paramaModel.getOptions().getOptionValue("charset", Conf.getSetting("mysql.charset"));
171+
return parameterModel.getOptions().getOptionValue("charset", Conf.getSetting("mysql.charset"));
172172
}
173173

174174
private void updateIndexUniqueMap(HashMap<String, List<DdlDetail>> map, String names, DdlDetail detail) {

‎src/main/java/com/yanglb/codegen/core/translator/impl/MsgAndroidTranslatorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected void onBeforeTranslate() throws CodeGenException {
3535
this.writableModel.setExtension("xml");
3636

3737
// 文件名
38-
if (this.paramaModel.getFileName() == null) {
38+
if (this.parameterModel.getFileName() == null) {
3939
this.writableModel.setFileName("strings");
4040
}
4141

‎src/main/java/com/yanglb/codegen/core/translator/impl/MsgJsonTranslatorImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected void onTranslate() throws CodeGenException {
4747
JSONObject json = new JSONObject();
4848
StringBuilder sb = this.writableModel.getData();
4949

50-
if(this.paramaModel.getOptions().hasOption("combine")) {
50+
if(this.parameterModel.getOptions().hasOption("combine")) {
5151
// 合并输出
5252
for(TableModel tblModel : this.model) {
5353
tblModel2Json(json, tblModel);
@@ -65,7 +65,7 @@ protected void onTranslate() throws CodeGenException {
6565

6666
// to JSON string
6767
int indentFactor = 4;
68-
if (paramaModel.getOptions().hasOption("minify")) indentFactor = 0;
68+
if (parameterModel.getOptions().hasOption("minify")) indentFactor = 0;
6969
sb.append(json.toString(indentFactor));
7070
}
7171
}

‎src/main/java/com/yanglb/codegen/model/ParamaModel.java renamed to ‎src/main/java/com/yanglb/codegen/model/ParameterModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import org.apache.commons.cli.CommandLine;
1919

20-
public class ParamaModel {
20+
public class ParameterModel {
2121
private String cmd;
2222
private String file;
2323
CommandLine options;

‎src/main/java/com/yanglb/codegen/shell/CGShell.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
import com.yanglb.codegen.core.GenFactory;
1919
import com.yanglb.codegen.core.generator.IGenerator;
20-
import com.yanglb.codegen.model.ParamaModel;
20+
import com.yanglb.codegen.model.ParameterModel;
2121
import com.yanglb.codegen.core.parser.IParser;
2222
import com.yanglb.codegen.exceptions.CodeGenException;
2323
import com.yanglb.codegen.exceptions.ParamaCheckException;
2424

2525
public class CGShell {
2626
public boolean invoke(String[] args) {
2727
IParser parser = IParser.parserByArgs(args);
28-
ParamaModel model;
28+
ParameterModel model;
2929
try {
3030
model = parser.parsing();
3131
if (model == null) return true;

0 commit comments

Comments
 (0)