Skip to content

Commit 602b766

Browse files
javadevjavadev
authored
Sync with underscore-java
1 parent 27ca51f commit 602b766

File tree

7 files changed

+132
-75
lines changed

7 files changed

+132
-75
lines changed

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,12 @@
3434
import java.nio.channels.Channels;
3535
import java.nio.channels.ReadableByteChannel;
3636
import java.nio.charset.StandardCharsets;
37+
import java.nio.file.FileVisitResult;
3738
import java.nio.file.Files;
3839
import java.nio.file.Path;
3940
import java.nio.file.Paths;
41+
import java.nio.file.SimpleFileVisitor;
42+
import java.nio.file.attribute.BasicFileAttributes;
4043
import java.util.ArrayList;
4144
import java.util.Arrays;
4245
import java.util.Collection;
@@ -2851,6 +2854,39 @@ public static void fileJsonToXml(String jsonFileName, String xmlFileName) throws
28512854
fileJsonToXml(jsonFileName, xmlFileName, Xml.XmlStringBuilder.Step.TWO_SPACES);
28522855
}
28532856

2857+
public static void jsonFolderToXml(
2858+
String jsonFolder, String xmlFolder, Xml.XmlStringBuilder.Step identStep)
2859+
throws IOException {
2860+
Path sourceRoot = Paths.get(jsonFolder);
2861+
Path targetRoot = Paths.get(xmlFolder);
2862+
Files.walkFileTree(sourceRoot, new SimpleFileVisitor<>() {
2863+
@Override
2864+
public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException {
2865+
covertJsonToXml(path, sourceRoot, targetRoot, identStep);
2866+
return FileVisitResult.CONTINUE;
2867+
}
2868+
});
2869+
}
2870+
2871+
public static void jsonFolderToXml(String jsonFolder, String xmlFolder) throws IOException {
2872+
jsonFolderToXml(jsonFolder, xmlFolder, Xml.XmlStringBuilder.Step.TWO_SPACES);
2873+
}
2874+
2875+
public static void covertJsonToXml(Path path, Path sourceRoot, Path targetRoot,
2876+
Xml.XmlStringBuilder.Step identStep) throws IOException {
2877+
Path relativePath = sourceRoot.relativize(path);
2878+
String fileName = relativePath.getFileName().toString();
2879+
String xmlFileName;
2880+
if (fileName.endsWith(".json")) {
2881+
xmlFileName = fileName.substring(0, fileName.length() - 5) + ".xml";
2882+
} else {
2883+
return;
2884+
}
2885+
Path targetPath = targetRoot.resolve(relativePath).getParent().resolve(xmlFileName);
2886+
Files.createDirectories(targetPath.getParent());
2887+
fileJsonToXml(path.toAbsolutePath().toString(), targetPath.toString(), identStep);
2888+
}
2889+
28542890
public static void streamJsonToXml(
28552891
InputStream jsonInputStream,
28562892
OutputStream xmlOutputStream,

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ void chunkFill() {
318318
@Test
319319
void cycle() {
320320
assertEquals("[]", Underscore.cycle(Underscore.range(5), 0).toString());
321-
assertEquals("[]", Underscore.cycle(new ArrayList<Object>(), 5).toString());
321+
assertEquals("[]", Underscore.cycle(new ArrayList<>(), 5).toString());
322322
assertEquals("[4, 3, 2, 1, 0]", Underscore.cycle(Underscore.range(5), -1).toString());
323323
assertEquals(
324324
"[0, 1, 2, 0, 1, 2, 0, 1, 2]", Underscore.cycle(Underscore.range(3), 3).toString());
@@ -370,8 +370,8 @@ void interpose() {
370370
assertEquals(
371371
"[0, 500, 1, 500, 2, 500, 3]",
372372
Underscore.interpose(Underscore.range(4), 500).toString());
373-
assertEquals("[]", Underscore.interpose(new ArrayList<Integer>(), 500).toString());
374-
assertEquals("[]", Underscore.interpose(new ArrayList<Object>(), null).toString());
373+
assertEquals("[]", Underscore.interpose(new ArrayList<>(), 500).toString());
374+
assertEquals("[]", Underscore.interpose(new ArrayList<>(), null).toString());
375375
assertEquals(
376376
"[0, 1, 2, 3]",
377377
Underscore.interpose(Underscore.newArrayList(Underscore.range(4)), null)
@@ -384,7 +384,7 @@ void interpose() {
384384
assertEquals("[a, b]", new Underscore<>(singletonList("a, b")).interpose(null).toString());
385385
assertEquals("[a]", Underscore.chain(singletonList("a")).interpose("interpose").toString());
386386
assertEquals(
387-
"[]", Underscore.chain(new ArrayList<Object>()).interpose("interpose").toString());
387+
"[]", Underscore.chain(new ArrayList<>()).interpose("interpose").toString());
388388
assertEquals(
389389
"[a, b, c]", Underscore.chain(asList("a", "b", "c")).interpose(null).toString());
390390
assertEquals(
@@ -771,7 +771,7 @@ public String toString() {
771771
}
772772
}
773773
final int result =
774-
Underscore.<Person>sortedIndex(
774+
Underscore.sortedIndex(
775775
asList(
776776
new Person("moe", 40),
777777
new Person("moe", 50),
@@ -780,7 +780,7 @@ public String toString() {
780780
"age");
781781
assertEquals(1, result);
782782
final int result2 =
783-
Underscore.<Person>sortedIndex(
783+
Underscore.sortedIndex(
784784
asList(
785785
new Person("moe", 40),
786786
new Person("moe", 50),
@@ -789,7 +789,7 @@ public String toString() {
789789
"age");
790790
assertEquals(-1, result2);
791791
final int resultArray =
792-
Underscore.<Person>sortedIndex(
792+
Underscore.sortedIndex(
793793
new Person[] {
794794
new Person("moe", 40), new Person("moe", 50), new Person("curly", 60)
795795
},

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void average2() {
6262
assertEquals("2.0", result2.toString());
6363
final Double result3 = U.average(asList((float) 1, (float) 2, (float) 3));
6464
assertEquals("2.0", result3.toString());
65-
final Double result4 = U.average(asList((int) 1, (int) 2, (int) 3));
65+
final Double result4 = U.average(asList(1, 2, 3));
6666
assertEquals("2.0", result4.toString());
6767
final Double result5 = U.average(asList((long) 1, (long) 2, (long) 3));
6868
assertEquals("2.0", result5.toString());
@@ -88,13 +88,13 @@ void average2() {
8888

8989
@Test
9090
void average3() {
91-
final Double result10 = U.average(asList(1, (Integer) null));
91+
final Double result10 = U.average(asList(1, null));
9292
assertEquals("0.5", result10.toString());
93-
final Double result11 = U.average(asList((double) 0.2, (double) 0.1, Math.PI));
93+
final Double result11 = U.average(asList(0.2, 0.1, Math.PI));
9494
assertEquals(Double.valueOf((0.2 + 0.1 + Math.PI) / 3).toString(), result11.toString());
95-
final Double result12 = U.average(asList((double) 0, (double) 14, (double) 0.2));
95+
final Double result12 = U.average(asList((double) 0, (double) 14, 0.2));
9696
assertEquals(Double.valueOf((0 + 14 + 0.2) / 3), result12);
97-
final Double result13 = U.average(asList((int) -1, (int) -2, (int) -3));
97+
final Double result13 = U.average(asList(-1, -2, -3));
9898
assertEquals("-2.0", result13.toString());
9999
final Double result14 = U.average(new Integer[] {1, 2, 3});
100100
assertEquals("2.0", result14.toString());
@@ -174,7 +174,7 @@ void average6() {
174174
assertEquals("3.0", result41.toString());
175175
final Double result42 = U.average(Long.valueOf(2), Long.valueOf(4));
176176
assertEquals("3.0", result42.toString());
177-
final Double result43 = U.average(new Integer[] {(Integer) null});
177+
final Double result43 = U.average(new Integer[] {null});
178178
assertNull(result43);
179179
}
180180

@@ -200,7 +200,7 @@ void sum() {
200200
assertEquals("6.0", result2.toString());
201201
final Float result3 = U.sum(asList((float) 1, (float) 2, (float) 3));
202202
assertEquals("6.0", result3.toString());
203-
final Integer result4 = U.sum(asList((int) 1, (int) 2, (int) 3));
203+
final Integer result4 = U.sum(asList(1, 2, 3));
204204
assertEquals("6", result4.toString());
205205
final Long result5 = U.sum(asList((long) 1, (long) 2, (long) 3));
206206
assertEquals("6", result5.toString());
@@ -212,18 +212,18 @@ void sum() {
212212
final BigInteger result8 =
213213
U.sum(asList(BigInteger.valueOf(1), BigInteger.valueOf(2), BigInteger.valueOf(3)));
214214
assertEquals("6", result8.toString());
215-
final Integer result9 = U.sum(Collections.singletonList((Integer) null));
215+
final Integer result9 = U.sum(Collections.singletonList(null));
216216
assertNull(result9);
217-
final Integer result10 = U.sum(asList(1, (Integer) null));
217+
final Integer result10 = U.sum(asList(1, null));
218218
assertEquals("1", result10.toString());
219-
final Double result11 = U.sum(asList((double) 0.2, (double) 0.1, Math.PI));
219+
final Double result11 = U.sum(asList(0.2, 0.1, Math.PI));
220220
assertEquals(Double.valueOf(0.2 + 0.1 + Math.PI).toString(), result11.toString());
221-
final Double result12 = U.sum(asList((double) 0, (double) 14, (double) 0.2));
221+
final Double result12 = U.sum(asList((double) 0, (double) 14, 0.2));
222222
assertEquals("14.2", result12.toString());
223-
final Integer result13 = U.sum(asList((int) -1, (int) -2, (int) -3));
223+
final Integer result13 = U.sum(asList(-1, -2, -3));
224224
assertEquals("-6", result13.toString());
225225
final Integer resultChain =
226-
(Integer) U.chain(asList((int) 1, (int) 2, (int) 3)).sum().item();
226+
(Integer) U.chain(asList(1, 2, 3)).sum().item();
227227
assertEquals("6", resultChain.toString());
228228
final Integer result14 = U.sum(new Integer[] {1, 2, 3});
229229
assertEquals("6", result14.toString());
@@ -250,9 +250,9 @@ void sum() {
250250
final Integer result21 = U.sum(new Integer[] {1, 2, null});
251251
assertEquals("3", result21.toString());
252252
final Integer resultChainFunc =
253-
(Integer) U.chain(asList((int) 1, (int) 2, (int) 3)).sum(item -> item * 2).item();
253+
U.chain(asList(1, 2, 3)).sum(item -> item * 2).item();
254254
assertEquals("12", resultChainFunc.toString());
255-
final Number resultObj = new U(asList((int) 1, (int) 2, (int) 3)).sum();
255+
final Number resultObj = new U(asList(1, 2, 3)).sum();
256256
assertEquals("6", resultObj.toString());
257257
final Number resultObjFunc =
258258
new U(asList((byte) 1, (byte) 2, (byte) 3))
@@ -296,7 +296,7 @@ public double doubleValue() {
296296
void subtract() {
297297
assertEquals("-1", U.subtract((byte) 1, (byte) 2).toString());
298298
assertEquals("-1", U.subtract((short) 1, (short) 2).toString());
299-
assertEquals("-1", U.subtract((int) 1, (int) 2).toString());
299+
assertEquals("-1", U.subtract(1, 2).toString());
300300
assertEquals("-1", U.subtract((long) 1, (long) 2).toString());
301301
assertEquals("-1.0", U.subtract((float) 1, (float) 2).toString());
302302
assertEquals("-1.0", U.subtract((double) 1, (double) 2).toString());
@@ -308,9 +308,9 @@ void subtract() {
308308
assertEquals("-1.0", U.subtract(1d, 2d).toString());
309309
assertEquals("-1", U.subtract(BigDecimal.valueOf(1), BigDecimal.valueOf(2)).toString());
310310
assertEquals("-1", U.subtract(BigInteger.valueOf(1), BigInteger.valueOf(2)).toString());
311-
assertEquals("-1", U.subtract((Number) 1, (Number) 2).toString());
312-
assertEquals("-4", U.subtract((int) 1, (int) 2, (int) 3).toString());
313-
assertEquals("1", U.subtract((int) 1).toString());
311+
assertEquals("-1", U.subtract(1, (Number) 2).toString());
312+
assertEquals("-4", U.subtract(1, 2, 3).toString());
313+
assertEquals("1", U.subtract(1).toString());
314314
assertEquals((Object) null, U.subtract());
315315
}
316316

@@ -346,12 +346,12 @@ public double doubleValue() {
346346
@SuppressWarnings("unchecked")
347347
@Test
348348
void mean() {
349-
final Double result = U.mean(asList((double) 0, (double) 0.5, (double) 1));
349+
final Double result = U.mean(asList((double) 0, 0.5, (double) 1));
350350
assertEquals("0.5", result.toString());
351-
final Double resultObj = new U(asList((double) 0, (double) 0.5, (double) 1)).mean();
351+
final Double resultObj = new U(asList((double) 0, 0.5, (double) 1)).mean();
352352
assertEquals("0.5", resultObj.toString());
353353
final Double resultChain =
354-
(Double) U.chain(asList((double) 0, (double) 0.5, (double) 1)).mean().item();
354+
U.chain(asList((double) 0, 0.5, (double) 1)).mean().item();
355355
assertEquals("0.5", resultChain.toString());
356356
final Double result2 = U.mean(asList((long) 0, (long) 1, (long) 2));
357357
assertEquals("1.0", result2.toString());
@@ -372,20 +372,20 @@ void mean() {
372372
@SuppressWarnings("unchecked")
373373
@Test
374374
void median() {
375-
final Double result = U.median(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5));
375+
final Double result = U.median(asList(0, 0, 0, 0, 5));
376376
assertEquals("0.0", result.toString());
377377
final Double resultObj =
378-
new U<>(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5)).median();
378+
new U<>(asList(0, 0, 0, 0, 5)).median();
379379
assertEquals("0.0", resultObj.toString());
380380
final Double resultChain =
381-
U.chain(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5)).median().item();
381+
U.chain(asList(0, 0, 0, 0, 5)).median().item();
382382
assertEquals("0.0", resultChain.toString());
383-
final Double result2 = U.median(asList((int) 0, (int) 0, (int) 1, (int) 2, (int) 5));
383+
final Double result2 = U.median(asList(0, 0, 1, 2, 5));
384384
assertEquals("1.0", result2.toString());
385-
final Double result3 = U.median(asList((int) 0, (int) 0, (int) 1, (int) 2));
385+
final Double result3 = U.median(asList(0, 0, 1, 2));
386386
assertEquals("0.5", result3.toString());
387387
final Double result4 =
388-
U.median(asList((int) 0, (int) 0, (int) 1, (int) 2, (int) 3, (int) 4));
388+
U.median(asList(0, 0, 1, 2, 3, 4));
389389
assertEquals("1.5", result4.toString());
390390
}
391391

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void camelCase() {
8585
@Test
8686
void explode() {
8787
assertEquals(asList("a", "b", "c"), U.explode("abc"));
88-
assertEquals(new ArrayList<Object>(), U.explode(null));
88+
assertEquals(new ArrayList<>(), U.explode(null));
8989
}
9090

9191
/*
@@ -189,7 +189,7 @@ void endsWith() {
189189
assertTrue(new U<String>("abc").endsWith("b", 2));
190190
assertTrue(U.chain("abc").endsWith("b", 2).item());
191191
assertFalse(U.endsWith("abc", "c", -4));
192-
assertFalse(U.endsWith((String) null, (String) null));
192+
assertFalse(U.endsWith(null, (String) null));
193193
assertFalse(U.endsWith("1", (String) null));
194194
assertFalse(U.endsWith(null, "1"));
195195
assertTrue(U.endsWith("1", "1"));
@@ -274,7 +274,7 @@ void startsWith() {
274274
assertTrue(new U<String>("abc").startsWith("b", 1));
275275
assertTrue(U.chain("abc").startsWith("b", 1).item());
276276
assertFalse(U.startsWith("abc", "c", -4));
277-
assertFalse(U.startsWith((String) null, (String) null));
277+
assertFalse(U.startsWith(null, (String) null));
278278
assertFalse(U.startsWith("1", (String) null));
279279
assertFalse(U.startsWith(null, "1"));
280280
assertTrue(U.startsWith("1", "1"));
@@ -1041,21 +1041,21 @@ void testDecodeParseErr14() {
10411041
void testXmlArray() {
10421042
XmlStringBuilder builder = new XmlStringBuilder();
10431043
Xml.XmlArray.writeXml(
1044-
null, null, builder, false, Collections.<String>emptySet(), false, ARRAY_TRUE);
1044+
null, null, builder, false, Collections.emptySet(), false, ARRAY_TRUE);
10451045
assertEquals(
10461046
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<root>\nnull\n</root>",
10471047
builder.toString());
10481048
builder = new XmlStringBuilder();
10491049
Xml.XmlArray.writeXml(
10501050
new ArrayList<String>() {
10511051
{
1052-
add((String) null);
1052+
add(null);
10531053
}
10541054
},
10551055
null,
10561056
builder,
10571057
false,
1058-
Collections.<String>emptySet(),
1058+
Collections.emptySet(),
10591059
false,
10601060
ARRAY_TRUE);
10611061
assertEquals(
@@ -1066,13 +1066,13 @@ void testXmlArray() {
10661066
Xml.XmlArray.writeXml(
10671067
new ArrayList<String>() {
10681068
{
1069-
add((String) null);
1069+
add(null);
10701070
}
10711071
},
10721072
"name",
10731073
builder,
10741074
false,
1075-
Collections.<String>emptySet(),
1075+
Collections.emptySet(),
10761076
false,
10771077
ARRAY_TRUE);
10781078
assertEquals(
@@ -1470,7 +1470,7 @@ void testXmlObjectArrayToString() {
14701470

14711471
builder = new XmlStringBuilder();
14721472
Xml.XmlArray.writeXml(
1473-
new Object[0], null, builder, false, Collections.<String>emptySet(), ARRAY_TRUE);
1473+
new Object[0], null, builder, false, Collections.emptySet(), ARRAY_TRUE);
14741474
assertEquals(
14751475
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<root>\n <element></element>\n</root>",
14761476
builder.toString());
@@ -1481,7 +1481,7 @@ void testXmlObjectArrayToString() {
14811481
null,
14821482
builder,
14831483
false,
1484-
Collections.<String>emptySet(),
1484+
Collections.emptySet(),
14851485
ARRAY_TRUE);
14861486
assertEquals(
14871487
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<root>\n <element>Hello</element>\n</root>",
@@ -1493,7 +1493,7 @@ void testXmlObjectArrayToString() {
14931493
null,
14941494
builder,
14951495
false,
1496-
Collections.<String>emptySet(),
1496+
Collections.emptySet(),
14971497
ARRAY_TRUE);
14981498
assertEquals(
14991499
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<root>\n <element>Hello</element>\n"
@@ -3563,7 +3563,7 @@ void fromJsonStackoverflowObject() throws IOException {
35633563
try {
35643564
U.fromJsonMap(stringJson);
35653565
} catch (Throwable throwable) {
3566-
assertTrue(throwable instanceof StackOverflowError);
3566+
assertInstanceOf(StackOverflowError.class, throwable);
35673567
}
35683568
}
35693569

@@ -3733,7 +3733,7 @@ void main() {
37333733
U.main(new String[] {});
37343734
new U<>(new ArrayList<>());
37353735
new U<String>("");
3736-
new U<>(Collections.<Object>emptyList()).chain();
3736+
new U<>(Collections.emptyList()).chain();
37373737
U.chain(new ArrayList<String>());
37383738
U.chain(new HashSet<String>());
37393739
assertNull(U.chain(new String[] {}).item());

0 commit comments

Comments
 (0)