Skip to content

Commit f99da3c

Browse files
javadevjavadev
committed
Improved format
1 parent b0ce12b commit f99da3c

File tree

7 files changed

+70
-131
lines changed

7 files changed

+70
-131
lines changed

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

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

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

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

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,8 @@ void chainObj() {
161161
final String youngest =
162162
new Underscore<>(stooges)
163163
.chain()
164-
.sortBy(
165-
item -> (Integer) item.get("age"))
166-
.map(
167-
item -> item.get("name") + " is " + item.get("age"))
164+
.sortBy(item -> (Integer) item.get("age"))
165+
.map(item -> item.get("name") + " is " + item.get("age"))
168166
.first()
169167
.item()
170168
.toString();
@@ -442,7 +440,7 @@ void chain4() {
442440
"yearsPlayed",
443441
(Integer) item.get("end")
444442
- (Integer)
445-
item.get("begin")
443+
item.get("begin")
446444
+ 1);
447445
}
448446
})

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

Lines changed: 21 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ void forEachIndexed() {
116116
Underscore.forEachIndexed(asList(1, 2, 3), (index, item) -> result.add(item));
117117
assertEquals("[1, 2, 3]", result.toString());
118118
final List<Integer> resultObj = new ArrayList<>();
119-
new Underscore<>(asList(1, 2, 3))
120-
.forEachIndexed(
121-
(index, item) -> resultObj.add(item));
119+
new Underscore<>(asList(1, 2, 3)).forEachIndexed((index, item) -> resultObj.add(item));
122120
assertEquals("[1, 2, 3]", resultObj.toString());
123121
}
124122

@@ -274,9 +272,7 @@ void collect() {
274272
List<Integer> result = Underscore.collect(asList(1, 2, 3), item -> item * 3);
275273
assertEquals("[3, 6, 9]", result.toString());
276274
Set<Integer> resultSet =
277-
Underscore.collect(
278-
new LinkedHashSet<>(asList(1, 2, 3)),
279-
item -> item * 3);
275+
Underscore.collect(new LinkedHashSet<>(asList(1, 2, 3)), item -> item * 3);
280276
assertEquals("[3, 6, 9]", resultSet.toString());
281277
}
282278

@@ -518,8 +514,7 @@ void filterFalse() {
518514
assertEquals("[1, 3, 5]", resultObject.toString());
519515
final Set<Integer> resultSet =
520516
Underscore.filterFalse(
521-
new LinkedHashSet<>(asList(1, 2, 3, 4, 5, 6)),
522-
item -> item % 2 == 0);
517+
new LinkedHashSet<>(asList(1, 2, 3, 4, 5, 6)), item -> item % 2 == 0);
523518
assertEquals("[1, 3, 5]", resultSet.toString());
524519
}
525520

@@ -552,8 +547,7 @@ void select() {
552547
assertEquals("[2, 4, 6]", result.toString());
553548
final Set<Integer> resultSet =
554549
Underscore.select(
555-
new LinkedHashSet<>(asList(1, 2, 3, 4, 5, 6)),
556-
item -> item % 2 == 0);
550+
new LinkedHashSet<>(asList(1, 2, 3, 4, 5, 6)), item -> item % 2 == 0);
557551
assertEquals("[2, 4, 6]", resultSet.toString());
558552
}
559553

@@ -572,8 +566,7 @@ void reject() {
572566
assertEquals("[1, 3, 5]", resultObject.toString());
573567
final Set<Integer> resultSet =
574568
Underscore.reject(
575-
new LinkedHashSet<>(asList(1, 2, 3, 4, 5, 6)),
576-
item -> item % 2 == 0);
569+
new LinkedHashSet<>(asList(1, 2, 3, 4, 5, 6)), item -> item % 2 == 0);
577570
assertEquals("[1, 3, 5]", resultSet.toString());
578571
}
579572

@@ -603,13 +596,11 @@ void rejectIndexed() {
603596
void every() {
604597
final boolean result1 = Underscore.every(asList(1, 2, 3, 4), item -> item % 2 == 0);
605598
final boolean result1obj =
606-
new Underscore<>(asList(1, 2, 3, 4))
607-
.every(item -> item % 2 == 0);
599+
new Underscore<>(asList(1, 2, 3, 4)).every(item -> item % 2 == 0);
608600
final boolean result1chain =
609601
Underscore.chain(asList(1, 2, 3, 4)).every(item -> item % 2 == 0).item();
610602
final boolean result2 = Underscore.every(asList(1, 2, 3, 4), item -> item < 5);
611-
final boolean result2obj =
612-
new Underscore<>(asList(1, 2, 3, 4)).every(item -> item < 5);
603+
final boolean result2obj = new Underscore<>(asList(1, 2, 3, 4)).every(item -> item < 5);
613604
final boolean result2chain =
614605
Underscore.chain(asList(1, 2, 3, 4)).every(item -> item < 5).item();
615606
assertFalse(result1);
@@ -628,11 +619,9 @@ void every() {
628619
@SuppressWarnings("unchecked")
629620
void all() {
630621
final boolean result1 = Underscore.all(asList(1, 2, 3, 4), item -> item % 2 == 0);
631-
final boolean result1obj =
632-
new Underscore<>(asList(1, 2, 3, 4)).all(item -> item % 2 == 0);
622+
final boolean result1obj = new Underscore<>(asList(1, 2, 3, 4)).all(item -> item % 2 == 0);
633623
final boolean result2 = Underscore.all(asList(1, 2, 3, 4), item -> item < 5);
634-
final boolean result2obj =
635-
new Underscore<>(asList(1, 2, 3, 4)).all(item -> item < 5);
624+
final boolean result2obj = new Underscore<>(asList(1, 2, 3, 4)).all(item -> item < 5);
636625
assertFalse(result1);
637626
assertFalse(result1obj);
638627
assertTrue(result2);
@@ -647,11 +636,9 @@ void all() {
647636
@SuppressWarnings("unchecked")
648637
void any() {
649638
final boolean result1 = Underscore.any(asList(1, 2, 3, 4), item -> item % 2 == 0);
650-
final boolean result1obj =
651-
new Underscore<>(asList(1, 2, 3, 4)).any(item -> item % 2 == 0);
639+
final boolean result1obj = new Underscore<>(asList(1, 2, 3, 4)).any(item -> item % 2 == 0);
652640
final boolean result2 = Underscore.any(asList(1, 2, 3, 4), item -> item == 5);
653-
final boolean result2obj =
654-
new Underscore<>(asList(1, 2, 3, 4)).any(item -> item == 5);
641+
final boolean result2obj = new Underscore<>(asList(1, 2, 3, 4)).any(item -> item == 5);
655642
assertTrue(result1);
656643
assertTrue(result1obj);
657644
assertFalse(result2);
@@ -666,13 +653,11 @@ void any() {
666653
@SuppressWarnings("unchecked")
667654
void some() {
668655
final boolean result1 = Underscore.some(asList(1, 2, 3, 4), item -> item % 2 == 0);
669-
final boolean result1obj =
670-
new Underscore<>(asList(1, 2, 3, 4)).some(item -> item % 2 == 0);
656+
final boolean result1obj = new Underscore<>(asList(1, 2, 3, 4)).some(item -> item % 2 == 0);
671657
final boolean result1chain =
672658
Underscore.chain(asList(1, 2, 3, 4)).some(item -> item % 2 == 0).item();
673659
final boolean result2 = Underscore.some(asList(1, 2, 3, 4), item -> item == 5);
674-
final boolean result2obj =
675-
new Underscore<>(asList(1, 2, 3, 4)).some(item -> item == 5);
660+
final boolean result2obj = new Underscore<>(asList(1, 2, 3, 4)).some(item -> item == 5);
676661
final boolean result2chain =
677662
Underscore.chain(asList(1, 2, 3, 4)).some(item -> item == 5).item();
678663
assertTrue(result1);
@@ -700,14 +685,11 @@ void include() {
700685
@SuppressWarnings("unchecked")
701686
void count() {
702687
final int result1 = Underscore.count(asList(1, 2, 3, 4), item -> item % 2 == 0);
703-
final int result1obj =
704-
new Underscore<>(asList(1, 2, 3, 4))
705-
.count(item -> item % 2 == 0);
688+
final int result1obj = new Underscore<>(asList(1, 2, 3, 4)).count(item -> item % 2 == 0);
706689
final int result1chain =
707690
Underscore.chain(asList(1, 2, 3, 4)).count(item -> item % 2 == 0).item();
708691
final int result2 = Underscore.count(asList(1, 2, 3, 4), item -> item < 5);
709-
final int result2obj =
710-
new Underscore<>(asList(1, 2, 3, 4)).count(item -> item < 5);
692+
final int result2obj = new Underscore<>(asList(1, 2, 3, 4)).count(item -> item < 5);
711693
final int result2chain =
712694
Underscore.chain(asList(1, 2, 3, 4)).count(item -> item < 5).item();
713695
assertEquals(2, result1);
@@ -795,7 +777,8 @@ void containsAtMost() {
795777
@SuppressWarnings("unchecked")
796778
void invoke() {
797779
assertEquals(asList("foo", "bar"), Underscore.invoke(asList(" foo ", " bar"), "trim"));
798-
assertEquals(asList("foo", "bar"), new Underscore<>(asList(" foo ", " bar")).invoke("trim"));
780+
assertEquals(
781+
asList("foo", "bar"), new Underscore<>(asList(" foo ", " bar")).invoke("trim"));
799782
assertEquals(
800783
asList("foo", "bar"),
801784
Underscore.chain(asList(" foo ", " bar")).invoke("trim").value());
@@ -1412,8 +1395,7 @@ void groupBy() {
14121395
Underscore.groupBy(asList(1.3, 2.1, 2.4), Math::floor);
14131396
assertEquals("{1.0=[1.3], 2.0=[2.1, 2.4]}", result.toString());
14141397
final Map<Double, List<Double>> resultObj =
1415-
new Underscore<>(asList(1.3, 2.1, 2.4))
1416-
.groupBy(Math::floor);
1398+
new Underscore<>(asList(1.3, 2.1, 2.4)).groupBy(Math::floor);
14171399
assertEquals("{1.0=[1.3], 2.0=[2.1, 2.4]}", resultObj.toString());
14181400
final Map<Double, List<Double>> resultChain =
14191401
Underscore.chain(asList(1.3, 2.1, 2.4)).groupBy(Math::floor).item();
@@ -1431,8 +1413,7 @@ void associateBy() {
14311413
Underscore.associateBy(asList(1.3, 2.1, 2.4), Math::floor);
14321414
assertEquals("{1.0=1.3, 2.0=2.1}", result.toString());
14331415
final Map<Double, Double> resultObj =
1434-
new Underscore<>(asList(1.3, 2.1, 2.4))
1435-
.associateBy(Math::floor);
1416+
new Underscore<>(asList(1.3, 2.1, 2.4)).associateBy(Math::floor);
14361417
assertEquals("{1.0=1.3, 2.0=2.1}", resultObj.toString());
14371418
final Map<Double, Double> resultChain =
14381419
Underscore.chain(asList(1.3, 2.1, 2.4)).associateBy(Math::floor).item();
@@ -1450,10 +1431,7 @@ void groupByWithSumming() {
14501431
Underscore.groupBy(asList(1.3, 2.1, 2.4), Math::floor, Double::sum);
14511432
assertEquals("{1.0=Optional[1.3], 2.0=Optional[4.5]}", result.toString());
14521433
final Map<Double, Optional<Double>> resultObj =
1453-
new Underscore<>(asList(1.3, 2.1, 2.4))
1454-
.groupBy(
1455-
Math::floor,
1456-
Double::sum);
1434+
new Underscore<>(asList(1.3, 2.1, 2.4)).groupBy(Math::floor, Double::sum);
14571435
assertEquals("{1.0=Optional[1.3], 2.0=Optional[4.5]}", resultObj.toString());
14581436
final Map<Double, Optional<Double>> resultChain =
14591437
Underscore.chain(asList(1.3, 2.1, 2.4)).groupBy(Math::floor, Double::sum).item();
@@ -1601,8 +1579,7 @@ void sample() {
16011579
assertTrue(resultObj >= 1 && resultObj <= 6);
16021580
final Set<Integer> resultList = Underscore.sample(asList(1, 2, 3, 4, 5, 6), 3);
16031581
assertEquals(3, resultList.size());
1604-
final Integer resultChain =
1605-
Underscore.chain(asList(1, 2, 3, 4, 5, 6)).sample().item();
1582+
final Integer resultChain = Underscore.chain(asList(1, 2, 3, 4, 5, 6)).sample().item();
16061583
assertTrue(resultChain >= 1 && resultChain <= 6);
16071584
final List<Integer> resultListChain =
16081585
Underscore.chain(asList(1, 2, 3, 4, 5, 6)).sample(3).value();

0 commit comments

Comments
 (0)