From 90efa491ee3dfd7f9f78d495cf4afe2c895b82e7 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Thu, 13 Feb 2025 08:08:15 +0200 Subject: [PATCH] Improved source format --- src/main/java/com/github/underscore/Json.java | 4 +- src/main/java/com/github/underscore/U.java | 33 +++--- .../com/github/underscore/Underscore.java | 20 ++-- src/main/java/com/github/underscore/Xml.java | 17 +-- .../com/github/underscore/ArraysTest.java | 3 +- .../github/underscore/CollectionsTest.java | 17 +-- .../com/github/underscore/LodashTest.java | 100 +++++++++--------- .../com/github/underscore/StringTest.java | 48 +++------ .../com/github/underscore/UnderscoreTest.java | 48 +++++---- .../com/github/underscore/UtilityTest.java | 6 +- 10 files changed, 143 insertions(+), 153 deletions(-) diff --git a/src/main/java/com/github/underscore/Json.java b/src/main/java/com/github/underscore/Json.java index 7f220dc6..1a054d09 100644 --- a/src/main/java/com/github/underscore/Json.java +++ b/src/main/java/com/github/underscore/Json.java @@ -83,7 +83,9 @@ public JsonStringBuilder append(final String string) { } public JsonStringBuilder fillSpaces() { - builder.append(String.valueOf(identStep == Step.TABS ? '\t' : ' ').repeat(Math.max(0, indent))); + builder.append( + String.valueOf(identStep == Step.TABS ? '\t' : ' ') + .repeat(Math.max(0, indent))); return this; } diff --git a/src/main/java/com/github/underscore/U.java b/src/main/java/com/github/underscore/U.java index c338e237..0e868f92 100644 --- a/src/main/java/com/github/underscore/U.java +++ b/src/main/java/com/github/underscore/U.java @@ -98,16 +98,7 @@ public class U extends Underscore { private static final String YES = "yes"; private static final java.util.regex.Pattern RE_WORDS = java.util.regex.Pattern.compile( - UPPER - + "+(?=" - + UPPER - + LOWER - + ")|" - + UPPER - + "?" - + LOWER - + "|" - + UPPER + UPPER + "+(?=" + UPPER + LOWER + ")|" + UPPER + "?" + LOWER + "|" + UPPER + "+|\\d+"); static { @@ -2069,8 +2060,7 @@ public static long downloadUrl(final String url, final String fileName) public static void decompressGzip(final String sourceFileName, final String targetFileName) throws IOException { - try (GZIPInputStream gis = - new GZIPInputStream(new FileInputStream(sourceFileName))) { + try (GZIPInputStream gis = new GZIPInputStream(new FileInputStream(sourceFileName))) { Files.copy(gis, Paths.get(targetFileName)); } } @@ -2524,12 +2514,16 @@ public static String join(final Iterable iterable, final String separator return Underscore.join(iterable, separator); } - public static String joinToString(final Iterable iterable, final String separator, - final String prefix, final String postfix, - final int limit, - final String truncated, - final Function transform) { - return Underscore.joinToString(iterable, separator, prefix, postfix, limit, truncated, transform); + public static String joinToString( + final Iterable iterable, + final String separator, + final String prefix, + final String postfix, + final int limit, + final String truncated, + final Function transform) { + return Underscore.joinToString( + iterable, separator, prefix, postfix, limit, truncated, transform); } public static String toJson(Collection collection) { @@ -2914,8 +2908,7 @@ public static Map removeMinusesAndConvertNumbers(Map java.util.concurrent.ScheduledFuture delay( java.util.concurrent.Executors.newSingleThreadScheduledExecutor(); try { return scheduler.schedule( - function::get, - delayMilliseconds, - java.util.concurrent.TimeUnit.MILLISECONDS); + function::get, delayMilliseconds, java.util.concurrent.TimeUnit.MILLISECONDS); } finally { scheduler.shutdown(); } @@ -3319,11 +3317,14 @@ public static String join(final Iterable iterable, final String separator return sb.toString(); } - public static String joinToString(final Iterable iterable, final String separator, - final String prefix, final String postfix, - final int limit, - final String truncated, - final Function transform) { + public static String joinToString( + final Iterable iterable, + final String separator, + final String prefix, + final String postfix, + final int limit, + final String truncated, + final Function transform) { final StringBuilder sb = new StringBuilder(); int index = 0; if (prefix != null) { @@ -3344,7 +3345,8 @@ public static String joinToString(final Iterable iterable, final String s return sb.toString(); } - private static void joinToStringPostfix(String postfix, int limit, String truncated, int index, StringBuilder sb) { + private static void joinToStringPostfix( + String postfix, int limit, String truncated, int index, StringBuilder sb) { if (limit >= 0 && index > limit) { sb.append(truncated == null ? "..." : truncated); } diff --git a/src/main/java/com/github/underscore/Xml.java b/src/main/java/com/github/underscore/Xml.java index 3ed2173a..0770a0cc 100644 --- a/src/main/java/com/github/underscore/Xml.java +++ b/src/main/java/com/github/underscore/Xml.java @@ -38,7 +38,14 @@ import java.util.function.BiFunction; import java.util.function.Function; -@SuppressWarnings({"java:S107", "java:S1119", "java:S2583", "java:S3740", "java:S3776", "java:S4276"}) +@SuppressWarnings({ + "java:S107", + "java:S1119", + "java:S2583", + "java:S3740", + "java:S3776", + "java:S4276" +}) public final class Xml { private Xml() {} @@ -1887,15 +1894,13 @@ public static Object fromXmlWithoutNamespaces(final String xml) { (object, namespaces) -> { final String localString = String.valueOf(object); final String result; - String substring = localString.substring( - Math.max(0, localString.indexOf(':') + 1)); + String substring = + localString.substring(Math.max(0, localString.indexOf(':') + 1)); if (localString.startsWith("-") && namespaces.contains( localString.substring( 1, Math.max(1, localString.indexOf(':'))))) { - result = - "-" - + substring; + result = "-" + substring; } else if (namespaces.contains( localString.substring(0, Math.max(0, localString.indexOf(':'))))) { result = substring; diff --git a/src/test/java/com/github/underscore/ArraysTest.java b/src/test/java/com/github/underscore/ArraysTest.java index 0615f97b..718e18bb 100644 --- a/src/test/java/com/github/underscore/ArraysTest.java +++ b/src/test/java/com/github/underscore/ArraysTest.java @@ -659,7 +659,8 @@ void lastOrNull() { void compact() { final List result = Underscore.compact(asList(0, 1, false, 2, "", 3)); assertEquals("[1, 2, 3]", result.toString()); - final List result2 = Underscore.compactList(Arrays.asList(0, 1, false, 2, "", 3), 1); + final List result2 = + Underscore.compactList(Arrays.asList(0, 1, false, 2, "", 3), 1); assertEquals("[0, false, 2, , 3]", result2.toString()); final List result3 = Underscore.compact(asList(0, 1, null, 2, "", 3)); assertEquals("[1, 2, 3]", result3.toString()); diff --git a/src/test/java/com/github/underscore/CollectionsTest.java b/src/test/java/com/github/underscore/CollectionsTest.java index 3fe01ef5..9db87d8a 100644 --- a/src/test/java/com/github/underscore/CollectionsTest.java +++ b/src/test/java/com/github/underscore/CollectionsTest.java @@ -1301,8 +1301,7 @@ void sortWith() { Underscore.sortWith( asList(1, 2, 3, 4, 5, 6), (item1, item2) -> - (int) (Math.sin(item1) * 1000) - - (int) (Math.sin(item2) * 1000)); + (int) (Math.sin(item1) * 1000) - (int) (Math.sin(item2) * 1000)); assertEquals("[5, 4, 6, 3, 1, 2]", result.toString()); final List resultObj = new Underscore(asList(1, 2, 3, 4, 5, 6)) @@ -1318,8 +1317,7 @@ void sortWith() { (Comparator) (item1, item2) -> (int) (Math.sin(item1) * 1000) - - (int) (Math.sin(item2) * 1000) - ) + - (int) (Math.sin(item2) * 1000)) .value(); assertEquals("[5, 4, 6, 3, 1, 2]", resultChain.toString()); } @@ -1332,15 +1330,11 @@ void sortWith() { @SuppressWarnings("unchecked") void sortBy() { final List result = - Underscore.sortBy( - asList(1, 2, 3, 4, 5, 6), - item -> (int) (Math.sin(item) * 1000)); + Underscore.sortBy(asList(1, 2, 3, 4, 5, 6), item -> (int) (Math.sin(item) * 1000)); assertEquals("[5, 4, 6, 3, 1, 2]", result.toString()); final List resultObj = new Underscore(asList(1, 2, 3, 4, 5, 6)) - .sortBy( - (Function) - item -> (int) (Math.sin(item) * 1000)); + .sortBy((Function) item -> (int) (Math.sin(item) * 1000)); assertEquals("[5, 4, 6, 3, 1, 2]", resultObj.toString()); final List resultChain = Underscore.chain(asList(1, 2, 3, 4, 5, 6)) @@ -1719,8 +1713,7 @@ public Integer next() { } @Override - public void remove() { - } + public void remove() {} }; assertEquals(6, Underscore.size(iterable)); assertEquals(5, Underscore.size(new Integer[] {5, 4, 3, 2, 1})); diff --git a/src/test/java/com/github/underscore/LodashTest.java b/src/test/java/com/github/underscore/LodashTest.java index 7a47cb4c..2010e7c6 100644 --- a/src/test/java/com/github/underscore/LodashTest.java +++ b/src/test/java/com/github/underscore/LodashTest.java @@ -411,9 +411,9 @@ void set() { assertEquals( "d", U.set( - (Map) U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), - "a[0].b.c", - "e")); + (Map) U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), + "a[0].b.c", + "e")); assertEquals( "{b={c=d}}", U.set( @@ -615,24 +615,25 @@ void fetchGet() { "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json"); result.json(); result.jsonMap(); - assertEquals("{\n" - + " \"fruit\": \"Apple\",\n" - + " \"size\": \"Large\",\n" - + " \"color\": \"Red\"\n" - + "}", - result.text()); - assertEquals("Apple", - U.get((Map) result.json(), "fruit")); + assertEquals( + "{\n" + + " \"fruit\": \"Apple\",\n" + + " \"size\": \"Large\",\n" + + " \"color\": \"Red\"\n" + + "}", + result.text()); + assertEquals("Apple", U.get((Map) result.json(), "fruit")); U.Chain resultChain = U.chain( "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json") .fetch(); - assertEquals("{\n" - + " \"fruit\": \"Apple\",\n" - + " \"size\": \"Large\",\n" - + " \"color\": \"Red\"\n" - + "}", - resultChain.item()); + assertEquals( + "{\n" + + " \"fruit\": \"Apple\",\n" + + " \"size\": \"Large\",\n" + + " \"color\": \"Red\"\n" + + "}", + resultChain.item()); U.chain( "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json") .fetch(); @@ -665,12 +666,13 @@ void fetchGetWithTimeouts() { "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json", 30000, 30000); - assertEquals("{\n" - + " \"fruit\": \"Apple\",\n" - + " \"size\": \"Large\",\n" - + " \"color\": \"Red\"\n" - + "}", - result.text()); + assertEquals( + "{\n" + + " \"fruit\": \"Apple\",\n" + + " \"size\": \"Large\",\n" + + " \"color\": \"Red\"\n" + + "}", + result.text()); } @Test @@ -730,7 +732,7 @@ void fetchPut() { + " \"fireBreath\": 10" + " }" + "}"); - assertEquals(403, result.getStatus()); + assertEquals(403, result.getStatus()); U.FetchResponse result2 = U.fetch( "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json", @@ -760,13 +762,15 @@ void fetchPut() { + " \"fireBreath\": 10" + " }" + "}"); - assertEquals("\n" - + "301 Moved Permanently\n" - + "\n" - + "

301 Moved Permanently

\n" - + "
cloudflare
\n" - + "\n" - + "\n", resultChain.item().replace("\r\n", "\n")); + assertEquals( + "\n" + + "301 Moved Permanently\n" + + "\n" + + "

301 Moved Permanently

\n" + + "
cloudflare
\n" + + "\n" + + "\n", + resultChain.item().replace("\r\n", "\n")); } @Test @@ -1029,15 +1033,15 @@ void xmpToJson4() { @Test void xmpToJson5() { - assertEquals("{\n" + assertEquals( + "{\n" + " \"Comment\": {\n" + " \"-stringValue\": \"============================\",\n" + " \"-self-closing\": \"true\"\n" + " },\n" + " \"#omit-xml-declaration\": \"yes\"\n" + "}", - U.xmlToJson( - "")); + U.xmlToJson("")); } @Test @@ -1054,15 +1058,13 @@ void xmlToJsonMinimum() { + "}", U.xmlToJsonMinimum("12")); assertEquals( - "[\n" - + " \"a\",\n" - + " \"b\"\n" - + "]", - U.xmlToJsonMinimum("\n" - + "\n" - + " a\n" - + " b\n" - + "")); + "[\n" + " \"a\",\n" + " \"b\"\n" + "]", + U.xmlToJsonMinimum( + "\n" + + "\n" + + " a\n" + + " b\n" + + "")); } @Test @@ -1357,13 +1359,13 @@ void jsonToXml() { @Test void jsonToXmlMinimum() { - assertEquals("", - U.jsonToXmlMinimum("{\n \"a\": {\n }\n}")); - assertEquals("", + assertEquals("", U.jsonToXmlMinimum("{\n \"a\": {\n }\n}")); + assertEquals( + "", U.jsonToXmlMinimum("{\n \"a\": {\n }\n}", Xml.XmlStringBuilder.Step.TWO_SPACES)); - assertEquals("", - U.jsonToXmlMinimum("[]")); - assertEquals("\n" + assertEquals("", U.jsonToXmlMinimum("[]")); + assertEquals( + "\n" + " \n" + " 1\n" + " \n" diff --git a/src/test/java/com/github/underscore/StringTest.java b/src/test/java/com/github/underscore/StringTest.java index 692f3891..acba365c 100644 --- a/src/test/java/com/github/underscore/StringTest.java +++ b/src/test/java/com/github/underscore/StringTest.java @@ -1805,8 +1805,7 @@ void toJsonFromXml11() { + "}"; assertEquals(json, U.toJson((Map) U.fromXml(xml))); assertEquals(xml, U.toXml((Map) U.fromJson(json))); - final String xml2 = - "cc"; + final String xml2 = "cc"; assertEquals( "{\n" + " \"a\": {\n" @@ -2085,23 +2084,18 @@ void toJsonFromXml16() { @SuppressWarnings("unchecked") @Test void toJsonFromXml17() { - final String xml = - "\n1"; + final String xml = "\n1"; assertEquals("{\n \"a\": 1\n}", U.toJson((Map) U.fromXml(xml))); final String xml2 = "\n1e1"; - assertEquals( - "{\n \"a\": 10.0\n}", U.toJson((Map) U.fromXml(xml2))); + assertEquals("{\n \"a\": 10.0\n}", U.toJson((Map) U.fromXml(xml2))); final String xml3 = "\n1E1"; - assertEquals( - "{\n \"a\": 10.0\n}", U.toJson((Map) U.fromXml(xml3))); + assertEquals("{\n \"a\": 10.0\n}", U.toJson((Map) U.fromXml(xml3))); final String xml4 = "\n1.1"; - assertEquals( - "{\n \"a\": 1.1\n}", U.toJson((Map) U.fromXml(xml4))); - final String xml5 = - "\n1"; + assertEquals("{\n \"a\": 1.1\n}", U.toJson((Map) U.fromXml(xml4))); + final String xml5 = "\n1"; assertEquals( "{\n" + " \"a\": {\n" @@ -2160,10 +2154,8 @@ void toJsonFromXml17() { void toJsonFromXml18() { final String xml = "\ntrue"; - assertEquals( - "{\n \"a\": true\n}", U.toJson((Map) U.fromXml(xml))); - final String xml2 = - "\ntrue"; + assertEquals("{\n \"a\": true\n}", U.toJson((Map) U.fromXml(xml))); + final String xml2 = "\ntrue"; assertEquals( "{\n" + " \"a\": {\n" @@ -2238,8 +2230,7 @@ void toJsonFromXml19() { @Test void toJsonFromXml20() { final String xml = ""; - final String json = - "{\n \"a\": [\n ],\n \"#omit-xml-declaration\": \"yes\"\n}"; + final String json = "{\n \"a\": [\n ],\n \"#omit-xml-declaration\": \"yes\"\n}"; assertEquals(json, U.toJson((Map) U.fromXml(xml))); final String xml2 = ""; final String json2 = @@ -2251,8 +2242,7 @@ void toJsonFromXml20() { + "}"; assertEquals(json2, U.toJson((Map) U.fromXml(xml2))); final String xml3 = "1"; - final String json3 = - "{\n \"a\": \"1\",\n \"#omit-xml-declaration\": \"yes\"\n}"; + final String json3 = "{\n \"a\": \"1\",\n \"#omit-xml-declaration\": \"yes\"\n}"; assertEquals(json3, U.toJson((Map) U.fromXml(xml3))); final String xml4 = ""; final String json4 = @@ -2379,7 +2369,8 @@ void testMultipleAttributes() { @Test void testAttributeWithSpaces() { - Map result = Xml.parseAttributes("key1=\"value with spaces\" key2=\"another value\""); + Map result = + Xml.parseAttributes("key1=\"value with spaces\" key2=\"another value\""); assertEquals(Map.of("key1", "value with spaces", "key2", "another value"), result); } @@ -2483,13 +2474,11 @@ void toJsonFromXml23() { @Test void toJsonFromXml24() { final String xml = "\n\n \n"; - final String json = - "{\n \"a\": {\n \"?b\": \"c=\\\"d\\\"\"\n }\n}"; + final String json = "{\n \"a\": {\n \"?b\": \"c=\\\"d\\\"\"\n }\n}"; assertEquals(json, U.toJson((Map) U.fromXml(xml))); assertEquals(xml, U.toXml((Map) U.fromJson(json))); final String xml2 = "\n\n"; - final String json2 = - "{\n \"?b\": \"c=\\\"d\\\"\",\n \"a\": {\n }\n}"; + final String json2 = "{\n \"?b\": \"c=\\\"d\\\"\",\n \"a\": {\n }\n}"; assertEquals(json2, U.toJson((Map) U.fromXml(xml2))); assertEquals(xml2, U.toXml((Map) U.fromJson(json2))); final String xml3 = "\n\n \n"; @@ -3002,13 +2991,11 @@ void toXmlFromJson18() { @SuppressWarnings("unchecked") @Test void toXmlFromJson19() { - final String json = - "{\n \"a\": {\n },\n \"#encoding\": \"windows-1251\"\n}"; + final String json = "{\n \"a\": {\n },\n \"#encoding\": \"windows-1251\"\n}"; assertEquals( "\n", U.toXml((Map) U.fromJson(json))); - final String json2 = - "{\n \"a\": {\n },\n \"#encoding\": \"windows-9999\"\n}"; + final String json2 = "{\n \"a\": {\n },\n \"#encoding\": \"windows-9999\"\n}"; assertEquals( "\n", U.toXml((Map) U.fromJson(json2))); @@ -3110,8 +3097,7 @@ void toXmlFromJson24() { @SuppressWarnings("unchecked") @Test void toXmlFromJson25() { - final String json = - "{\n \"a\": [\n [\n 1\n ]\n ]\n}"; + final String json = "{\n \"a\": [\n [\n 1\n ]\n ]\n}"; final String xml = "\n" + "\n" diff --git a/src/test/java/com/github/underscore/UnderscoreTest.java b/src/test/java/com/github/underscore/UnderscoreTest.java index 09952755..4249a2c1 100644 --- a/src/test/java/com/github/underscore/UnderscoreTest.java +++ b/src/test/java/com/github/underscore/UnderscoreTest.java @@ -120,27 +120,35 @@ void join() { @Test void joinToString() { - assertEquals("[]", Underscore.joinToString(List.of(), ",", "[", "]", - 3, "...", null)); - assertEquals("[1,2,3]", Underscore.joinToString(List.of(1, 2, 3), ",", - "[", "]", -1, "...", null)); - assertEquals("[1,2,3]", Underscore.joinToString(List.of(1, 2, 3), ",", - "[", "]", 3, "...", null)); - assertEquals("[1,2,3,...]", Underscore.joinToString(List.of(1, 2, 3, 4, 5), ",", - "[", "]", 3, "...", null)); + assertEquals("[]", Underscore.joinToString(List.of(), ",", "[", "]", 3, "...", null)); + assertEquals( + "[1,2,3]", + Underscore.joinToString(List.of(1, 2, 3), ",", "[", "]", -1, "...", null)); + assertEquals( + "[1,2,3]", + Underscore.joinToString(List.of(1, 2, 3), ",", "[", "]", 3, "...", null)); + assertEquals( + "[1,2,3,...]", + Underscore.joinToString(List.of(1, 2, 3, 4, 5), ",", "[", "]", 3, "...", null)); Function transform = i -> "Value-" + i; - assertEquals("[Value-1,Value-2,Value-3]", Underscore.joinToString(List.of(1, 2, 3), ",", - "[", "]", -1, "...", transform)); - assertEquals("[1,2,3]", Underscore.joinToString(List.of(1, 2, 3), ",", - "[", "]", -1, "...", null)); - assertEquals("{1, 2, 3}", Underscore.joinToString(List.of(1, 2, 3), ", ", - "{", "}", -1, "...", null)); - assertEquals("1, 2, ...", Underscore.joinToString(List.of(1, 2, 3, 4), ", ", - "", "", 2, "...", null)); - assertEquals("1, 2, ...", Underscore.joinToString(List.of(1, 2, 3, 4), ", ", - null, null, 2, "...", null)); - assertEquals("1, 2, ...", Underscore.joinToString(List.of(1, 2, 3, 4), ", ", - null, null, 2, null, null)); + assertEquals( + "[Value-1,Value-2,Value-3]", + Underscore.joinToString(List.of(1, 2, 3), ",", "[", "]", -1, "...", transform)); + assertEquals( + "[1,2,3]", + Underscore.joinToString(List.of(1, 2, 3), ",", "[", "]", -1, "...", null)); + assertEquals( + "{1, 2, 3}", + Underscore.joinToString(List.of(1, 2, 3), ", ", "{", "}", -1, "...", null)); + assertEquals( + "1, 2, ...", + Underscore.joinToString(List.of(1, 2, 3, 4), ", ", "", "", 2, "...", null)); + assertEquals( + "1, 2, ...", + Underscore.joinToString(List.of(1, 2, 3, 4), ", ", null, null, 2, "...", null)); + assertEquals( + "1, 2, ...", + Underscore.joinToString(List.of(1, 2, 3, 4), ", ", null, null, 2, null, null)); } /* diff --git a/src/test/java/com/github/underscore/UtilityTest.java b/src/test/java/com/github/underscore/UtilityTest.java index 491ed6a4..fb0e5ee2 100644 --- a/src/test/java/com/github/underscore/UtilityTest.java +++ b/src/test/java/com/github/underscore/UtilityTest.java @@ -481,9 +481,7 @@ void result() { @Test void joinToString() { - assertEquals("[]", U.joinToString(List.of(), ",", - "[", "]", 3, "...", null)); - assertEquals("[1,2,3]", U.joinToString(List.of(1, 2, 3), ",", - "[", "]", -1, "...", null)); + assertEquals("[]", U.joinToString(List.of(), ",", "[", "]", 3, "...", null)); + assertEquals("[1,2,3]", U.joinToString(List.of(1, 2, 3), ",", "[", "]", -1, "...", null)); } }