Skip to content

Commit 8080a39

Browse files
cjbicjbi
committed
refactor(flexmodel): 将 EnumField 重命名为 EnumRefField
- 将 EnumField 类重命名为 EnumRefField - 更新了相关代码和文件中的 EnumField引用 - 修改了枚举字段的处理逻辑和相关测试
1 parent 57059eb commit 8080a39

File tree

19 files changed

+120
-122
lines changed

19 files changed

+120
-122
lines changed

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ try (Session session = sessionFactory.createSession("mySchema")) {
107107
{
108108
"schema": [
109109
{
110-
"type": "ENTITY",
110+
"type": "entity",
111111
"name": "User",
112112
"comment": "用户表",
113113
"fields": [
@@ -302,9 +302,7 @@ log4j.logger.tech.wetech.flexmodel.sql=INFO
302302

303303
### 社区
304304

305-
- 🌐 [官网](https://flexmodel.io)
306-
- 📺 [YouTube](https://youtube.com/@flexmodel)
307-
- 🐦 [Twitter](https://twitter.com/flexmodel_io)
305+
- 🌐 [官网](https://flexmodel.wetech.tech)
308306

309307
## 🙏 致谢
310308

‎flexmodel-codegen/src/main/java/tech/wetech/flexmodel/codegen/ModelClass.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.fasterxml.jackson.annotation.JsonManagedReference;
44
import tech.wetech.flexmodel.model.EntityDefinition;
55
import tech.wetech.flexmodel.model.ModelDefinition;
6-
import tech.wetech.flexmodel.model.field.EnumField;
6+
import tech.wetech.flexmodel.model.field.EnumRefField;
77
import tech.wetech.flexmodel.model.field.RelationField;
88
import tech.wetech.flexmodel.model.field.TypedField;
99

@@ -78,7 +78,7 @@ public static ModelClass buildModelClass(String replaceString, String packageNam
7878
}
7979

8080
}
81-
case EnumField anEnumField -> {
81+
case EnumRefField anEnumField -> {
8282
String ftName = StringUtils.capitalize(
8383
StringUtils.snakeToCamel(
8484
replaceString != null ?

‎flexmodel-codegen/src/test/resources/import.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@
144144
}
145145
],
146146
"indexes": [],
147-
"type": "ENTITY"
147+
"type": "entity"
148148
},
149149
{
150150
"name": "fs_datasource",
151-
"type": "ENTITY",
151+
"type": "entity",
152152
"fields": [
153153
{
154154
"name": "name",
@@ -208,7 +208,7 @@
208208
},
209209
{
210210
"name": "fs_api_log",
211-
"type": "ENTITY",
211+
"type": "entity",
212212
"fields": [
213213
{
214214
"name": "id",
@@ -224,7 +224,7 @@
224224
},
225225
{
226226
"name": "level",
227-
"type": "Enum",
227+
"type": "EnumRef",
228228
"from": "LogLevel",
229229
"multiple": false,
230230
"unique": false,
@@ -268,7 +268,7 @@
268268
]
269269
},
270270
{
271-
"type": "ENTITY",
271+
"type": "entity",
272272
"name": "Student",
273273
"fields": [
274274
{
@@ -293,7 +293,7 @@
293293
},
294294
{
295295
"name": "gender",
296-
"type": "Enum",
296+
"type": "EnumRef",
297297
"from": "UserGender",
298298
"multiple": false,
299299
"modelName": "Student",
@@ -302,7 +302,7 @@
302302
},
303303
{
304304
"name": "interest",
305-
"type": "Enum",
305+
"type": "EnumRef",
306306
"from": "User_interest",
307307
"multiple": true,
308308
"modelName": "Student",
@@ -339,7 +339,7 @@
339339
"indexes": []
340340
},
341341
{
342-
"type": "ENTITY",
342+
"type": "entity",
343343
"name": "StudentDetail",
344344
"fields": [
345345
{
@@ -373,7 +373,7 @@
373373
},
374374
{
375375
"name": "LogLevel",
376-
"type": "ENUM",
376+
"type": "enum",
377377
"elements": [
378378
"DEBUG",
379379
"INFO",
@@ -384,7 +384,7 @@
384384
},
385385
{
386386
"name": "UserGender",
387-
"type": "ENUM",
387+
"type": "enum",
388388
"elements": [
389389
"UNKNOWN",
390390
"MALE",
@@ -394,7 +394,7 @@
394394
},
395395
{
396396
"name": "User_interest",
397-
"type": "ENUM",
397+
"type": "enum",
398398
"elements": [
399399
"chang",
400400
"tiao",

‎flexmodel-core/src/main/java/tech/wetech/flexmodel/model/EntityDefinition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public EntityDefinition(String name) {
2323

2424
@Override
2525
public String getType() {
26-
return "ENTITY";
26+
return "entity";
2727
}
2828

2929
public String getComment() {

‎flexmodel-core/src/main/java/tech/wetech/flexmodel/model/EnumDefinition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public String getName() {
3131

3232
@Override
3333
public String getType() {
34-
return "ENUM";
34+
return "enum";
3535
}
3636

3737
public EnumDefinition setElements(List<String> elements) {

‎flexmodel-core/src/main/java/tech/wetech/flexmodel/model/NativeQueryDefinition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public NativeQueryDefinition setStatement(String statement) {
3232

3333
@Override
3434
public String getType() {
35-
return "NATIVE_QUERY";
35+
return "native_query";
3636
}
3737

3838
/**

‎flexmodel-core/src/main/java/tech/wetech/flexmodel/model/field/EnumField.java‎ renamed to ‎flexmodel-core/src/main/java/tech/wetech/flexmodel/model/field/EnumRefField.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* @author cjbi
77
*/
8-
public class EnumField extends TypedField<Serializable, EnumField> {
8+
public class EnumRefField extends TypedField<Serializable, EnumRefField> {
99

1010
/**
1111
* 多选
@@ -17,15 +17,15 @@ public class EnumField extends TypedField<Serializable, EnumField> {
1717
*/
1818
private String from;
1919

20-
public EnumField(String name) {
20+
public EnumRefField(String name) {
2121
super(name, ScalarType.ENUM.getType());
2222
}
2323

2424
public boolean isMultiple() {
2525
return multiple;
2626
}
2727

28-
public EnumField setMultiple(boolean multiple) {
28+
public EnumRefField setMultiple(boolean multiple) {
2929
this.multiple = multiple;
3030
return this;
3131
}
@@ -42,7 +42,7 @@ public String getFrom() {
4242
return from;
4343
}
4444

45-
public EnumField setFrom(String from) {
45+
public EnumRefField setFrom(String from) {
4646
this.from = from;
4747
return this;
4848
}

‎flexmodel-core/src/main/java/tech/wetech/flexmodel/model/field/ScalarType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public enum ScalarType {
2727
public static final String DATE_TYPE = "Date";
2828
public static final String TIME_TYPE = "Time";
2929
public static final String JSON_TYPE = "JSON";
30-
public static final String ENUM_TYPE = "Enum";
30+
public static final String ENUM_TYPE = "EnumRef";
3131
public static final String RELATION_TYPE = "Relation";
3232

3333
ScalarType(String type) {

‎flexmodel-core/src/main/java/tech/wetech/flexmodel/parser/ASTNodeConverter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static SchemaObject toSchemaObject(ModelParser.ASTNode astNode) {
3232
}
3333
}
3434

35-
@SuppressWarnings("unchecked")
35+
@SuppressWarnings("all")
3636
public static EntityDefinition toSchemaEntity(ModelParser.Model idlModel) {
3737
EntityDefinition entity = new EntityDefinition(idlModel.name);
3838
for (ModelParser.Field field : idlModel.fields) {
@@ -118,9 +118,9 @@ public static EntityDefinition toSchemaEntity(ModelParser.Model idlModel) {
118118
relationField.setCascadeDelete(Boolean.parseBoolean(Objects.toString(relationAnno.parameters.get("cascadeDelete"))));
119119
field = relationField;
120120
} else {
121-
field = new EnumField(idlField.name);
122-
((EnumField) field).setFrom(from);
123-
((EnumField) field).setMultiple(multiple);
121+
field = new EnumRefField(idlField.name);
122+
((EnumRefField) field).setFrom(from);
123+
((EnumRefField) field).setMultiple(multiple);
124124
}
125125
yield field;
126126
}
@@ -259,7 +259,7 @@ public static ModelParser.Field fromSchemaField(TypedField<?, ?> field) {
259259
String.valueOf(relationField.isCascadeDelete()));
260260
idlField.annotations.add(relationAnno);
261261
}
262-
case EnumField enumField -> {
262+
case EnumRefField enumField -> {
263263
// todo
264264
}
265265

@@ -287,7 +287,7 @@ public static ModelParser.Enumeration fromSchemaEnum(EnumDefinition schemaEnum)
287287
private static String getCorrespondingType(TypedField<?, ?> field) {
288288
if (field instanceof RelationField relationField) {
289289
return relationField.isMultiple() ? relationField.getFrom() + "[]" : relationField.getFrom();
290-
} else if (field instanceof EnumField enumField) {
290+
} else if (field instanceof EnumRefField enumField) {
291291
return enumField.isMultiple() ? enumField.getFrom() + "[]" : enumField.getFrom();
292292
} else {
293293
return field.getType();

‎flexmodel-core/src/main/java/tech/wetech/flexmodel/sql/type/EnumSqlTypeHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package tech.wetech.flexmodel.sql.type;
22

3-
import tech.wetech.flexmodel.model.field.EnumField;
3+
import tech.wetech.flexmodel.model.field.EnumRefField;
44
import tech.wetech.flexmodel.model.field.Field;
55
import tech.wetech.flexmodel.type.EnumTypeHandler;
66

@@ -26,7 +26,7 @@ public Object convertParameter(Field field, Object value) {
2626
if (value == null) {
2727
return null;
2828
}
29-
EnumField enumField = (EnumField) field;
29+
EnumRefField enumField = (EnumRefField) field;
3030
if (enumField.isMultiple()) {
3131
if (value instanceof String[] strings) {
3232
return String.join(",", strings);
@@ -41,7 +41,7 @@ public Object convertParameter(Field field, Object value) {
4141

4242
@Override
4343
public Object getNullableResult(ResultSet rs, String columnName, Field field) throws SQLException {
44-
EnumField enumField = (EnumField) field;
44+
EnumRefField enumField = (EnumRefField) field;
4545
String value = rs.getString(columnName);
4646
if (enumField.isMultiple()) {
4747
if (value == null) {

0 commit comments

Comments
 (0)