diff --git a/src/main/java/com/github/underscore/U.java b/src/main/java/com/github/underscore/U.java index 6e0c1779..3b64f736 100644 --- a/src/main/java/com/github/underscore/U.java +++ b/src/main/java/com/github/underscore/U.java @@ -2798,7 +2798,8 @@ public static String xmlOrJsonToJson(String xmlOrJson) { return xmlOrJsonToJson(xmlOrJson, Json.JsonStringBuilder.Step.TWO_SPACES); } - public static String mergeXmlsOrJsonsToJson(List xmlsOrJsons, Json.JsonStringBuilder.Step identStep) { + public static String mergeXmlsOrJsonsToJson( + List xmlsOrJsons, Json.JsonStringBuilder.Step identStep) { Map resultJsonMap = new LinkedHashMap<>(); for (String xmlOrJsonToJson : xmlsOrJsons) { TextType textType = getTextType(xmlOrJsonToJson); @@ -2819,7 +2820,8 @@ public static String mergeXmlsOrJsonsToJson(List xmlsOrJsons) { return mergeXmlsOrJsonsToJson(xmlsOrJsons, Json.JsonStringBuilder.Step.TWO_SPACES); } - public static String mergeXmlsOrJsonsToXml(List xmlsOrJsons, Xml.XmlStringBuilder.Step identStep) { + public static String mergeXmlsOrJsonsToXml( + List xmlsOrJsons, Xml.XmlStringBuilder.Step identStep) { Map resultXmlMap = new LinkedHashMap<>(); for (String xmlOrJsonToXml : xmlsOrJsons) { TextType textType = getTextType(xmlOrJsonToXml); diff --git a/src/test/java/com/github/underscore/ChainingTest.java b/src/test/java/com/github/underscore/ChainingTest.java index 51490e4d..17a94e77 100644 --- a/src/test/java/com/github/underscore/ChainingTest.java +++ b/src/test/java/com/github/underscore/ChainingTest.java @@ -56,24 +56,24 @@ class ChainingTest { @Test void chain() { final List> stooges = - new ArrayList>() { + new ArrayList<>() { { add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "curly"); put("age", 25); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 21); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "larry"); put("age", 23); @@ -94,24 +94,24 @@ void chain() { @Test void chainSet() { final Set> stooges = - new HashSet>() { + new HashSet<>() { { add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "curly"); put("age", 25); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 21); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "larry"); put("age", 23); @@ -133,24 +133,24 @@ void chainSet() { @SuppressWarnings("unchecked") void chainObj() { final Set> stooges = - new HashSet>() { + new HashSet<>() { { add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "curly"); put("age", 25); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 21); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "larry"); put("age", 23); @@ -159,42 +159,38 @@ void chainObj() { } }; final String youngest = - new Underscore(stooges) + new Underscore<>(stooges) .chain() - .sortBy( - (Function, Integer>) - item -> (Integer) item.get("age")) - .map( - (Function, String>) - item -> item.get("name") + " is " + item.get("age")) + .sortBy(item -> (Integer) item.get("age")) + .map(item -> item.get("name") + " is " + item.get("age")) .first() .item() .toString(); assertEquals("moe is 21", youngest); - new Underscore(stooges).of(); + new Underscore<>(stooges).of(); } @Test void chainArray() { final List> stooges = - new ArrayList>() { + new ArrayList<>() { { add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "curly"); put("age", 25); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 21); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "larry"); put("age", 23); @@ -236,31 +232,31 @@ void chainArray() { @SuppressWarnings("unchecked") void chain2() { final List> lyrics = - new ArrayList>() { + new ArrayList<>() { { add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("line", 1); put("words", "I'm a lumberjack and I'm okay"); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("line", 2); put("words", "I sleep all night and I work all day"); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("line", 3); put("words", "He's a lumberjack and he's okay"); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("line", 4); put("words", "He sleeps all night and he works all day"); @@ -314,31 +310,31 @@ void chain2() { @SuppressWarnings("unchecked") void chain3() { final List> lyrics = - new ArrayList>() { + new ArrayList<>() { { add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("line", 1); put("words", "I'm a lumberjack and I'm okay"); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("line", 2); put("words", "I sleep all night and I work all day"); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("line", 3); put("words", "He's a lumberjack and he's okay"); } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("line", 4); put("words", "He sleeps all night and he works all day"); @@ -396,10 +392,10 @@ void chain3() { @Test void chain4() { final List> doctors = - new ArrayList>() { + new ArrayList<>() { { add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("number", 1); put("actor", "William Hartnell"); @@ -408,7 +404,7 @@ void chain4() { } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("number", 9); put("actor", "Christopher Eccleston"); @@ -417,7 +413,7 @@ void chain4() { } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("number", 10); put("actor", "David Tennant"); @@ -434,7 +430,7 @@ void chain4() { .map( (Function, Map>) item -> - new LinkedHashMap() { + new LinkedHashMap<>() { { put( "doctorNumber", @@ -470,10 +466,10 @@ void chain4() { @Test void chain5() { final List> doctors = - new ArrayList>() { + new ArrayList<>() { { add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("number", 1); put("actor", "William Hartnell"); @@ -482,7 +478,7 @@ void chain5() { } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("number", 9); put("actor", "Christopher Eccleston"); @@ -491,7 +487,7 @@ void chain5() { } }); add( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("number", 10); put("actor", "David Tennant"); diff --git a/src/test/java/com/github/underscore/CollectionsTest.java b/src/test/java/com/github/underscore/CollectionsTest.java index cb132091..e7e4b320 100644 --- a/src/test/java/com/github/underscore/CollectionsTest.java +++ b/src/test/java/com/github/underscore/CollectionsTest.java @@ -41,11 +41,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.BinaryOperator; -import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.Predicate; import org.junit.jupiter.api.Test; /** @@ -64,10 +60,10 @@ class CollectionsTest { @SuppressWarnings("unchecked") void each() { final List result = new ArrayList<>(); - Underscore.each(asList(1, 2, 3), result::add); + Underscore.each(asList(1, 2, 3), result::add); assertEquals("[1, 2, 3]", result.toString()); final List result2 = new ArrayList<>(); - new Underscore(asList(1, 2, 3)).each((Consumer) result2::add); + new Underscore<>(asList(1, 2, 3)).each(result2::add); assertEquals("[1, 2, 3]", result2.toString()); } @@ -82,7 +78,7 @@ void eachRight() { Underscore.eachRight(asList(1, 2, 3), result::add); assertEquals("[3, 2, 1]", result.toString()); final List result2 = new ArrayList<>(); - new Underscore(asList(1, 2, 3)).eachRight((Consumer) result2::add); + new Underscore<>(asList(1, 2, 3)).eachRight(result2::add); assertEquals("[3, 2, 1]", result2.toString()); } @@ -120,9 +116,7 @@ void forEachIndexed() { Underscore.forEachIndexed(asList(1, 2, 3), (index, item) -> result.add(item)); assertEquals("[1, 2, 3]", result.toString()); final List resultObj = new ArrayList<>(); - new Underscore(asList(1, 2, 3)) - .forEachIndexed( - (BiConsumer) (index, item) -> resultObj.add(item)); + new Underscore<>(asList(1, 2, 3)).forEachIndexed((index, item) -> resultObj.add(item)); assertEquals("[1, 2, 3]", resultObj.toString()); } @@ -137,7 +131,7 @@ void forEachRight() { Underscore.forEachRight(asList(1, 2, 3), result::add); assertEquals("[3, 2, 1]", result.toString()); final List result2 = new ArrayList<>(); - new Underscore(asList(1, 2, 3)).forEachRight((Consumer) result2::add); + new Underscore<>(asList(1, 2, 3)).forEachRight(result2::add); assertEquals("[3, 2, 1]", result2.toString()); final List> resultChain = new ArrayList<>(); Underscore.chain( @@ -161,7 +155,7 @@ void forEachRight() { @SuppressWarnings("unchecked") void forEachObj() { final List result = new ArrayList<>(); - new Underscore(asList(1, 2, 3)).forEach((Consumer) result::add); + new Underscore<>(asList(1, 2, 3)).forEach(result::add); assertEquals("[1, 2, 3]", result.toString()); } @@ -172,7 +166,7 @@ void forEachObj() { @Test void eachMap() { final List result = new ArrayList<>(); - Underscore.>each( + Underscore.each( (new LinkedHashMap() { { put("one", 1); @@ -278,9 +272,7 @@ void collect() { List result = Underscore.collect(asList(1, 2, 3), item -> item * 3); assertEquals("[3, 6, 9]", result.toString()); Set resultSet = - Underscore.collect( - new LinkedHashSet(asList(1, 2, 3)), - (Function) item -> item * 3); + Underscore.collect(new LinkedHashSet<>(asList(1, 2, 3)), item -> item * 3); assertEquals("[3, 6, 9]", resultSet.toString()); } @@ -357,7 +349,7 @@ void inject() { list.addAll(item2); return list; }, - Collections.emptyList()); + Collections.emptyList()); assertEquals("[0, 1, 2, 3, 4, 5]", result.toString()); } @@ -377,7 +369,7 @@ void foldl() { list.addAll(item2); return list; }, - Collections.emptyList()); + Collections.emptyList()); assertEquals("[0, 1, 2, 3, 4, 5]", result.toString()); } @@ -397,7 +389,7 @@ void reduceRight() { list.addAll(item2); return list; }, - Collections.emptyList()); + Collections.emptyList()); assertEquals("[4, 5, 2, 3, 0, 1]", result.toString()); } @@ -437,7 +429,7 @@ void foldr() { list.addAll(item2); return list; }, - Collections.emptyList()); + Collections.emptyList()); assertEquals("[4, 5, 2, 3, 0, 1]", result.toString()); } @@ -522,8 +514,7 @@ void filterFalse() { assertEquals("[1, 3, 5]", resultObject.toString()); final Set resultSet = Underscore.filterFalse( - new LinkedHashSet(asList(1, 2, 3, 4, 5, 6)), - (Predicate) item -> item % 2 == 0); + new LinkedHashSet<>(asList(1, 2, 3, 4, 5, 6)), item -> item % 2 == 0); assertEquals("[1, 3, 5]", resultSet.toString()); } @@ -556,8 +547,7 @@ void select() { assertEquals("[2, 4, 6]", result.toString()); final Set resultSet = Underscore.select( - new LinkedHashSet(asList(1, 2, 3, 4, 5, 6)), - (Predicate) item -> item % 2 == 0); + new LinkedHashSet<>(asList(1, 2, 3, 4, 5, 6)), item -> item % 2 == 0); assertEquals("[2, 4, 6]", resultSet.toString()); } @@ -576,8 +566,7 @@ void reject() { assertEquals("[1, 3, 5]", resultObject.toString()); final Set resultSet = Underscore.reject( - new LinkedHashSet(asList(1, 2, 3, 4, 5, 6)), - (Predicate) item -> item % 2 == 0); + new LinkedHashSet<>(asList(1, 2, 3, 4, 5, 6)), item -> item % 2 == 0); assertEquals("[1, 3, 5]", resultSet.toString()); } @@ -607,13 +596,11 @@ void rejectIndexed() { void every() { final boolean result1 = Underscore.every(asList(1, 2, 3, 4), item -> item % 2 == 0); final boolean result1obj = - new Underscore(asList(1, 2, 3, 4)) - .every((Predicate) item -> item % 2 == 0); + new Underscore<>(asList(1, 2, 3, 4)).every(item -> item % 2 == 0); final boolean result1chain = Underscore.chain(asList(1, 2, 3, 4)).every(item -> item % 2 == 0).item(); final boolean result2 = Underscore.every(asList(1, 2, 3, 4), item -> item < 5); - final boolean result2obj = - new Underscore(asList(1, 2, 3, 4)).every((Predicate) item -> item < 5); + final boolean result2obj = new Underscore<>(asList(1, 2, 3, 4)).every(item -> item < 5); final boolean result2chain = Underscore.chain(asList(1, 2, 3, 4)).every(item -> item < 5).item(); assertFalse(result1); @@ -632,11 +619,9 @@ void every() { @SuppressWarnings("unchecked") void all() { final boolean result1 = Underscore.all(asList(1, 2, 3, 4), item -> item % 2 == 0); - final boolean result1obj = - new Underscore(asList(1, 2, 3, 4)).all((Predicate) item -> item % 2 == 0); + final boolean result1obj = new Underscore<>(asList(1, 2, 3, 4)).all(item -> item % 2 == 0); final boolean result2 = Underscore.all(asList(1, 2, 3, 4), item -> item < 5); - final boolean result2obj = - new Underscore(asList(1, 2, 3, 4)).all((Predicate) item -> item < 5); + final boolean result2obj = new Underscore<>(asList(1, 2, 3, 4)).all(item -> item < 5); assertFalse(result1); assertFalse(result1obj); assertTrue(result2); @@ -651,11 +636,9 @@ void all() { @SuppressWarnings("unchecked") void any() { final boolean result1 = Underscore.any(asList(1, 2, 3, 4), item -> item % 2 == 0); - final boolean result1obj = - new Underscore(asList(1, 2, 3, 4)).any((Predicate) item -> item % 2 == 0); + final boolean result1obj = new Underscore<>(asList(1, 2, 3, 4)).any(item -> item % 2 == 0); final boolean result2 = Underscore.any(asList(1, 2, 3, 4), item -> item == 5); - final boolean result2obj = - new Underscore(asList(1, 2, 3, 4)).any((Predicate) item -> item == 5); + final boolean result2obj = new Underscore<>(asList(1, 2, 3, 4)).any(item -> item == 5); assertTrue(result1); assertTrue(result1obj); assertFalse(result2); @@ -670,13 +653,11 @@ void any() { @SuppressWarnings("unchecked") void some() { final boolean result1 = Underscore.some(asList(1, 2, 3, 4), item -> item % 2 == 0); - final boolean result1obj = - new Underscore(asList(1, 2, 3, 4)).some((Predicate) item -> item % 2 == 0); + final boolean result1obj = new Underscore<>(asList(1, 2, 3, 4)).some(item -> item % 2 == 0); final boolean result1chain = Underscore.chain(asList(1, 2, 3, 4)).some(item -> item % 2 == 0).item(); final boolean result2 = Underscore.some(asList(1, 2, 3, 4), item -> item == 5); - final boolean result2obj = - new Underscore(asList(1, 2, 3, 4)).some((Predicate) item -> item == 5); + final boolean result2obj = new Underscore<>(asList(1, 2, 3, 4)).some(item -> item == 5); final boolean result2chain = Underscore.chain(asList(1, 2, 3, 4)).some(item -> item == 5).item(); assertTrue(result1); @@ -704,14 +685,11 @@ void include() { @SuppressWarnings("unchecked") void count() { final int result1 = Underscore.count(asList(1, 2, 3, 4), item -> item % 2 == 0); - final int result1obj = - new Underscore(asList(1, 2, 3, 4)) - .count((Predicate) item -> item % 2 == 0); + final int result1obj = new Underscore<>(asList(1, 2, 3, 4)).count(item -> item % 2 == 0); final int result1chain = Underscore.chain(asList(1, 2, 3, 4)).count(item -> item % 2 == 0).item(); final int result2 = Underscore.count(asList(1, 2, 3, 4), item -> item < 5); - final int result2obj = - new Underscore(asList(1, 2, 3, 4)).count((Predicate) item -> item < 5); + final int result2obj = new Underscore<>(asList(1, 2, 3, 4)).count(item -> item < 5); final int result2chain = Underscore.chain(asList(1, 2, 3, 4)).count(item -> item < 5).item(); assertEquals(2, result1); @@ -799,7 +777,8 @@ void containsAtMost() { @SuppressWarnings("unchecked") void invoke() { assertEquals(asList("foo", "bar"), Underscore.invoke(asList(" foo ", " bar"), "trim")); - assertEquals(asList("foo", "bar"), new Underscore(asList(" foo ", " bar")).invoke("trim")); + assertEquals( + asList("foo", "bar"), new Underscore<>(asList(" foo ", " bar")).invoke("trim")); assertEquals( asList("foo", "bar"), Underscore.chain(asList(" foo ", " bar")).invoke("trim").value()); @@ -808,8 +787,8 @@ void invoke() { Underscore.invoke(asList("foo", "bar"), "concat", Collections.singletonList("1"))); assertEquals( asList("foo1", "bar1"), - new Underscore(asList("foo", "bar")) - .invoke("concat", Collections.singletonList("1"))); + new Underscore<>(asList("foo", "bar")) + .invoke("concat", Collections.singletonList("1"))); assertEquals( asList("foo1", "bar1"), Underscore.chain(asList("foo", "bar")) @@ -893,7 +872,7 @@ public Integer getAge() { "getName"); assertEquals("[moe, larry, curly]", result2.toString()); final List resultObj = - new Underscore( + new Underscore<>( asList( new Person("moe", 40), new Person("larry", 50), @@ -910,11 +889,11 @@ public Integer getAge() { .value(); assertEquals("[moe, larry, curly]", resultChain.toString()); final Set resultEmpty2 = - Underscore.pluck(new LinkedHashSet(Collections.emptyList()), "name"); + Underscore.pluck(new LinkedHashSet<>(Collections.emptyList()), "name"); assertEquals("[]", resultEmpty2.toString()); final Set resultSet = Underscore.pluck( - new LinkedHashSet( + new LinkedHashSet<>( asList( new Person("moe", 40), new Person("larry", 50), @@ -923,7 +902,7 @@ public Integer getAge() { assertEquals("[moe, larry, curly]", resultSet.toString()); final Set resultSet2 = Underscore.pluck( - new LinkedHashSet( + new LinkedHashSet<>( asList( new Person2("moe", 40), new Person2("larry", 50), @@ -962,7 +941,7 @@ public Person(final String name, final Integer age) { } List personList = asList(new Person("moe", 40), new Person("larry", 50), new Person("curly", 40)); - LinkedHashSet personSet = new LinkedHashSet(personList); + LinkedHashSet personSet = new LinkedHashSet<>(personList); assertThrows(IllegalArgumentException.class, () -> Underscore.pluck(personSet, "name2")); } @@ -990,7 +969,7 @@ public String toString() { } } List listOfPlays = - new ArrayList() { + new ArrayList<>() { { add(new Book("Cymbeline2", "Shakespeare", 1614)); add(new Book("Cymbeline", "Shakespeare", 1611)); @@ -1003,7 +982,7 @@ public String toString() { Underscore.where( listOfPlays, asList( - Map.entry("author", "Shakespeare"), + Map.entry("author", "Shakespeare"), Map.entry("year", 1611))) .toString()); assertEquals( @@ -1012,8 +991,8 @@ public String toString() { Underscore.where( listOfPlays, asList( - Map.entry("author", "Shakespeare"), - Map.entry("author2", "Shakespeare"), + Map.entry("author", "Shakespeare"), + Map.entry("author2", "Shakespeare"), Map.entry("year", 1611))) .toString()); assertEquals( @@ -1022,7 +1001,7 @@ public String toString() { Underscore.where( new LinkedHashSet<>(listOfPlays), asList( - Map.entry("author", "Shakespeare"), + Map.entry("author", "Shakespeare"), Map.entry("year", 1611))) .toString()); assertEquals( @@ -1031,17 +1010,17 @@ public String toString() { Underscore.where( new LinkedHashSet<>(listOfPlays), asList( - Map.entry("author", "Shakespeare"), - Map.entry("author2", "Shakespeare"), + Map.entry("author", "Shakespeare"), + Map.entry("author2", "Shakespeare"), Map.entry("year", 1611))) .toString()); assertEquals( "[title: Cymbeline, author: Shakespeare, year: 1611," + " title: The Tempest, author: Shakespeare, year: 1611]", - new Underscore(listOfPlays) + new Underscore<>(listOfPlays) .where( asList( - Map.entry("author", "Shakespeare"), + Map.entry("author", "Shakespeare"), Map.entry("year", 1611))) .toString()); assertEquals( @@ -1050,7 +1029,7 @@ public String toString() { Underscore.chain(listOfPlays) .where( asList( - Map.entry("author", "Shakespeare"), + Map.entry("author", "Shakespeare"), Map.entry("year", 1611))) .value() .toString()); @@ -1074,7 +1053,7 @@ public String toString() { } } List listOfPlays2 = - new ArrayList() { + new ArrayList<>() { { add(new Book2("Cymbeline2", "Shakespeare", 1614)); add(new Book2("Cymbeline", "Shakespeare", 1611)); @@ -1134,7 +1113,7 @@ public String toString() { .toString()); assertEquals( "title: Cymbeline, author: Shakespeare, year: 1611", - new Underscore(listOfPlays) + new Underscore<>(listOfPlays) .findWhere( asList( Map.entry("author", "Shakespeare"), @@ -1226,7 +1205,7 @@ void max() { new Underscore<>(asList(10, 5, 100, 2, 1000)).max(item -> -item); assertEquals("2", resultCompObj.toString()); final Integer resultCompChain = - (Integer) Underscore.chain(asList(10, 5, 100, 2, 1000)).max(item -> -item).item(); + Underscore.chain(asList(10, 5, 100, 2, 1000)).max(item -> -item).item(); assertEquals("2", resultCompChain.toString()); class Person { public final String name; @@ -1268,7 +1247,7 @@ void min() { new Underscore<>(asList(10, 5, 100, 2, 1000)).min(item -> -item); assertEquals("1000", resultCompObj.toString()); final Integer resultCompChain = - (Integer) Underscore.chain(asList(10, 5, 100, 2, 1000)).min(item -> -item).item(); + Underscore.chain(asList(10, 5, 100, 2, 1000)).min(item -> -item).item(); assertEquals("1000", resultCompChain.toString()); class Person { public final String name; @@ -1304,12 +1283,11 @@ void sortWith() { (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)) + new Underscore<>(asList(1, 2, 3, 4, 5, 6)) .sortWith( - (Comparator) - (item1, item2) -> - (int) (Math.sin(item1) * 1000) - - (int) (Math.sin(item2) * 1000)); + (item1, item2) -> + (int) (Math.sin(item1) * 1000) + - (int) (Math.sin(item2) * 1000)); assertEquals("[5, 4, 6, 3, 1, 2]", resultObj.toString()); final List resultChain = Underscore.chain(asList(1, 2, 3, 4, 5, 6)) @@ -1333,8 +1311,8 @@ void sortBy() { 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)); + new Underscore<>(asList(1, 2, 3, 4, 5, 6)) + .sortBy(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)) @@ -1354,20 +1332,18 @@ void sortByMap() { final List> result = Underscore.sortBy( asList( - (Map) - new LinkedHashMap() { - { - put("name", "moe"); - put("age", 40); - } - }, - (Map) - new LinkedHashMap() { - { - put("name", "larry"); - put("age", 50); - } - }, + new LinkedHashMap<>() { + { + put("name", "moe"); + put("age", 40); + } + }, + new LinkedHashMap<>() { + { + put("name", "larry"); + put("age", 50); + } + }, (Map) new LinkedHashMap() { { @@ -1382,20 +1358,18 @@ void sortByMap() { final List> resultChain = Underscore.chain( asList( - (Map) - new LinkedHashMap() { - { - put("name", "moe"); - put("age", 40); - } - }, - (Map) - new LinkedHashMap() { - { - put("name", "larry"); - put("age", 50); - } - }, + new LinkedHashMap() { + { + put("name", "moe"); + put("age", 40); + } + }, + new LinkedHashMap() { + { + put("name", "larry"); + put("age", 50); + } + }, (Map) new LinkedHashMap() { { @@ -1421,12 +1395,10 @@ void groupBy() { Underscore.groupBy(asList(1.3, 2.1, 2.4), Math::floor); assertEquals("{1.0=[1.3], 2.0=[2.1, 2.4]}", result.toString()); final Map> resultObj = - new Underscore(asList(1.3, 2.1, 2.4)) - .groupBy((Function) Math::floor); + new Underscore<>(asList(1.3, 2.1, 2.4)).groupBy(Math::floor); assertEquals("{1.0=[1.3], 2.0=[2.1, 2.4]}", resultObj.toString()); final Map> resultChain = - (Map>) - Underscore.chain(asList(1.3, 2.1, 2.4)).groupBy(Math::floor).item(); + Underscore.chain(asList(1.3, 2.1, 2.4)).groupBy(Math::floor).item(); assertEquals("{1.0=[1.3], 2.0=[2.1, 2.4]}", resultChain.toString()); } @@ -1441,12 +1413,10 @@ void associateBy() { Underscore.associateBy(asList(1.3, 2.1, 2.4), Math::floor); assertEquals("{1.0=1.3, 2.0=2.1}", result.toString()); final Map resultObj = - new Underscore(asList(1.3, 2.1, 2.4)) - .associateBy((Function) Math::floor); + new Underscore<>(asList(1.3, 2.1, 2.4)).associateBy(Math::floor); assertEquals("{1.0=1.3, 2.0=2.1}", resultObj.toString()); final Map resultChain = - (Map) - Underscore.chain(asList(1.3, 2.1, 2.4)).associateBy(Math::floor).item(); + Underscore.chain(asList(1.3, 2.1, 2.4)).associateBy(Math::floor).item(); assertEquals("{1.0=1.3, 2.0=2.1}", resultChain.toString()); } @@ -1461,10 +1431,7 @@ void groupByWithSumming() { Underscore.groupBy(asList(1.3, 2.1, 2.4), Math::floor, Double::sum); assertEquals("{1.0=Optional[1.3], 2.0=Optional[4.5]}", result.toString()); final Map> resultObj = - new Underscore(asList(1.3, 2.1, 2.4)) - .groupBy( - (Function) Math::floor, - (BinaryOperator) Double::sum); + new Underscore<>(asList(1.3, 2.1, 2.4)).groupBy(Math::floor, Double::sum); assertEquals("{1.0=Optional[1.3], 2.0=Optional[4.5]}", resultObj.toString()); final Map> resultChain = Underscore.chain(asList(1.3, 2.1, 2.4)).groupBy(Math::floor, Double::sum).item(); @@ -1505,7 +1472,7 @@ public String toString() { "age"); assertEquals("{40=[moe, 40], 50=[larry, 50], 60=[curly, 60]}", result.toString()); final Map> resultObj = - new Underscore( + new Underscore<>( asList( new Person("moe", 40), new Person("larry", 50), @@ -1513,14 +1480,13 @@ public String toString() { .indexBy("age"); assertEquals("{40=[moe, 40], 50=[larry, 50], 60=[curly, 60]}", resultObj.toString()); final Map> resultChain = - (Map>) - Underscore.chain( - asList( - new Person("moe", 40), - new Person("larry", 50), - new Person("curly", 60))) - .indexBy("age") - .item(); + Underscore.chain( + asList( + new Person("moe", 40), + new Person("larry", 50), + new Person("curly", 60))) + .indexBy("age") + .item(); assertEquals("{40=[moe, 40], 50=[larry, 50], 60=[curly, 60]}", resultChain.toString()); final Map> result2 = Underscore.indexBy( @@ -1562,7 +1528,7 @@ public String toString() { person -> person.name); assertEquals("{moe=2, curly=1}", result.toString()); final Map resultObj = - new Underscore( + new Underscore<>( asList( new Person("moe", 40), new Person("moe", 50), @@ -1570,14 +1536,13 @@ public String toString() { .countBy((Function) person -> person.name); assertEquals("{moe=2, curly=1}", resultObj.toString()); final Map resultChain = - (Map) - Underscore.chain( - asList( - new Person("moe", 40), - new Person("moe", 50), - new Person("curly", 60))) - .countBy(person -> person.name) - .item(); + Underscore.chain( + asList( + new Person("moe", 40), + new Person("moe", 50), + new Person("curly", 60))) + .countBy(person -> person.name) + .item(); assertEquals("{moe=2, curly=1}", resultChain.toString()); Underscore.countBy(asList(1, 2, 3)); new Underscore<>(asList(1, 2, 3)).countBy(); @@ -1593,7 +1558,7 @@ public String toString() { void shuffle() { final List result = Underscore.shuffle(asList(1, 2, 3, 4, 5, 6)); assertEquals(6, result.size()); - final List resultObj = new Underscore(asList(1, 2, 3, 4, 5, 6)).shuffle(); + final List resultObj = new Underscore<>(asList(1, 2, 3, 4, 5, 6)).shuffle(); assertEquals(6, resultObj.size()); final List resultChain = Underscore.chain(asList(1, 2, 3, 4, 5, 6)).shuffle().value(); @@ -1614,8 +1579,7 @@ void sample() { assertTrue(resultObj >= 1 && resultObj <= 6); final Set resultList = Underscore.sample(asList(1, 2, 3, 4, 5, 6), 3); assertEquals(3, resultList.size()); - final Integer resultChain = - (Integer) Underscore.chain(asList(1, 2, 3, 4, 5, 6)).sample().item(); + final Integer resultChain = Underscore.chain(asList(1, 2, 3, 4, 5, 6)).sample().item(); assertTrue(resultChain >= 1 && resultChain <= 6); final List resultListChain = Underscore.chain(asList(1, 2, 3, 4, 5, 6)).sample(3).value(); @@ -1631,7 +1595,7 @@ void sample() { void toArray() { final Object[] result = Underscore.toArray(asList(1, 2, 3, 4)); assertEquals("1", result[0].toString()); - final Object[] resultObj = new Underscore(asList(1, 2, 3, 4)).toArray(); + final Object[] resultObj = new Underscore<>(asList(1, 2, 3, 4)).toArray(); assertEquals("1", resultObj[0].toString()); } @@ -1651,7 +1615,7 @@ void toMap() { .toString()); assertEquals( "{name1=one, name2=two}", - new Underscore( + new Underscore<>( (new LinkedHashMap() { { put("name1", "one"); @@ -1678,11 +1642,11 @@ void toCardinalityMap() { assertEquals( "{a=2, b=1, c=2}", Underscore.toCardinalityMap(asList("a", "a", "b", "c", "c")).toString()); - assertEquals("{}", Underscore.toCardinalityMap(new ArrayList()).toString()); + assertEquals("{}", Underscore.toCardinalityMap(new ArrayList<>()).toString()); assertEquals( "{a=2, b=1, c=2}", new Underscore<>(asList("a", "a", "b", "c", "c")).toCardinalityMap().toString()); - assertEquals("{}", new Underscore<>(new ArrayList()).toCardinalityMap().toString()); + assertEquals("{}", new Underscore<>(new ArrayList<>()).toCardinalityMap().toString()); } /* @@ -1694,14 +1658,14 @@ void toCardinalityMap() { void size() { final int result = Underscore.size(asList(1, 2, 3, 4)); assertEquals(4, result); - final int resultObj = new Underscore(asList(1, 2, 3, 4)).size(); + final int resultObj = new Underscore<>(asList(1, 2, 3, 4)).size(); assertEquals(4, resultObj); final int resultChain = Underscore.chain(asList(1, 2, 3, 4)).size(); assertEquals(4, resultChain); final int[] array = new int[] {1, 2, 3, 4, 5, 6}; Iterable iterable = () -> - new Iterator() { + new Iterator<>() { private int index; public boolean hasNext() { @@ -1713,7 +1677,8 @@ 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/FunctionsTest.java b/src/test/java/com/github/underscore/FunctionsTest.java index af5bc453..c0ee446c 100644 --- a/src/test/java/com/github/underscore/FunctionsTest.java +++ b/src/test/java/com/github/underscore/FunctionsTest.java @@ -104,7 +104,7 @@ public Integer calc(final Integer n) { assertEquals(55, new FibonacciFuncion1().apply(10).intValue()); Function memoizeFunction = Underscore.memoize( - new Function() { + new Function<>() { public Integer apply(final Integer n) { return n < 2 ? n : apply(n - 1) + apply(n - 2); } @@ -294,7 +294,7 @@ void after() { final List notes = asList(1, 2, 3); final Supplier renderNotes = Underscore.after(notes.size(), () -> 4); final List result = new ArrayList<>(); - Underscore.each( + Underscore.each( notes, item -> { result.add(item); @@ -318,7 +318,7 @@ void before() { final List notes = asList(1, 2, 3); final Supplier renderNotes = Underscore.before(notes.size() - 1, () -> 4); final List result = new ArrayList<>(); - Underscore.each( + Underscore.each( notes, item -> { result.add(item); @@ -339,20 +339,20 @@ void before() { @SuppressWarnings("unchecked") void iteratee() { List> stooges = - Arrays.>asList( - new LinkedHashMap() { + Arrays.asList( + new LinkedHashMap<>() { { put("name", "curly"); put("age", 25); } }, - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 21); } }, - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "larry"); put("age", 23); @@ -387,7 +387,7 @@ void clearTimeout() { counter[0]++; return null; }; - java.util.concurrent.ScheduledFuture future = Underscore.setTimeout(incr, 20); + java.util.concurrent.ScheduledFuture future = Underscore.setTimeout(incr, 20); Underscore.clearTimeout(future); Underscore.clearTimeout(null); await().atLeast(40, TimeUnit.MILLISECONDS) diff --git a/src/test/java/com/github/underscore/LodashTest.java b/src/test/java/com/github/underscore/LodashTest.java index 235eeb2e..43b8720c 100644 --- a/src/test/java/com/github/underscore/LodashTest.java +++ b/src/test/java/com/github/underscore/LodashTest.java @@ -34,6 +34,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; @@ -44,7 +45,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.function.Predicate; import org.junit.jupiter.api.Test; /** @@ -145,9 +145,7 @@ void dropWhile() { @Test void dropRightWhile() { assertEquals("[1, 2]", U.dropRightWhile(asList(1, 2, 3), n -> n > 2).toString()); - assertEquals( - "[1, 2]", - new U(asList(1, 2, 3)).dropRightWhile((Predicate) n -> n > 2).toString()); + assertEquals("[1, 2]", new U<>(asList(1, 2, 3)).dropRightWhile(n -> n > 2).toString()); assertEquals( "[1, 2]", U.chain(asList(1, 2, 3)).dropRightWhile(n -> n > 2).value().toString()); } @@ -203,8 +201,8 @@ void flattenDeep() { final List result = U.flattenDeep(asList(1, asList(2, 3, singletonList(singletonList(4))))); assertEquals("[1, 2, 3, 4]", result.toString()); - final List result2 = - new U(asList(1, asList(2, 3, singletonList(singletonList(4))))).flattenDeep(); + final List result2 = + new U<>(asList(1, asList(2, 3, singletonList(singletonList(4))))).flattenDeep(); assertEquals("[1, 2, 3, 4]", result2.toString()); final List resultChain = U.chain(asList(1, asList(2, 3, singletonList(singletonList(4))))) @@ -394,11 +392,7 @@ void at() { @SuppressWarnings("unchecked") @Test void get() { - assertEquals( - "d", - U.get( - (Map) U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), - "a[0].b.c")); + assertEquals("d", U.get(U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), "a[0].b.c")); } /* @@ -409,18 +403,10 @@ void get() { @Test void set() { assertEquals( - "d", - U.set( - (Map) U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), - "a[0].b.c", - "e")); + "d", U.set(U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), "a[0].b.c", "e")); assertEquals( "{b={c=d}}", - U.set( - (Map) U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), - "a[0]", - "e") - .toString()); + U.set(U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), "a[0]", "e").toString()); Map map = new LinkedHashMap<>(); Map map2 = new LinkedHashMap<>(); Map map3 = new LinkedHashMap<>(); @@ -428,8 +414,8 @@ void set() { map2.put("#item", map3); map3.put("b", "c"); assertEquals("c", U.set(map, "a.b", "b")); - assertNull(U.set((Map) null, "a", "b")); - assertNull(U.set(new LinkedHashMap(), "a.b", "b")); + assertNull(U.set(null, "a", "b")); + assertNull(U.set(new LinkedHashMap<>(), "a.b", "b")); Map map4 = new LinkedHashMap<>(); map4.put("a", "b"); assertNull(U.set(map4, "a.b", "b")); @@ -441,10 +427,10 @@ void set() { @Test @SuppressWarnings("serial") void getNull() { - assertNull(U.get((Map) null, "a[0].b.c")); + assertNull(U.get(null, "a[0].b.c")); assertNull( U.get( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("b", LodashTest.class); } @@ -452,7 +438,7 @@ void getNull() { "a[0].b.c")); assertNull( U.get( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("a", LodashTest.class); } @@ -463,14 +449,8 @@ void getNull() { @SuppressWarnings("unchecked") @Test void getNotFound() { - assertNull( - U.get( - (Map) U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), - "a[0].b.d")); - assertNull( - U.get( - (Map) U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), - "a[0].d.c")); + assertNull(U.get(U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), "a[0].b.d")); + assertNull(U.get(U.fromJson("{\"a\":[{\"b\":{\"c\":\"d\"}}]}"), "a[0].d.c")); } @Test @@ -654,9 +634,10 @@ void downloadUrl() throws IOException, URISyntaxException { @Test void decompressGzip() throws IOException { - Files.deleteIfExists(Paths.get("file.txt")); + Path path = Paths.get("file.txt"); + Files.deleteIfExists(path); U.decompressGzip("src/test/resources/file.gz", "file.txt"); - assertEquals(65, Files.readAllBytes(Paths.get("file.txt")).length); + assertEquals(65, Files.readAllBytes(path).length); } @Test @@ -700,7 +681,7 @@ void fetchResponseBlob() { java.io.ByteArrayOutputStream stream = new java.io.ByteArrayOutputStream(); assertArrayEquals(new byte[0], new U.FetchResponse(true, 100, null, stream).blob()); assertNull(new U.FetchResponse(true, 100, null, stream).getHeaderFields()); - assertEquals(true, new U.FetchResponse(true, 100, null, stream).isOk()); + assertTrue(new U.FetchResponse(true, 100, null, stream).isOk()); assertEquals(100, new U.FetchResponse(true, 100, null, stream).getStatus()); } @@ -935,7 +916,7 @@ void xmlToJson() { U.replaceSelfClosingWithEmpty(mapEmpty); Map map2 = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new ArrayList()); + list.add(new ArrayList<>()); map2.put("list", list); U.replaceSelfClosingWithNull(map2); assertEquals( @@ -952,13 +933,13 @@ void xmlToJson() { "", U.XmlToJsonMode.REPLACE_EMPTY_VALUE_WITH_NULL)); Map map3 = new LinkedHashMap<>(); List list2 = new ArrayList<>(); - list2.add(new ArrayList()); + list2.add(new ArrayList<>()); map3.put("list", list2); U.replaceEmptyValueWithNull(map3); U.replaceEmptyValueWithNull(null); Map map4 = new LinkedHashMap<>(); List list3 = new ArrayList<>(); - list3.add(new ArrayList()); + list3.add(new ArrayList<>()); map4.put("list", list3); U.replaceEmptyValueWithEmptyString(map4); } @@ -975,7 +956,7 @@ void xmlToJson2() { void xmpToJson3() { Map map2 = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new ArrayList()); + list.add(new ArrayList<>()); map2.put("list", list); U.replaceMinusWithAt(map2); assertEquals( @@ -995,7 +976,7 @@ void xmpToJson3() { "", U.XmlToJsonMode.REPLACE_MINUS_WITH_AT)); Map map3 = new LinkedHashMap<>(); List list2 = new ArrayList<>(); - list2.add(new ArrayList()); + list2.add(new ArrayList<>()); map3.put("list", list2); U.replaceMinusWithAt(map3); U.replaceMinusWithAt(null); @@ -1128,34 +1109,31 @@ void mergeXmlsOrJsonsToJson() { + "}", U.mergeXmlsOrJsonsToJson(List.of("", ""))); assertEquals( - "{\n" - + " \"value\": [\n" - + " ]\n" - + "}", + "{\n" + " \"value\": [\n" + " ]\n" + "}", U.mergeXmlsOrJsonsToJson( - List.of("\n" - + ""))); + List.of( + "\n" + + ""))); assertEquals("{\n \"a\": 1\n}", U.mergeXmlsOrJsonsToJson(List.of("{\"a\":1}"))); - assertEquals("{\n" - + " \"value\": [\n" - + " ]\n" - + "}", U.mergeXmlsOrJsonsToJson(List.of("[]"))); + assertEquals( + "{\n" + " \"value\": [\n" + " ]\n" + "}", + U.mergeXmlsOrJsonsToJson(List.of("[]"))); assertEquals("", U.mergeXmlsOrJsonsToJson(List.of(""))); } @Test void mergeXmlsOrJsonsToXml() { assertEquals("", U.mergeXmlsOrJsonsToXml(List.of(""))); - assertEquals("\n" - + " \n" - + " \n" - + "", U.mergeXmlsOrJsonsToXml(List.of("", ""))); + assertEquals( + "\n" + " \n" + " \n" + "", + U.mergeXmlsOrJsonsToXml(List.of("", ""))); assertEquals( "\n" + "", U.mergeXmlsOrJsonsToXml( - List.of("\n" - + ""))); + List.of( + "\n" + + ""))); assertEquals( "\n1", U.mergeXmlsOrJsonsToXml(List.of("{\"a\":1}"))); @@ -1174,11 +1152,11 @@ void removeMapKey() { U.remove(map, "-self-closing"); Map map2 = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new ArrayList()); - list.add(new LinkedHashMap()); + list.add(new ArrayList<>()); + list.add(new LinkedHashMap<>()); map2.put("list", list); U.remove(map2, "test"); - map2.put("list2", new LinkedHashMap()); + map2.put("list2", new LinkedHashMap<>()); U.remove(map2, "test"); U.remove(map2, "list.0"); } @@ -1209,11 +1187,11 @@ void renameMapKey() { assertEquals("{\n \"-self-closing1\": \"false\"\n}", U.toJson(newMap)); Map map2 = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new ArrayList()); - list.add(new LinkedHashMap()); + list.add(new ArrayList<>()); + list.add(new LinkedHashMap<>()); map2.put("list", list); U.rename(map2, "test", "test1"); - map2.put("list", new LinkedHashMap()); + map2.put("list", new LinkedHashMap<>()); U.rename(map2, "test", "test1"); } @@ -1289,11 +1267,11 @@ void forceAddRoot() { U.JsonToXmlMode.ADD_ROOT)); Map map2 = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new ArrayList()); - list.add(new LinkedHashMap()); + list.add(new ArrayList<>()); + list.add(new LinkedHashMap<>()); map2.put("list", list); U.replaceNumberAndBooleanWithString(map2); - map2.put("list", new LinkedHashMap()); + map2.put("list", new LinkedHashMap<>()); U.replaceNumberAndBooleanWithString(map2); } @@ -1360,15 +1338,15 @@ void updateMapKey() { assertEquals("{\n \"-self-closing\": \"false\"\n}", U.toJson(newMap)); Map map2 = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new ArrayList()); - list.add(new LinkedHashMap()); + list.add(new ArrayList<>()); + list.add(new LinkedHashMap<>()); map2.put("list", list); U.update(map2, map2); - map2.put("list", new LinkedHashMap()); + map2.put("list", new LinkedHashMap<>()); U.update(map2, map2); U.update(map2, map); Map map3 = new LinkedHashMap<>(); - map3.put("list", new ArrayList()); + map3.put("list", new ArrayList<>()); U.update(map2, map3); U.update(map3, map2); } @@ -1382,11 +1360,11 @@ void setValue() { assertEquals("{\n \"-self-closing\": \"true\"\n}", U.toJson(newMap)); Map map2 = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new ArrayList()); - list.add(new LinkedHashMap()); + list.add(new ArrayList<>()); + list.add(new LinkedHashMap<>()); map2.put("list", list); U.setValue(map2, "test", "test1"); - map2.put("list", new LinkedHashMap()); + map2.put("list", new LinkedHashMap<>()); U.setValue(map2, "test", "test1"); } @@ -1530,12 +1508,12 @@ void forceAttributeUsage() { U.JsonToXmlMode.FORCE_ATTRIBUTE_USAGE)); Map map = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new LinkedHashMap()); + list.add(new LinkedHashMap<>()); map.put("list", list); U.forceAttributeUsage(map); Map map2 = new LinkedHashMap<>(); List list2 = new ArrayList<>(); - list2.add(new ArrayList()); + list2.add(new ArrayList<>()); map2.put("list", list2); U.forceAttributeUsage(map2); } @@ -1562,12 +1540,12 @@ void replaceNullWithEmptyValue() { U.JsonToXmlMode.REPLACE_NULL_WITH_EMPTY_VALUE)); Map map = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new LinkedHashMap()); + list.add(new LinkedHashMap<>()); map.put("list", list); U.replaceNullWithEmptyValue(map); Map map2 = new LinkedHashMap<>(); List list2 = new ArrayList<>(); - list2.add(new ArrayList()); + list2.add(new ArrayList<>()); map2.put("list", list2); U.replaceNullWithEmptyValue(map2); } @@ -1616,12 +1594,12 @@ void replaceNilWithNull() { + "")))); Map map = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new LinkedHashMap()); + list.add(new LinkedHashMap<>()); map.put("list", list); U.replaceNilWithNull(map); Map map2 = new LinkedHashMap<>(); List list2 = new ArrayList<>(); - list2.add(new ArrayList()); + list2.add(new ArrayList<>()); map2.put("list", list2); U.replaceNilWithNull(map2); Map map3 = new LinkedHashMap<>(); @@ -1654,12 +1632,12 @@ void replaceEmptyStringWithEmptyValue() { U.JsonToXmlMode.REPLACE_EMPTY_STRING_WITH_EMPTY_VALUE)); Map map = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new LinkedHashMap()); + list.add(new LinkedHashMap<>()); map.put("list", list); U.replaceEmptyStringWithEmptyValue(map); Map map2 = new LinkedHashMap<>(); List list2 = new ArrayList<>(); - list2.add(new ArrayList()); + list2.add(new ArrayList<>()); map2.put("list", list2); U.replaceEmptyStringWithEmptyValue(map2); } @@ -1701,43 +1679,34 @@ void formatJson() { @Test @SuppressWarnings("unchecked") void removeMinusesAndConvertNumbers() { - Map result = - U.removeMinusesAndConvertNumbers((Map) U.fromXml("")); + Map result = U.removeMinusesAndConvertNumbers(U.fromXml("")); assertEquals("{a={}}", result.toString()); - Map result2 = - U.removeMinusesAndConvertNumbers((Map) U.fromXml("")); + Map result2 = U.removeMinusesAndConvertNumbers(U.fromXml("")); assertEquals("{a={b=c}}", result2.toString()); Map result3 = - U.removeMinusesAndConvertNumbers( - (Map) U.fromXml("")); + U.removeMinusesAndConvertNumbers(U.fromXml("")); assertEquals("{a={b=[{}, {}]}}", result3.toString()); Map result4 = - U.removeMinusesAndConvertNumbers( - (Map) U.fromXml("")); + U.removeMinusesAndConvertNumbers(U.fromXml("")); assertEquals("{a={b={c=1}}}", result4.toString()); Map result5 = - U.removeMinusesAndConvertNumbers( - (Map) U.fromXml("")); + U.removeMinusesAndConvertNumbers(U.fromXml("")); assertEquals("{a={b={c=-10.0}}}", result5.toString()); Map result6 = - U.removeMinusesAndConvertNumbers( - (Map) U.fromXml("")); + U.removeMinusesAndConvertNumbers(U.fromXml("")); assertEquals("{a={b={c=-10.0}}}", result6.toString()); Map result7 = - U.removeMinusesAndConvertNumbers( - (Map) U.fromXml("")); + U.removeMinusesAndConvertNumbers(U.fromXml("")); assertEquals("{a={b={c=1.a}}}", result7.toString()); Map result8 = - U.removeMinusesAndConvertNumbers( - (Map) U.fromXml("")); + U.removeMinusesAndConvertNumbers(U.fromXml("")); assertEquals("{a={b={c=1.-}}}", result8.toString()); Map result9 = - U.removeMinusesAndConvertNumbers( - (Map) U.fromXml("")); + U.removeMinusesAndConvertNumbers(U.fromXml("")); assertEquals("{a={b={c=+1ee}}}", result9.toString()); Map map = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new ArrayList()); + list.add(new ArrayList<>()); map.put("list", list); Map result10 = U.removeMinusesAndConvertNumbers(map); assertEquals("{list=[[]]}", result10.toString()); @@ -1746,21 +1715,20 @@ void removeMinusesAndConvertNumbers() { @Test @SuppressWarnings("unchecked") void replaceFirstLevel() { - Map result = U.replaceFirstLevel((Map) U.fromXml("")); + Map result = U.replaceFirstLevel(U.fromXml("")); assertEquals("{}", result.toString()); - Map result2 = - U.replaceFirstLevel((Map) U.fromXml("c")); + Map result2 = U.replaceFirstLevel(U.fromXml("c")); assertEquals("{b=c}", result2.toString()); String result3 = U.xmlToJson("c", U.XmlToJsonMode.REMOVE_FIRST_LEVEL); assertEquals("{\n \"b\": \"c\"\n}", result3); Map map = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new LinkedHashMap()); + list.add(new LinkedHashMap<>()); map.put("list", list); U.replaceFirstLevel(map); Map map2 = new LinkedHashMap<>(); List list2 = new ArrayList<>(); - list2.add(new ArrayList()); + list2.add(new ArrayList<>()); map2.put("list", list2); U.replaceFirstLevel(map2); Map result4 = U.fromXml(""); @@ -1777,12 +1745,12 @@ void deepCopyMap() { assertEquals("{a={b=c}, #omit-xml-declaration=yes}", result2.toString()); Map map = new LinkedHashMap<>(); List list = new ArrayList<>(); - list.add(new LinkedHashMap()); + list.add(new LinkedHashMap<>()); map.put("list", list); U.deepCopyMap(map); Map map2 = new LinkedHashMap<>(); List list2 = new ArrayList<>(); - list2.add(new ArrayList()); + list2.add(new ArrayList<>()); map2.put("list", list2); U.deepCopyMap(map2); Map result3 = U.fromXml(""); @@ -1798,9 +1766,9 @@ void objectBuilder() { U.Builder.fromJson("{}"); builder.toXml(); U.Builder.fromXml(""); - U.Builder.fromMap(new LinkedHashMap()); - builder.add(new LinkedHashMap()); - builder.update(new LinkedHashMap()); + U.Builder.fromMap(new LinkedHashMap<>()); + builder.add(new LinkedHashMap<>()); + builder.update(new LinkedHashMap<>()); builder.set("1", "3"); builder.toString(); assertEquals("{1=3}", builder.build().toString()); @@ -1817,7 +1785,7 @@ void objectBuilder() { assertEquals("{}", builder.build().toString()); builder.toChain(); builder.addNull("key"); - assertEquals(null, builder.get("key")); + assertNull(builder.get("key")); Map value = U.objectBuilder() .add("firstName", "John") @@ -1907,11 +1875,11 @@ void arrayBuilder() { @SuppressWarnings("unchecked") @Test - void main() { - new U(new ArrayList()); - new U(""); - new U(Collections.emptyList()).chain(); - new U(Collections.emptyList()).of(); + void testMain() { + new U<>(new ArrayList()); + new U<>(""); + new U<>(Collections.emptyList()).chain(); + new U<>(Collections.emptyList()).of(); U.chain(new ArrayList()); U.chain(new ArrayList(), 1); U.chain(new HashSet()); @@ -2014,7 +1982,7 @@ void chain2() { U.chain(new String[] {""}).chunkFill(1, 2, ""); U.chain(new String[] {""}).cycle(1); U.chain(new String[] {""}).interpose(""); - U.chain(new String[] {""}).interposeByList(Collections.emptyList()); + U.chain(new String[] {""}).interposeByList(Collections.emptyList()); U.chain(new String[] {""}).concat(); U.chain(new String[] {""}).slice(0); U.chain(new String[] {""}).slice(0, 0); @@ -2032,7 +2000,7 @@ void chainMap() { assertEquals( "{name1=one, name2=two}", Underscore.chain( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name1", "one"); put("name2", "two"); @@ -2046,7 +2014,7 @@ void chainMap() { .underscore .U .chain( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name1", "one"); put("name2", "two"); @@ -2061,7 +2029,7 @@ void chainMap() { .underscore .U .of( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name1", "one"); put("name2", "two"); @@ -2085,7 +2053,7 @@ void stackoverflow() { + " }" + "}"; - Map data = (Map) U.get((Map) U.fromJson(json), "data"); + Map data = U.get(U.fromJson(json), "data"); assertEquals("{field1=value1, field2=value2}", data.toString()); } @@ -2098,7 +2066,7 @@ void stackoverflow2() { + "\"name\" : \"abc\" ," + "\"email id \" : [\"abc@gmail.com\",\"def@gmail.com\",\"ghi@gmail.com\"]" + "}"; - String data = (String) U.get((Map) U.fromJson(json), "email id .1"); + String data = U.get(U.fromJson(json), "email id .1"); assertEquals("def@gmail.com", data); } @@ -2139,9 +2107,7 @@ void sqlrujava() { + " ]" + "}"; - List> fromExcelData = - (List>) - U.get((Map) U.fromJson(json), "from_excel"); + List> fromExcelData = U.get(U.fromJson(json), "from_excel"); assertEquals( "[{solution=Fisrt, num=1}, {solution=Second, num=2}, {solution=third, num=3}, " + "{solution=fourth, num=4}, {solution=fifth, num=5}]", @@ -2197,9 +2163,7 @@ void stackoverflow5() { + " \n" + ""; Map jsonData = - U.>get( - U.>fromXmlWithoutNamespaces(xmlData), - "Envelope.Body.getRoles"); + U.get(U.fromXmlWithoutNamespaces(xmlData), "Envelope.Body.getRoles"); assertEquals("{getRolesRequest={Type=ABC}}", jsonData.toString()); } diff --git a/src/test/java/com/github/underscore/MathTest.java b/src/test/java/com/github/underscore/MathTest.java index 5ebce81a..65a84870 100644 --- a/src/test/java/com/github/underscore/MathTest.java +++ b/src/test/java/com/github/underscore/MathTest.java @@ -375,13 +375,10 @@ void median() { final Double result = U.median(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5)); assertEquals("0.0", result.toString()); final Double resultObj = - new U(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5)).median(); + new U<>(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5)).median(); assertEquals("0.0", resultObj.toString()); final Double resultChain = - (Double) - U.chain(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5)) - .median() - .item(); + U.chain(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5)).median().item(); assertEquals("0.0", resultChain.toString()); final Double result2 = U.median(asList((int) 0, (int) 0, (int) 1, (int) 2, (int) 5)); assertEquals("1.0", result2.toString()); @@ -450,7 +447,7 @@ void createPermutationWithRepetition() { + " [orange, orange, orange]]", result.toString()); List> result2 = - new U(asList("apple", "orange")).createPermutationWithRepetition(3); + new U<>(asList("apple", "orange")).createPermutationWithRepetition(3); assertEquals( "[[apple, apple, apple]," + " [orange, apple, apple]," @@ -477,10 +474,10 @@ void createPermutationWithRepetition() { @SuppressWarnings("unchecked") @Test - void main() { + void testMain() { U.main(new String[] {}); - assertNull(new U("").value()); - new U(Collections.emptyList()).chain(); + assertNull(new U<>("").value()); + new U<>(Collections.emptyList()).chain(); U.chain(new HashSet()); U.chain(new String[] {}); } diff --git a/src/test/java/com/github/underscore/ObjectsTest.java b/src/test/java/com/github/underscore/ObjectsTest.java index b5596cb8..7598215f 100644 --- a/src/test/java/com/github/underscore/ObjectsTest.java +++ b/src/test/java/com/github/underscore/ObjectsTest.java @@ -26,6 +26,7 @@ import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -59,7 +60,7 @@ class ObjectsTest { void keys() { Set result = Underscore.keys( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("one", 1); put("two", 2); @@ -95,7 +96,7 @@ void values() { void pairs() { List> result = Underscore.pairs( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("one", 1); put("two", 2); @@ -113,7 +114,7 @@ void pairs() { void invert() { List> result = Underscore.invert( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("Moe", "Moses"); put("Larry", "Louis"); @@ -155,7 +156,7 @@ void methods() { void pick() { final List> result = Underscore.pick( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 50); @@ -167,7 +168,7 @@ void pick() { assertEquals("[name=moe, age=50]", result.toString()); final List> result2 = Underscore.pick( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 50); @@ -190,7 +191,7 @@ void pick() { void omit() { final List> result = Underscore.omit( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 50); @@ -201,7 +202,7 @@ void omit() { assertEquals("[name=moe, age=50]", result.toString()); final List> result2 = Underscore.omit( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 50); @@ -220,7 +221,7 @@ void omit() { @Test void defaults() { Map iceCream = - new LinkedHashMap() { + new LinkedHashMap<>() { { put("flavor", "chocolate"); } @@ -228,7 +229,7 @@ void defaults() { Map result = Underscore.defaults( iceCream, - new LinkedHashMap() { + new LinkedHashMap<>() { { put("flavor", "vanilla"); put("sprinkles", "lots"); @@ -303,20 +304,20 @@ public Object clone() throws CloneNotSupportedException { @Test void isEqual() { Map stooge = - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("luckyNumbers", asList(13, 27, 34)); } }; Map clone = - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("luckyNumbers", asList(13, 27, 34)); } }; - assertFalse(stooge == clone); + assertNotSame(stooge, clone); assertTrue(Underscore.isEqual(stooge, clone)); assertTrue(Underscore.isEqual(null, null)); assertFalse(Underscore.isEqual(stooge, null)); @@ -329,16 +330,16 @@ void isEqual() { @Test @SuppressWarnings("unchecked") void isEmpty() { - assertTrue(Underscore.isEmpty((List) null)); + assertTrue(Underscore.isEmpty((List) null)); assertTrue(Underscore.isEmpty(new ArrayList())); - assertTrue(new Underscore((List) null).isEmpty()); - assertTrue(new Underscore(new ArrayList()).isEmpty()); - assertTrue(Underscore.chain((List) null).isEmpty()); + assertTrue(new Underscore<>((List) null).isEmpty()); + assertTrue(new Underscore<>(new ArrayList()).isEmpty()); + assertTrue(Underscore.chain((List) null).isEmpty()); assertTrue(Underscore.chain(new ArrayList()).isEmpty()); assertFalse(Underscore.isEmpty(Collections.singletonList(""))); - assertFalse(new Underscore(Collections.singletonList("")).isEmpty()); + assertFalse(new Underscore<>(Collections.singletonList("")).isEmpty()); assertFalse(Underscore.chain(Collections.singletonList("")).isEmpty()); - assertTrue(Underscore.isEmpty((Map) null)); + assertTrue(Underscore.isEmpty((Map) null)); assertTrue(Underscore.isEmpty(new HashMap())); assertFalse( Underscore.isEmpty( @@ -352,16 +353,16 @@ void isEmpty() { @Test @SuppressWarnings("unchecked") void isNotEmpty() { - assertFalse(Underscore.isNotEmpty((List) null)); + assertFalse(Underscore.isNotEmpty((List) null)); assertFalse(Underscore.isNotEmpty(new ArrayList())); - assertFalse(new Underscore((List) null).isNotEmpty()); - assertFalse(new Underscore(new ArrayList()).isNotEmpty()); - assertFalse(Underscore.chain((List) null).isNotEmpty()); + assertFalse(new Underscore<>((List) null).isNotEmpty()); + assertFalse(new Underscore<>(new ArrayList()).isNotEmpty()); + assertFalse(Underscore.chain((List) null).isNotEmpty()); assertFalse(Underscore.chain(new ArrayList()).isNotEmpty()); assertTrue(Underscore.isNotEmpty(Collections.singletonList(""))); - assertTrue(new Underscore(Collections.singletonList("")).isNotEmpty()); + assertTrue(new Underscore<>(Collections.singletonList("")).isNotEmpty()); assertTrue(Underscore.chain(Collections.singletonList("")).isNotEmpty()); - assertFalse(Underscore.isNotEmpty((Map) null)); + assertFalse(Underscore.isNotEmpty((Map) null)); assertFalse(Underscore.isNotEmpty(new HashMap())); assertTrue( Underscore.isNotEmpty( @@ -540,7 +541,7 @@ void has() { @Test void isMatch() { Map stooge = - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 32); @@ -549,13 +550,13 @@ void isMatch() { assertTrue( Underscore.isMatch( stooge, - new LinkedHashMap() { + new LinkedHashMap<>() { { put("age", 32); } })); Map stooge2 = - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("age", 33); @@ -564,13 +565,13 @@ void isMatch() { assertFalse( Underscore.isMatch( stooge2, - new LinkedHashMap() { + new LinkedHashMap<>() { { put("age", 32); } })); Map stooge3 = - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); } @@ -578,7 +579,7 @@ void isMatch() { assertFalse( Underscore.isMatch( stooge3, - new LinkedHashMap() { + new LinkedHashMap<>() { { put("age", 32); } @@ -593,29 +594,29 @@ void isMatch() { @SuppressWarnings("unchecked") void matcher() { List> list = - Arrays.>asList( - new LinkedHashMap() { + Arrays.asList( + new LinkedHashMap<>() { { put("name", "moe"); put("selected", true); put("visible", true); } }, - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "larry"); put("selected", true); put("visible", false); } }, - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "curly"); } }); Predicate> ready = Underscore.matcher( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("selected", true); put("visible", true); @@ -671,7 +672,7 @@ void extend() { put("name", "moe"); } }, - new LinkedHashMap() { + new LinkedHashMap<>() { { put("age", 50); } @@ -689,7 +690,7 @@ void extend() { void mapObject() { List> result = Underscore.mapObject( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("start", 5); put("end", 12); diff --git a/src/test/java/com/github/underscore/StringTest.java b/src/test/java/com/github/underscore/StringTest.java index db076884..d10acd9f 100644 --- a/src/test/java/com/github/underscore/StringTest.java +++ b/src/test/java/com/github/underscore/StringTest.java @@ -26,6 +26,7 @@ import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -530,7 +531,7 @@ void testJsonArrayCollection() { } }))); assertEquals("[\n null\n]", U.toJson(Arrays.asList(new String[] {null}))); - assertEquals("null", U.toJson((Collection) null)); + assertEquals("null", U.toJson((Collection) null)); class Test { public String toString() { return "test"; @@ -1566,7 +1567,7 @@ void toXmlFromMap() { U.toXml(testMap)); assertEquals( "\nnull", - U.toXml((Map) null)); + U.toXml((Map) null)); assertEquals( "\n" + "", @@ -3574,7 +3575,7 @@ void fromJsonParseException() throws IOException { try { U.fromJsonMap(stringJson, 1000); } catch (Throwable throwable) { - assertTrue(throwable instanceof Json.ParseException); + assertInstanceOf(Json.ParseException.class, throwable); } } @@ -3586,7 +3587,7 @@ void fromJsonStackoverflowArray() throws IOException { try { U.fromJsonMap(stringJson); } catch (Throwable throwable) { - assertTrue(throwable instanceof StackOverflowError); + assertInstanceOf(StackOverflowError.class, throwable); } } @@ -3612,8 +3613,9 @@ void fromXmlStackoverflowObject() throws IOException { try { U.fromXmlMap(stringXml); } catch (Throwable throwable) { - assertTrue(throwable instanceof StackOverflowError - || throwable instanceof IllegalArgumentException); + assertTrue( + throwable instanceof StackOverflowError + || throwable instanceof IllegalArgumentException); } } diff --git a/src/test/java/com/github/underscore/UnderscoreTest.java b/src/test/java/com/github/underscore/UnderscoreTest.java index 59caff8f..e1327e0d 100644 --- a/src/test/java/com/github/underscore/UnderscoreTest.java +++ b/src/test/java/com/github/underscore/UnderscoreTest.java @@ -28,6 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -55,11 +56,11 @@ class UnderscoreTest { @Test @SuppressWarnings("unchecked") - void main() { + void testMain() { Underscore.main(new String[] {}); - new Underscore(singletonList("")).getIterable(); - assertEquals("[]", new Underscore(singletonList("")).value().toString()); - new Underscore(""); + new Underscore<>(singletonList("")).getIterable(); + assertEquals("[]", new Underscore<>(singletonList("")).value().toString()); + new Underscore<>(""); } /* @@ -74,7 +75,7 @@ void sort() { Underscore.sort(asList("some", "words", "example")).toString()); assertEquals( "[example, some, words]", - new Underscore(asList("some", "words", "example")).sort().toString()); + new Underscore<>(asList("some", "words", "example")).sort().toString()); assertEquals( "[example, some, words]", Underscore.chain(asList("some", "words", "example")).sort().value().toString()); @@ -100,7 +101,8 @@ void join() { assertEquals( "some-words-example", Underscore.join(asList("some", "words", "example"), "-")); assertEquals( - "some-words-example", new Underscore(asList("some", "words", "example")).join("-")); + "some-words-example", + new Underscore<>(asList("some", "words", "example")).join("-")); assertEquals( "some-words-example", Underscore.join(new String[] {"some", "words", "example"}, "-")); @@ -109,7 +111,7 @@ void join() { Underscore.chain(asList("some", "words", "example")).join("-").item()); assertEquals("some words example", Underscore.join(asList("some", "words", "example"))); assertEquals( - "some words example", new Underscore(asList("some", "words", "example")).join()); + "some words example", new Underscore<>(asList("some", "words", "example")).join()); assertEquals( "some words example", Underscore.join(new String[] {"some", "words", "example"})); assertEquals( @@ -161,7 +163,8 @@ void push() { assertEquals( "[a, b, c, 0, 2]", Underscore.push(asList("a", "b", "c"), "0", "2").toString()); assertEquals( - "[a, b, c, 0, 2]", new Underscore(asList("a", "b", "c")).push("0", "2").toString()); + "[a, b, c, 0, 2]", + new Underscore<>(asList("a", "b", "c")).push("0", "2").toString()); assertEquals( "[a, b, c, 0, 2]", Underscore.chain(asList("a", "b", "c")).push("0", "2").value().toString()); @@ -175,7 +178,7 @@ void push() { @Test void pop() { assertEquals("c", Underscore.pop(asList("a", "b", "c")).getKey()); - assertEquals("c", new Underscore(asList("a", "b", "c")).pop().getKey().toString()); + assertEquals("c", new Underscore<>(asList("a", "b", "c")).pop().getKey().toString()); assertEquals("c", Underscore.chain(asList("a", "b", "c")).pop().item().getKey()); } @@ -187,7 +190,7 @@ void pop() { @Test void shift() { assertEquals("a", Underscore.shift(asList("a", "b", "c")).getKey()); - assertEquals("a", new Underscore(asList("a", "b", "c")).shift().getKey().toString()); + assertEquals("a", new Underscore<>(asList("a", "b", "c")).shift().getKey().toString()); assertEquals("a", Underscore.chain(asList("a", "b", "c")).shift().item().getKey()); } @@ -202,7 +205,7 @@ void unshift() { "[0, 2, a, b, c]", Underscore.unshift(asList("a", "b", "c"), "0", "2").toString()); assertEquals( "[0, 2, a, b, c]", - new Underscore(asList("a", "b", "c")).unshift("0", "2").toString()); + new Underscore<>(asList("a", "b", "c")).unshift("0", "2").toString()); assertEquals( "[0, 2, a, b, c]", Underscore.chain(asList("a", "b", "c")).unshift("0", "2").value().toString()); @@ -261,12 +264,12 @@ void concat() { @SuppressWarnings("unchecked") void slice() { assertEquals(asList(3, 4, 5), Underscore.slice(asList(1, 2, 3, 4, 5), 2)); - assertEquals(asList(3, 4, 5), new Underscore(asList(1, 2, 3, 4, 5)).slice(2)); + assertEquals(asList(3, 4, 5), new Underscore<>(asList(1, 2, 3, 4, 5)).slice(2)); assertEquals(asList(2, 3, 4), Underscore.slice(asList(1, 2, 3, 4, 5), 1, 4)); assertEquals(asList("a", "b"), Underscore.slice(asList("a", "b", "c", "d"), 0, 2)); assertEquals(asList(2, 3, 4), Underscore.slice(asList(1, 2, 3, 4, 5), 1, -1)); assertEquals(singletonList(3), Underscore.slice(asList(1, 2, 3, 4, 5), 2, 3)); - assertEquals(singletonList(3), new Underscore(asList(1, 2, 3, 4, 5)).slice(2, 3)); + assertEquals(singletonList(3), new Underscore<>(asList(1, 2, 3, 4, 5)).slice(2, 3)); assertEquals(asList(4, 5), Underscore.slice(asList(1, 2, 3, 4, 5), -2)); assertEquals(asList(3, 4), Underscore.slice(asList(1, 2, 3, 4, 5), -3, -1)); assertEquals(asList(3, 4), Underscore.slice(asList(1, 2, 3, 4, 5), -3, 4)); @@ -363,11 +366,11 @@ void takeSkipping() { @SuppressWarnings("unchecked") void copyOf() { assertEquals(asList(1, 2, 3), Underscore.copyOf(asList(1, 2, 3))); - assertEquals(asList(1, 2, 3), new Underscore(asList(1, 2, 3)).copyOf()); - assertFalse(asList(1, 2, 3) == Underscore.copyOf(asList(1, 2, 3))); + assertEquals(asList(1, 2, 3), new Underscore<>(asList(1, 2, 3)).copyOf()); + assertNotSame(asList(1, 2, 3), Underscore.copyOf(asList(1, 2, 3))); assertEquals(asList("a", "b"), Underscore.copyOfRange(asList("a", "b", "c", "d"), 0, 2)); assertEquals( - asList("a", "b"), new Underscore(asList("a", "b", "c", "d")).copyOfRange(0, 2)); + asList("a", "b"), new Underscore<>(asList("a", "b", "c", "d")).copyOfRange(0, 2)); } /* @@ -620,7 +623,7 @@ void and() { Underscore.and( (Predicate) Objects::nonNull, (Predicate) value -> value.intValue() > 0, - (Predicate) value -> (50 <= value) && (value <= 60)); + value -> (50 <= value) && (value <= 60)); assertTrue(predicate.test(50)); assertFalse(predicate.test(null)); assertFalse(predicate.test(-56)); @@ -636,7 +639,7 @@ void or() { Underscore.or( (Predicate) Objects::isNull, (Predicate) value -> value.intValue() > 2000, - (Predicate) value -> (50 <= value) && (value <= 60)); + value -> (50 <= value) && (value <= 60)); assertTrue(predicate.test(50)); assertTrue(predicate.test(55)); assertTrue(predicate.test(60)); diff --git a/src/test/java/com/github/underscore/UtilityTest.java b/src/test/java/com/github/underscore/UtilityTest.java index 98a4ffcc..75a93b8d 100644 --- a/src/test/java/com/github/underscore/UtilityTest.java +++ b/src/test/java/com/github/underscore/UtilityTest.java @@ -53,7 +53,7 @@ class UtilityTest { @Test void identity() { Map object = - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); } @@ -69,7 +69,7 @@ void identity() { @Test void constant() { Map object = - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); } @@ -85,7 +85,7 @@ void constant() { @Test void property() { Map stooge = - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); } @@ -101,7 +101,7 @@ void property() { @Test void propertyOf() { Map stooge = - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); } @@ -195,9 +195,9 @@ void mixin() { string -> String.valueOf(string.charAt(0)).toUpperCase() + string.substring(1).toLowerCase()); - assertEquals("Fabio", new Underscore("fabio").call("capitalize").get()); - assertFalse(new Underscore("fabio").call("capitalize2").isPresent()); - assertFalse(new Underscore(Collections.singletonList(1)).call("capitalize2").isPresent()); + assertEquals("Fabio", new Underscore<>("fabio").call("capitalize").get()); + assertFalse(new Underscore<>("fabio").call("capitalize2").isPresent()); + assertFalse(new Underscore<>(Collections.singletonList(1)).call("capitalize2").isPresent()); } /* @@ -234,7 +234,7 @@ void template() { assertEquals( "hello: moe", compiled.apply( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); } @@ -248,7 +248,7 @@ void template2() { assertEquals( "hello: moe, hello2: moe", compiled.apply( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); } @@ -262,7 +262,7 @@ void template3() { assertEquals( "hello: moe, hello2: moe2", compiled.apply( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); put("name2", "moe2"); @@ -273,13 +273,13 @@ void template3() { @Test void template4() { Underscore.templateSettings( - new HashMap() { + new HashMap<>() { { put("interpolate", ""); } }); Underscore.templateSettings( - new HashMap() { + new HashMap<>() { { put("interpolate", "\\{\\{=([\\s\\S]+?)\\}\\}"); } @@ -289,13 +289,13 @@ void template4() { assertEquals( "hello: moe", compiled.apply( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("name", "moe"); } })); Underscore.templateSettings( - new HashMap() { + new HashMap<>() { { put("interpolate", "<%=([\\s\\S]+?)%>"); } @@ -314,7 +314,7 @@ void templateValue() { assertEquals( "<script>", template.apply( - new LinkedHashMap() { + new LinkedHashMap<>() { { put("value", "