Skip to content

Commit 2bc680b

Browse files
javadevjavadev
committed
Sync with underscore-java
1 parent 14b93c7 commit 2bc680b

File tree

10 files changed

+350
-420
lines changed

10 files changed

+350
-420
lines changed

‎src/main/java/com/github/underscore/U.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -2798,7 +2798,8 @@ public static String xmlOrJsonToJson(String xmlOrJson) {
27982798
return xmlOrJsonToJson(xmlOrJson, Json.JsonStringBuilder.Step.TWO_SPACES);
27992799
}
28002800

2801-
public static String mergeXmlsOrJsonsToJson(List<String> xmlsOrJsons, Json.JsonStringBuilder.Step identStep) {
2801+
public static String mergeXmlsOrJsonsToJson(
2802+
List<String> xmlsOrJsons, Json.JsonStringBuilder.Step identStep) {
28022803
Map<String, Object> resultJsonMap = new LinkedHashMap<>();
28032804
for (String xmlOrJsonToJson : xmlsOrJsons) {
28042805
TextType textType = getTextType(xmlOrJsonToJson);
@@ -2819,7 +2820,8 @@ public static String mergeXmlsOrJsonsToJson(List<String> xmlsOrJsons) {
28192820
return mergeXmlsOrJsonsToJson(xmlsOrJsons, Json.JsonStringBuilder.Step.TWO_SPACES);
28202821
}
28212822

2822-
public static String mergeXmlsOrJsonsToXml(List<String> xmlsOrJsons, Xml.XmlStringBuilder.Step identStep) {
2823+
public static String mergeXmlsOrJsonsToXml(
2824+
List<String> xmlsOrJsons, Xml.XmlStringBuilder.Step identStep) {
28232825
Map<String, Object> resultXmlMap = new LinkedHashMap<>();
28242826
for (String xmlOrJsonToXml : xmlsOrJsons) {
28252827
TextType textType = getTextType(xmlOrJsonToXml);

‎src/test/java/com/github/underscore/ChainingTest.java

+39-43
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,24 @@ class ChainingTest {
5656
@Test
5757
void chain() {
5858
final List<Map<String, Object>> stooges =
59-
new ArrayList<Map<String, Object>>() {
59+
new ArrayList<>() {
6060
{
6161
add(
62-
new LinkedHashMap<String, Object>() {
62+
new LinkedHashMap<>() {
6363
{
6464
put("name", "curly");
6565
put("age", 25);
6666
}
6767
});
6868
add(
69-
new LinkedHashMap<String, Object>() {
69+
new LinkedHashMap<>() {
7070
{
7171
put("name", "moe");
7272
put("age", 21);
7373
}
7474
});
7575
add(
76-
new LinkedHashMap<String, Object>() {
76+
new LinkedHashMap<>() {
7777
{
7878
put("name", "larry");
7979
put("age", 23);
@@ -94,24 +94,24 @@ void chain() {
9494
@Test
9595
void chainSet() {
9696
final Set<Map<String, Object>> stooges =
97-
new HashSet<Map<String, Object>>() {
97+
new HashSet<>() {
9898
{
9999
add(
100-
new LinkedHashMap<String, Object>() {
100+
new LinkedHashMap<>() {
101101
{
102102
put("name", "curly");
103103
put("age", 25);
104104
}
105105
});
106106
add(
107-
new LinkedHashMap<String, Object>() {
107+
new LinkedHashMap<>() {
108108
{
109109
put("name", "moe");
110110
put("age", 21);
111111
}
112112
});
113113
add(
114-
new LinkedHashMap<String, Object>() {
114+
new LinkedHashMap<>() {
115115
{
116116
put("name", "larry");
117117
put("age", 23);
@@ -133,24 +133,24 @@ void chainSet() {
133133
@SuppressWarnings("unchecked")
134134
void chainObj() {
135135
final Set<Map<String, Object>> stooges =
136-
new HashSet<Map<String, Object>>() {
136+
new HashSet<>() {
137137
{
138138
add(
139-
new LinkedHashMap<String, Object>() {
139+
new LinkedHashMap<>() {
140140
{
141141
put("name", "curly");
142142
put("age", 25);
143143
}
144144
});
145145
add(
146-
new LinkedHashMap<String, Object>() {
146+
new LinkedHashMap<>() {
147147
{
148148
put("name", "moe");
149149
put("age", 21);
150150
}
151151
});
152152
add(
153-
new LinkedHashMap<String, Object>() {
153+
new LinkedHashMap<>() {
154154
{
155155
put("name", "larry");
156156
put("age", 23);
@@ -159,42 +159,38 @@ void chainObj() {
159159
}
160160
};
161161
final String youngest =
162-
new Underscore(stooges)
162+
new Underscore<>(stooges)
163163
.chain()
164-
.sortBy(
165-
(Function<Map<String, Object>, Integer>)
166-
item -> (Integer) item.get("age"))
167-
.map(
168-
(Function<Map<String, Object>, String>)
169-
item -> item.get("name") + " is " + item.get("age"))
164+
.sortBy(item -> (Integer) item.get("age"))
165+
.map(item -> item.get("name") + " is " + item.get("age"))
170166
.first()
171167
.item()
172168
.toString();
173169
assertEquals("moe is 21", youngest);
174-
new Underscore(stooges).of();
170+
new Underscore<>(stooges).of();
175171
}
176172

177173
@Test
178174
void chainArray() {
179175
final List<Map<String, Object>> stooges =
180-
new ArrayList<Map<String, Object>>() {
176+
new ArrayList<>() {
181177
{
182178
add(
183-
new LinkedHashMap<String, Object>() {
179+
new LinkedHashMap<>() {
184180
{
185181
put("name", "curly");
186182
put("age", 25);
187183
}
188184
});
189185
add(
190-
new LinkedHashMap<String, Object>() {
186+
new LinkedHashMap<>() {
191187
{
192188
put("name", "moe");
193189
put("age", 21);
194190
}
195191
});
196192
add(
197-
new LinkedHashMap<String, Object>() {
193+
new LinkedHashMap<>() {
198194
{
199195
put("name", "larry");
200196
put("age", 23);
@@ -236,31 +232,31 @@ void chainArray() {
236232
@SuppressWarnings("unchecked")
237233
void chain2() {
238234
final List<Map<String, Object>> lyrics =
239-
new ArrayList<Map<String, Object>>() {
235+
new ArrayList<>() {
240236
{
241237
add(
242-
new LinkedHashMap<String, Object>() {
238+
new LinkedHashMap<>() {
243239
{
244240
put("line", 1);
245241
put("words", "I'm a lumberjack and I'm okay");
246242
}
247243
});
248244
add(
249-
new LinkedHashMap<String, Object>() {
245+
new LinkedHashMap<>() {
250246
{
251247
put("line", 2);
252248
put("words", "I sleep all night and I work all day");
253249
}
254250
});
255251
add(
256-
new LinkedHashMap<String, Object>() {
252+
new LinkedHashMap<>() {
257253
{
258254
put("line", 3);
259255
put("words", "He's a lumberjack and he's okay");
260256
}
261257
});
262258
add(
263-
new LinkedHashMap<String, Object>() {
259+
new LinkedHashMap<>() {
264260
{
265261
put("line", 4);
266262
put("words", "He sleeps all night and he works all day");
@@ -314,31 +310,31 @@ void chain2() {
314310
@SuppressWarnings("unchecked")
315311
void chain3() {
316312
final List<Map<String, Object>> lyrics =
317-
new ArrayList<Map<String, Object>>() {
313+
new ArrayList<>() {
318314
{
319315
add(
320-
new LinkedHashMap<String, Object>() {
316+
new LinkedHashMap<>() {
321317
{
322318
put("line", 1);
323319
put("words", "I'm a lumberjack and I'm okay");
324320
}
325321
});
326322
add(
327-
new LinkedHashMap<String, Object>() {
323+
new LinkedHashMap<>() {
328324
{
329325
put("line", 2);
330326
put("words", "I sleep all night and I work all day");
331327
}
332328
});
333329
add(
334-
new LinkedHashMap<String, Object>() {
330+
new LinkedHashMap<>() {
335331
{
336332
put("line", 3);
337333
put("words", "He's a lumberjack and he's okay");
338334
}
339335
});
340336
add(
341-
new LinkedHashMap<String, Object>() {
337+
new LinkedHashMap<>() {
342338
{
343339
put("line", 4);
344340
put("words", "He sleeps all night and he works all day");
@@ -396,10 +392,10 @@ void chain3() {
396392
@Test
397393
void chain4() {
398394
final List<Map<String, Object>> doctors =
399-
new ArrayList<Map<String, Object>>() {
395+
new ArrayList<>() {
400396
{
401397
add(
402-
new LinkedHashMap<String, Object>() {
398+
new LinkedHashMap<>() {
403399
{
404400
put("number", 1);
405401
put("actor", "William Hartnell");
@@ -408,7 +404,7 @@ void chain4() {
408404
}
409405
});
410406
add(
411-
new LinkedHashMap<String, Object>() {
407+
new LinkedHashMap<>() {
412408
{
413409
put("number", 9);
414410
put("actor", "Christopher Eccleston");
@@ -417,7 +413,7 @@ void chain4() {
417413
}
418414
});
419415
add(
420-
new LinkedHashMap<String, Object>() {
416+
new LinkedHashMap<>() {
421417
{
422418
put("number", 10);
423419
put("actor", "David Tennant");
@@ -434,7 +430,7 @@ void chain4() {
434430
.map(
435431
(Function<Map<String, Object>, Map<String, Object>>)
436432
item ->
437-
new LinkedHashMap<String, Object>() {
433+
new LinkedHashMap<>() {
438434
{
439435
put(
440436
"doctorNumber",
@@ -470,10 +466,10 @@ void chain4() {
470466
@Test
471467
void chain5() {
472468
final List<Map<String, Object>> doctors =
473-
new ArrayList<Map<String, Object>>() {
469+
new ArrayList<>() {
474470
{
475471
add(
476-
new LinkedHashMap<String, Object>() {
472+
new LinkedHashMap<>() {
477473
{
478474
put("number", 1);
479475
put("actor", "William Hartnell");
@@ -482,7 +478,7 @@ void chain5() {
482478
}
483479
});
484480
add(
485-
new LinkedHashMap<String, Object>() {
481+
new LinkedHashMap<>() {
486482
{
487483
put("number", 9);
488484
put("actor", "Christopher Eccleston");
@@ -491,7 +487,7 @@ void chain5() {
491487
}
492488
});
493489
add(
494-
new LinkedHashMap<String, Object>() {
490+
new LinkedHashMap<>() {
495491
{
496492
put("number", 10);
497493
put("actor", "David Tennant");

0 commit comments

Comments
 (0)