Skip to content

Commit 714265e

Browse files
javadevjavadev
authored
Improved source format
1 parent af3f470 commit 714265e

File tree

10 files changed

+143
-153
lines changed

10 files changed

+143
-153
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ public JsonStringBuilder append(final String string) {
8383
}
8484

8585
public JsonStringBuilder fillSpaces() {
86-
builder.append(String.valueOf(identStep == Step.TABS ? '\t' : ' ').repeat(Math.max(0, indent)));
86+
builder.append(
87+
String.valueOf(identStep == Step.TABS ? '\t' : ' ')
88+
.repeat(Math.max(0, indent)));
8789
return this;
8890
}
8991

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

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,7 @@ public class U<T> extends Underscore<T> {
9898
private static final String YES = "yes";
9999
private static final java.util.regex.Pattern RE_WORDS =
100100
java.util.regex.Pattern.compile(
101-
UPPER
102-
+ "+(?="
103-
+ UPPER
104-
+ LOWER
105-
+ ")|"
106-
+ UPPER
107-
+ "?"
108-
+ LOWER
109-
+ "|"
110-
+ UPPER
101+
UPPER + "+(?=" + UPPER + LOWER + ")|" + UPPER + "?" + LOWER + "|" + UPPER
111102
+ "+|\\d+");
112103

113104
static {
@@ -2069,8 +2060,7 @@ public static long downloadUrl(final String url, final String fileName)
20692060

20702061
public static void decompressGzip(final String sourceFileName, final String targetFileName)
20712062
throws IOException {
2072-
try (GZIPInputStream gis =
2073-
new GZIPInputStream(new FileInputStream(sourceFileName))) {
2063+
try (GZIPInputStream gis = new GZIPInputStream(new FileInputStream(sourceFileName))) {
20742064
Files.copy(gis, Paths.get(targetFileName));
20752065
}
20762066
}
@@ -2524,12 +2514,16 @@ public static <T> String join(final Iterable<T> iterable, final String separator
25242514
return Underscore.join(iterable, separator);
25252515
}
25262516

2527-
public static <T> String joinToString(final Iterable<T> iterable, final String separator,
2528-
final String prefix, final String postfix,
2529-
final int limit,
2530-
final String truncated,
2531-
final Function<T, String> transform) {
2532-
return Underscore.joinToString(iterable, separator, prefix, postfix, limit, truncated, transform);
2517+
public static <T> String joinToString(
2518+
final Iterable<T> iterable,
2519+
final String separator,
2520+
final String prefix,
2521+
final String postfix,
2522+
final int limit,
2523+
final String truncated,
2524+
final Function<T, String> transform) {
2525+
return Underscore.joinToString(
2526+
iterable, separator, prefix, postfix, limit, truncated, transform);
25332527
}
25342528

25352529
public static String toJson(Collection collection) {
@@ -2914,8 +2908,7 @@ public static Map<String, Object> removeMinusesAndConvertNumbers(Map<String, Obj
29142908
} else {
29152909
newKey = entry.getKey();
29162910
}
2917-
if (!entry.getKey().equals(SELF_CLOSING)
2918-
&& !entry.getKey().equals(OMIT_XML_DECL)) {
2911+
if (!entry.getKey().equals(SELF_CLOSING) && !entry.getKey().equals(OMIT_XML_DECL)) {
29192912
outMap.put(newKey, makeObject(entry.getValue()));
29202913
}
29212914
}

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,9 +2100,7 @@ public static <T> java.util.concurrent.ScheduledFuture<T> delay(
21002100
java.util.concurrent.Executors.newSingleThreadScheduledExecutor();
21012101
try {
21022102
return scheduler.schedule(
2103-
function::get,
2104-
delayMilliseconds,
2105-
java.util.concurrent.TimeUnit.MILLISECONDS);
2103+
function::get, delayMilliseconds, java.util.concurrent.TimeUnit.MILLISECONDS);
21062104
} finally {
21072105
scheduler.shutdown();
21082106
}
@@ -3319,11 +3317,14 @@ public static <T> String join(final Iterable<T> iterable, final String separator
33193317
return sb.toString();
33203318
}
33213319

3322-
public static <T> String joinToString(final Iterable<T> iterable, final String separator,
3323-
final String prefix, final String postfix,
3324-
final int limit,
3325-
final String truncated,
3326-
final Function<T, String> transform) {
3320+
public static <T> String joinToString(
3321+
final Iterable<T> iterable,
3322+
final String separator,
3323+
final String prefix,
3324+
final String postfix,
3325+
final int limit,
3326+
final String truncated,
3327+
final Function<T, String> transform) {
33273328
final StringBuilder sb = new StringBuilder();
33283329
int index = 0;
33293330
if (prefix != null) {
@@ -3344,7 +3345,8 @@ public static <T> String joinToString(final Iterable<T> iterable, final String s
33443345
return sb.toString();
33453346
}
33463347

3347-
private static void joinToStringPostfix(String postfix, int limit, String truncated, int index, StringBuilder sb) {
3348+
private static void joinToStringPostfix(
3349+
String postfix, int limit, String truncated, int index, StringBuilder sb) {
33483350
if (limit >= 0 && index > limit) {
33493351
sb.append(truncated == null ? "..." : truncated);
33503352
}

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,14 @@
3838
import java.util.function.BiFunction;
3939
import java.util.function.Function;
4040

41-
@SuppressWarnings({"java:S107", "java:S1119", "java:S2583", "java:S3740", "java:S3776", "java:S4276"})
41+
@SuppressWarnings({
42+
"java:S107",
43+
"java:S1119",
44+
"java:S2583",
45+
"java:S3740",
46+
"java:S3776",
47+
"java:S4276"
48+
})
4249
public final class Xml {
4350
private Xml() {}
4451

@@ -1887,15 +1894,13 @@ public static Object fromXmlWithoutNamespaces(final String xml) {
18871894
(object, namespaces) -> {
18881895
final String localString = String.valueOf(object);
18891896
final String result;
1890-
String substring = localString.substring(
1891-
Math.max(0, localString.indexOf(':') + 1));
1897+
String substring =
1898+
localString.substring(Math.max(0, localString.indexOf(':') + 1));
18921899
if (localString.startsWith("-")
18931900
&& namespaces.contains(
18941901
localString.substring(
18951902
1, Math.max(1, localString.indexOf(':'))))) {
1896-
result =
1897-
"-"
1898-
+ substring;
1903+
result = "-" + substring;
18991904
} else if (namespaces.contains(
19001905
localString.substring(0, Math.max(0, localString.indexOf(':'))))) {
19011906
result = substring;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,8 @@ void lastOrNull() {
659659
void compact() {
660660
final List<?> result = Underscore.compact(asList(0, 1, false, 2, "", 3));
661661
assertEquals("[1, 2, 3]", result.toString());
662-
final List<?> result2 = Underscore.compactList(Arrays.<Object>asList(0, 1, false, 2, "", 3), 1);
662+
final List<?> result2 =
663+
Underscore.compactList(Arrays.<Object>asList(0, 1, false, 2, "", 3), 1);
663664
assertEquals("[0, false, 2, , 3]", result2.toString());
664665
final List<?> result3 = Underscore.compact(asList(0, 1, null, 2, "", 3));
665666
assertEquals("[1, 2, 3]", result3.toString());

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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,8 +1301,7 @@ void sortWith() {
13011301
Underscore.sortWith(
13021302
asList(1, 2, 3, 4, 5, 6),
13031303
(item1, item2) ->
1304-
(int) (Math.sin(item1) * 1000)
1305-
- (int) (Math.sin(item2) * 1000));
1304+
(int) (Math.sin(item1) * 1000) - (int) (Math.sin(item2) * 1000));
13061305
assertEquals("[5, 4, 6, 3, 1, 2]", result.toString());
13071306
final List<Integer> resultObj =
13081307
new Underscore(asList(1, 2, 3, 4, 5, 6))
@@ -1318,8 +1317,7 @@ void sortWith() {
13181317
(Comparator<Integer>)
13191318
(item1, item2) ->
13201319
(int) (Math.sin(item1) * 1000)
1321-
- (int) (Math.sin(item2) * 1000)
1322-
)
1320+
- (int) (Math.sin(item2) * 1000))
13231321
.value();
13241322
assertEquals("[5, 4, 6, 3, 1, 2]", resultChain.toString());
13251323
}
@@ -1332,15 +1330,11 @@ void sortWith() {
13321330
@SuppressWarnings("unchecked")
13331331
void sortBy() {
13341332
final List<Integer> result =
1335-
Underscore.sortBy(
1336-
asList(1, 2, 3, 4, 5, 6),
1337-
item -> (int) (Math.sin(item) * 1000));
1333+
Underscore.sortBy(asList(1, 2, 3, 4, 5, 6), item -> (int) (Math.sin(item) * 1000));
13381334
assertEquals("[5, 4, 6, 3, 1, 2]", result.toString());
13391335
final List<Integer> resultObj =
13401336
new Underscore(asList(1, 2, 3, 4, 5, 6))
1341-
.sortBy(
1342-
(Function<Integer, Integer>)
1343-
item -> (int) (Math.sin(item) * 1000));
1337+
.sortBy((Function<Integer, Integer>) item -> (int) (Math.sin(item) * 1000));
13441338
assertEquals("[5, 4, 6, 3, 1, 2]", resultObj.toString());
13451339
final List<Integer> resultChain =
13461340
Underscore.chain(asList(1, 2, 3, 4, 5, 6))
@@ -1719,8 +1713,7 @@ public Integer next() {
17191713
}
17201714

17211715
@Override
1722-
public void remove() {
1723-
}
1716+
public void remove() {}
17241717
};
17251718
assertEquals(6, Underscore.size(iterable));
17261719
assertEquals(5, Underscore.size(new Integer[] {5, 4, 3, 2, 1}));

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

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,9 @@ void set() {
411411
assertEquals(
412412
"d",
413413
U.<String>set(
414-
(Map<String, Object>) U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"),
415-
"a[0].b.c",
416-
"e"));
414+
(Map<String, Object>) U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"),
415+
"a[0].b.c",
416+
"e"));
417417
assertEquals(
418418
"{b={c=d}}",
419419
U.set(
@@ -615,24 +615,25 @@ void fetchGet() {
615615
"https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json");
616616
result.json();
617617
result.jsonMap();
618-
assertEquals("{\n"
619-
+ " \"fruit\": \"Apple\",\n"
620-
+ " \"size\": \"Large\",\n"
621-
+ " \"color\": \"Red\"\n"
622-
+ "}",
623-
result.text());
624-
assertEquals("Apple",
625-
U.get((Map<String, Object>) result.json(), "fruit"));
618+
assertEquals(
619+
"{\n"
620+
+ " \"fruit\": \"Apple\",\n"
621+
+ " \"size\": \"Large\",\n"
622+
+ " \"color\": \"Red\"\n"
623+
+ "}",
624+
result.text());
625+
assertEquals("Apple", U.get((Map<String, Object>) result.json(), "fruit"));
626626
U.Chain<?> resultChain =
627627
U.chain(
628628
"https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json")
629629
.fetch();
630-
assertEquals("{\n"
631-
+ " \"fruit\": \"Apple\",\n"
632-
+ " \"size\": \"Large\",\n"
633-
+ " \"color\": \"Red\"\n"
634-
+ "}",
635-
resultChain.item());
630+
assertEquals(
631+
"{\n"
632+
+ " \"fruit\": \"Apple\",\n"
633+
+ " \"size\": \"Large\",\n"
634+
+ " \"color\": \"Red\"\n"
635+
+ "}",
636+
resultChain.item());
636637
U.chain(
637638
"https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json")
638639
.fetch();
@@ -665,12 +666,13 @@ void fetchGetWithTimeouts() {
665666
"https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json",
666667
30000,
667668
30000);
668-
assertEquals("{\n"
669-
+ " \"fruit\": \"Apple\",\n"
670-
+ " \"size\": \"Large\",\n"
671-
+ " \"color\": \"Red\"\n"
672-
+ "}",
673-
result.text());
669+
assertEquals(
670+
"{\n"
671+
+ " \"fruit\": \"Apple\",\n"
672+
+ " \"size\": \"Large\",\n"
673+
+ " \"color\": \"Red\"\n"
674+
+ "}",
675+
result.text());
674676
}
675677

676678
@Test
@@ -730,7 +732,7 @@ void fetchPut() {
730732
+ " \"fireBreath\": 10"
731733
+ " }"
732734
+ "}");
733-
assertEquals(403, result.getStatus());
735+
assertEquals(403, result.getStatus());
734736
U.FetchResponse result2 =
735737
U.fetch(
736738
"https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json",
@@ -760,13 +762,15 @@ void fetchPut() {
760762
+ " \"fireBreath\": 10"
761763
+ " }"
762764
+ "}");
763-
assertEquals("<html>\n"
764-
+ "<head><title>301 Moved Permanently</title></head>\n"
765-
+ "<body>\n"
766-
+ "<center><h1>301 Moved Permanently</h1></center>\n"
767-
+ "<hr><center>cloudflare</center>\n"
768-
+ "</body>\n"
769-
+ "</html>\n", resultChain.item().replace("\r\n", "\n"));
765+
assertEquals(
766+
"<html>\n"
767+
+ "<head><title>301 Moved Permanently</title></head>\n"
768+
+ "<body>\n"
769+
+ "<center><h1>301 Moved Permanently</h1></center>\n"
770+
+ "<hr><center>cloudflare</center>\n"
771+
+ "</body>\n"
772+
+ "</html>\n",
773+
resultChain.item().replace("\r\n", "\n"));
770774
}
771775

772776
@Test
@@ -1029,15 +1033,15 @@ void xmpToJson4() {
10291033

10301034
@Test
10311035
void xmpToJson5() {
1032-
assertEquals("{\n"
1036+
assertEquals(
1037+
"{\n"
10331038
+ " \"Comment\": {\n"
10341039
+ " \"-stringValue\": \"============================\",\n"
10351040
+ " \"-self-closing\": \"true\"\n"
10361041
+ " },\n"
10371042
+ " \"#omit-xml-declaration\": \"yes\"\n"
10381043
+ "}",
1039-
U.xmlToJson(
1040-
"<Comment stringValue=\"============================\"/>"));
1044+
U.xmlToJson("<Comment stringValue=\"============================\"/>"));
10411045
}
10421046

10431047
@Test
@@ -1054,15 +1058,13 @@ void xmlToJsonMinimum() {
10541058
+ "}",
10551059
U.xmlToJsonMinimum("<root><element>1</element><element>2</element><a/></root>"));
10561060
assertEquals(
1057-
"[\n"
1058-
+ " \"a\",\n"
1059-
+ " \"b\"\n"
1060-
+ "]",
1061-
U.xmlToJsonMinimum("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
1062-
+ "<root>\n"
1063-
+ " <element>a</element>\n"
1064-
+ " <element>b</element>\n"
1065-
+ "</root>"));
1061+
"[\n" + " \"a\",\n" + " \"b\"\n" + "]",
1062+
U.xmlToJsonMinimum(
1063+
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
1064+
+ "<root>\n"
1065+
+ " <element>a</element>\n"
1066+
+ " <element>b</element>\n"
1067+
+ "</root>"));
10661068
}
10671069

10681070
@Test
@@ -1357,13 +1359,13 @@ void jsonToXml() {
13571359

13581360
@Test
13591361
void jsonToXmlMinimum() {
1360-
assertEquals("<a></a>",
1361-
U.jsonToXmlMinimum("{\n \"a\": {\n }\n}"));
1362-
assertEquals("<a></a>",
1362+
assertEquals("<a></a>", U.jsonToXmlMinimum("{\n \"a\": {\n }\n}"));
1363+
assertEquals(
1364+
"<a></a>",
13631365
U.jsonToXmlMinimum("{\n \"a\": {\n }\n}", Xml.XmlStringBuilder.Step.TWO_SPACES));
1364-
assertEquals("<root empty-array=\"true\"></root>",
1365-
U.jsonToXmlMinimum("[]"));
1366-
assertEquals("<root>\n"
1366+
assertEquals("<root empty-array=\"true\"></root>", U.jsonToXmlMinimum("[]"));
1367+
assertEquals(
1368+
"<root>\n"
13671369
+ " <a>\n"
13681370
+ " <b>1</b>\n"
13691371
+ " </a>\n"

0 commit comments

Comments
 (0)