Skip to content

Commit fe9b083

Browse files
committed
调整 Read_ConvertSnakeToCamel 更名为 Read_ConvertSnakeToSmlCamel;Read_ConvertCamelToSnake更名为 Read_ConvertCamelToSmlSnake; Write_UseSnakeStyle 更名为 Write_UseSmlSnakeStyle; Write_UseCamelStyle 更名为 Write_UseSmlCamelStyle
1 parent 7bf0100 commit fe9b083

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

snack4-test/src/test/java/features/snack4/codec/FeatureTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void Read_AllowZeroLeadingNumbers() {
6767

6868
@Test
6969
public void Read_ConvertSnakeToCamel() {
70-
assert ONode.ofJson("{user_info:'1'}", Feature.Read_ConvertSnakeToCamel)
70+
assert ONode.ofJson("{user_info:'1'}", Feature.Read_ConvertSnakeToSmlCamel)
7171
.get("userInfo").isString();
7272

7373
assert ONode.ofJson("{user_info:'1'}")
@@ -76,7 +76,7 @@ public void Read_ConvertSnakeToCamel() {
7676

7777
@Test
7878
public void Read_UnwrapJsonString() {
79-
assert ONode.ofJson("{user_info:'{a:1,b:2}'}", Feature.Read_ConvertSnakeToCamel, Feature.Read_UnwrapJsonString)
79+
assert ONode.ofJson("{user_info:'{a:1,b:2}'}", Feature.Read_ConvertSnakeToSmlCamel, Feature.Read_UnwrapJsonString)
8080
.get("userInfo").isObject();
8181

8282
assert ONode.ofJson("{user_info:'{a:1,b:2}'}")
@@ -328,7 +328,7 @@ public void Write_UseSnakeStyle() {
328328
System.out.println(json);
329329
Assertions.assertEquals("{\"userId\":1}", json);
330330

331-
json = ONode.ofBean(data, Feature.Write_UseSnakeStyle).toJson();
331+
json = ONode.ofBean(data, Feature.Write_UseSmlSnakeStyle).toJson();
332332
System.out.println(json);
333333
Assertions.assertEquals("{\"user_id\":1}", json);
334334
}

snack4-test/src/test/java/features/snack4/json/writer/JsonWriterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public void testWriteUseSingleQuotes() throws IOException {
161161
public void testWriteUseSnakeStyle() throws IOException {
162162
ONode node = new ONode();
163163
node.set("firstName", new ONode("John"));
164-
Options opts = Options.of(Feature.Write_UseSnakeStyle);
164+
Options opts = Options.of(Feature.Write_UseSmlSnakeStyle);
165165
StringWriter writer = new StringWriter();
166166
new JsonWriter(opts, writer).write(node);
167167
assertEquals("{\"first_name\":\"John\"}", writer.toString());
@@ -170,7 +170,7 @@ public void testWriteUseSnakeStyle() throws IOException {
170170
@Test
171171
public void testConvertSnakeToCamel() throws IOException {
172172
StringReader reader = new StringReader("{\"first_name\":\"John\"}");
173-
ONode oNode = new JsonReader(reader, Options.of(Feature.Read_ConvertSnakeToCamel)).read();
173+
ONode oNode = new JsonReader(reader, Options.of(Feature.Read_ConvertSnakeToSmlCamel)).read();
174174
assertEquals("{\"firstName\":\"John\"}", oNode.toJson());
175175
}
176176

snack4/src/main/java/org/noear/snack4/Feature.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ public enum Feature {
5555
/**
5656
* 读取时小蛇转为小驼峰风格
5757
*/
58-
Read_ConvertSnakeToCamel,
58+
Read_ConvertSnakeToSmlCamel,
5959

6060
/**
6161
* 读取时小驼峰转为小蛇风格
6262
*/
63-
Read_ConvertCamelToSnake,
63+
Read_ConvertCamelToSmlSnake,
6464

6565
/**
6666
* 读取时自动展开行内JSON字符串 (如 {"data": "{\"id\":1}"} )
@@ -177,12 +177,12 @@ public enum Feature {
177177
/**
178178
* 写入时名字使用小蛇风格
179179
*/
180-
Write_UseSnakeStyle,
180+
Write_UseSmlSnakeStyle,
181181

182182
/**
183183
* 写入时名字使用小骆峰风格
184184
*/
185-
Write_UseCamelStyle,
185+
Write_UseSmlCamelStyle,
186186

187187
/**
188188
* 写入时枚举使用名称(默认使用名称)

snack4/src/main/java/org/noear/snack4/json/JsonReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public JsonReader(Reader reader, Options opts) {
8686
this.Read_DisableUnquotedKeys = this.opts.hasFeature(Feature.Read_DisableUnquotedKeys);
8787
this.Read_DisableSingleQuotes = this.opts.hasFeature(Feature.Read_DisableSingleQuotes);
8888
this.Read_UnwrapJsonString = this.opts.hasFeature(Feature.Read_UnwrapJsonString);
89-
this.Read_ConvertSnakeToCamel = this.opts.hasFeature(Feature.Read_ConvertSnakeToCamel);
90-
this.Read_ConvertCamelToSnake = this.opts.hasFeature(Feature.Read_ConvertCamelToSnake);
89+
this.Read_ConvertSnakeToCamel = this.opts.hasFeature(Feature.Read_ConvertSnakeToSmlCamel);
90+
this.Read_ConvertCamelToSnake = this.opts.hasFeature(Feature.Read_ConvertCamelToSmlSnake);
9191
}
9292

9393
public ONode read() throws IOException {

snack4/src/main/java/org/noear/snack4/json/JsonWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public JsonWriter(Options opts, Writer writer) {
7373

7474
this.Write_BrowserCompatible = this.opts.hasFeature(Feature.Write_BrowserCompatible);
7575
this.Write_UseRawBackslash = this.opts.hasFeature(Feature.Write_UseRawBackslash);
76-
this.Write_UseSnakeStyle = this.opts.hasFeature(Feature.Write_UseSnakeStyle);
77-
this.Write_UseCamelStyle = this.opts.hasFeature(Feature.Write_UseCamelStyle);
76+
this.Write_UseSnakeStyle = this.opts.hasFeature(Feature.Write_UseSmlSnakeStyle);
77+
this.Write_UseCamelStyle = this.opts.hasFeature(Feature.Write_UseSmlCamelStyle);
7878

7979
if (Write_UseSnakeStyle || Write_UseCamelStyle) {
8080
this.stringBuilder = new StringBuilder(32);

0 commit comments

Comments
 (0)