Skip to content

Commit 711f06b

Browse files
javadevjavadev
committed
Fix checkstyle warnings.
1 parent 7c6d8ab commit 711f06b

File tree

8 files changed

+110
-55
lines changed

8 files changed

+110
-55
lines changed

‎checkstyle.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<module name="FileLength">
2121
<property name="fileExtensions" value="java"/>
2222
<property name="severity" value="warning"/>
23+
<property name="max" value="2100"/>
2324
</module>
2425
<module name="RegexpSingleline">
2526
<property name="format" value="\s+$"/>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,8 @@ public static <E> Set<E> sample(final List<E> list, final int howMany) {
504504
return samples;
505505
}
506506

507-
public static <E, T extends Comparable<? super T>> List<E> sortBy(final Iterable<E> iterable, final Function1<E, T> func) {
507+
public static <E, T extends Comparable<? super T>> List<E> sortBy(final Iterable<E> iterable,
508+
final Function1<E, T> func) {
508509
final List<E> sortedList = newArrayList(iterable);
509510
Collections.sort(sortedList, new Comparator<E>() {
510511
@Override
@@ -519,7 +520,8 @@ public <E, T extends Comparable<? super T>> List<E> sortBy(final Function1<E, T>
519520
return sortBy((Iterable<E>) iterable, func);
520521
}
521522

522-
public static <K, V extends Comparable<? super V>> List<Map<K, V>> sortBy(final Iterable<Map<K, V>> iterable, final K key) {
523+
public static <K, V extends Comparable<? super V>> List<Map<K, V>> sortBy(final Iterable<Map<K, V>> iterable,
524+
final K key) {
523525
final List<Map<K, V>> sortedList = newArrayList(iterable);
524526
Collections.sort(sortedList, new Comparator<Map<K, V>>() {
525527
@Override

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,16 @@ public String toString() {
287287
}
288288
}
289289
final int result =
290-
$.<Person>sortedIndex(asList(new Person("moe", 40), new Person("moe", 50), new Person("curly", 60)), new Person("moe", 50), "age");
290+
$.<Person>sortedIndex(asList(new Person("moe", 40), new Person("moe", 50),
291+
new Person("curly", 60)), new Person("moe", 50), "age");
291292
assertEquals(1, result);
292293
final int result2 =
293-
$.<Person>sortedIndex(asList(new Person("moe", 40), new Person("moe", 50), new Person("curly", 60)), new Person("moe", 70), "age");
294+
$.<Person>sortedIndex(asList(new Person("moe", 40), new Person("moe", 50),
295+
new Person("curly", 60)), new Person("moe", 70), "age");
294296
assertEquals(-1, result2);
295297
final int resultArray =
296-
$.<Person>sortedIndex(new Person[] {new Person("moe", 40), new Person("moe", 50), new Person("curly", 60)}, new Person("moe", 50), "age");
298+
$.<Person>sortedIndex(new Person[] {new Person("moe", 40), new Person("moe", 50),
299+
new Person("curly", 60)}, new Person("moe", 50), "age");
297300
assertEquals(1, resultArray);
298301
}
299302

@@ -391,7 +394,8 @@ public void difference() {
391394
assertEquals("[1, 3]", resultList.toString());
392395
final Object[] resultArray = $.difference(new Integer[] {1, 2, 3, 4, 5}, new Integer[] {5, 2, 10});
393396
assertEquals("[1, 3, 4]", asList(resultArray).toString());
394-
final Object[] resultArray2 = $.difference(new Integer[] {1, 2, 3, 4, 5}, new Integer[] {5, 2, 10}, new Integer[] {8, 4});
397+
final Object[] resultArray2 = $.difference(new Integer[] {1, 2, 3, 4, 5},
398+
new Integer[] {5, 2, 10}, new Integer[] {8, 4});
395399
assertEquals("[1, 3]", asList(resultArray2).toString());
396400
}
397401

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

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,14 @@ public String apply(Map<String, Object> item) {
163163
@Test
164164
public void chain2() {
165165
final List<Map<String, Object>> lyrics = new ArrayList<Map<String, Object>>() { {
166-
add(new LinkedHashMap<String, Object>() { { put("line", 1); put("words", "I'm a lumberjack and I'm okay"); } });
167-
add(new LinkedHashMap<String, Object>() { { put("line", 2); put("words", "I sleep all night and I work all day"); } });
168-
add(new LinkedHashMap<String, Object>() { { put("line", 3); put("words", "He's a lumberjack and he's okay"); } });
169-
add(new LinkedHashMap<String, Object>() { { put("line", 4); put("words", "He sleeps all night and he works all day"); } });
166+
add(new LinkedHashMap<String, Object>() { {
167+
put("line", 1); put("words", "I'm a lumberjack and I'm okay"); } });
168+
add(new LinkedHashMap<String, Object>() { {
169+
put("line", 2); put("words", "I sleep all night and I work all day"); } });
170+
add(new LinkedHashMap<String, Object>() { {
171+
put("line", 3); put("words", "He's a lumberjack and he's okay"); } });
172+
add(new LinkedHashMap<String, Object>() { {
173+
put("line", 4); put("words", "He sleeps all night and he works all day"); } });
170174
} };
171175
final String result = $.chain(lyrics)
172176
.map(
@@ -216,10 +220,14 @@ public Map<String, Integer> apply(Map<String, Integer> accum, String item) {
216220
@Test
217221
public void chain3() {
218222
final List<Map<String, Object>> lyrics = new ArrayList<Map<String, Object>>() { {
219-
add(new LinkedHashMap<String, Object>() { { put("line", 1); put("words", "I'm a lumberjack and I'm okay"); } });
220-
add(new LinkedHashMap<String, Object>() { { put("line", 2); put("words", "I sleep all night and I work all day"); } });
221-
add(new LinkedHashMap<String, Object>() { { put("line", 3); put("words", "He's a lumberjack and he's okay"); } });
222-
add(new LinkedHashMap<String, Object>() { { put("line", 4); put("words", "He sleeps all night and he works all day"); } });
223+
add(new LinkedHashMap<String, Object>() { {
224+
put("line", 1); put("words", "I'm a lumberjack and I'm okay"); } });
225+
add(new LinkedHashMap<String, Object>() { {
226+
put("line", 2); put("words", "I sleep all night and I work all day"); } });
227+
add(new LinkedHashMap<String, Object>() { {
228+
put("line", 3); put("words", "He's a lumberjack and he's okay"); } });
229+
add(new LinkedHashMap<String, Object>() { {
230+
put("line", 4); put("words", "He sleeps all night and he works all day"); } });
223231
} };
224232
final String result = $.chain(lyrics)
225233
.map(
@@ -274,9 +282,12 @@ public Map<String, Integer> apply(Map<String, Integer> accum, String item) {
274282
@Test
275283
public void chain4() {
276284
final List<Map<String, Object>> doctors = new ArrayList<Map<String, Object>>() { {
277-
add(new LinkedHashMap<String, Object>() { { put("number", 1); put("actor", "William Hartnell"); put("begin", 1963); put("end", 1966); } });
278-
add(new LinkedHashMap<String, Object>() { { put("number", 9); put("actor", "Christopher Eccleston"); put("begin", 2005); put("end", 2005); } });
279-
add(new LinkedHashMap<String, Object>() { { put("number", 10); put("actor", "David Tennant"); put("begin", 2005); put("end", 2010); } });
285+
add(new LinkedHashMap<String, Object>() { {
286+
put("number", 1); put("actor", "William Hartnell"); put("begin", 1963); put("end", 1966); } });
287+
add(new LinkedHashMap<String, Object>() { {
288+
put("number", 9); put("actor", "Christopher Eccleston"); put("begin", 2005); put("end", 2005); } });
289+
add(new LinkedHashMap<String, Object>() { {
290+
put("number", 10); put("actor", "David Tennant"); put("begin", 2005); put("end", 2010); } });
280291
} };
281292
final String result = $.chain(doctors)
282293
.filter(
@@ -321,9 +332,12 @@ public Map<String, Object> apply(final Map<String, Object> item) {
321332
@Test
322333
public void chain5() {
323334
final List<Map<String, Object>> doctors = new ArrayList<Map<String, Object>>() { {
324-
add(new LinkedHashMap<String, Object>() { { put("number", 1); put("actor", "William Hartnell"); put("begin", 1963); put("end", 1966); } });
325-
add(new LinkedHashMap<String, Object>() { { put("number", 9); put("actor", "Christopher Eccleston"); put("begin", 2005); put("end", 2005); } });
326-
add(new LinkedHashMap<String, Object>() { { put("number", 10); put("actor", "David Tennant"); put("begin", 2005); put("end", 2010); } });
335+
add(new LinkedHashMap<String, Object>() { {
336+
put("number", 1); put("actor", "William Hartnell"); put("begin", 1963); put("end", 1966); } });
337+
add(new LinkedHashMap<String, Object>() { {
338+
put("number", 9); put("actor", "Christopher Eccleston"); put("begin", 2005); put("end", 2005); } });
339+
add(new LinkedHashMap<String, Object>() { {
340+
put("number", 10); put("actor", "David Tennant"); put("begin", 2005); put("end", 2010); } });
327341
} };
328342
final String result = $.chain(doctors)
329343
.skip(1)

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

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ public void apply(Integer item) {
140140
@Test
141141
public void eachMap() {
142142
final List<String> result = new ArrayList<String>();
143-
$.<Map.Entry<String, Integer>>each((new LinkedHashMap<String, Integer>() { { put("one", 1); put("two", 2); put("three", 3); } }).entrySet(),
143+
$.<Map.Entry<String, Integer>>each((new LinkedHashMap<String, Integer>() { {
144+
put("one", 1); put("two", 2); put("three", 3); } }).entrySet(),
144145
new Block<Map.Entry<String, Integer>>() {
145146
public void apply(Map.Entry<String, Integer> item) {
146147
result.add(item.getKey());
@@ -517,7 +518,8 @@ public void contains() {
517518
public void invoke() {
518519
assertEquals($.invoke(asList(" foo ", " bar"), "trim"), asList("foo", "bar"));
519520
assertEquals($.invoke(asList("foo", "bar"), "concat", Arrays.<Object>asList("1")), asList("foo1", "bar1"));
520-
assertEquals($.invoke(asList($.chain(asList(5, 1, 7)), $.chain(asList(3, 2, 1))), "sort").toString(), asList("[1, 5, 7]", "[1, 2, 3]").toString());
521+
assertEquals($.invoke(asList($.chain(asList(5, 1, 7)),
522+
$.chain(asList(3, 2, 1))), "sort").toString(), asList("[1, 5, 7]", "[1, 2, 3]").toString());
521523
}
522524

523525
@Test(expected = IllegalArgumentException.class)
@@ -555,7 +557,8 @@ public Person(final String name, final Integer age) {
555557
$.pluck(new LinkedHashSet(asList()), "name");
556558
assertEquals("[]", resultEmpty2.toString());
557559
final Set<?> resultSet =
558-
$.pluck(new LinkedHashSet(asList(new Person("moe", 40), new Person("larry", 50), new Person("curly", 40))), "name");
560+
$.pluck(new LinkedHashSet(
561+
asList(new Person("moe", 40), new Person("larry", 50), new Person("curly", 40))), "name");
559562
assertEquals("[moe, larry, curly]", resultSet.toString());
560563
}
561564

@@ -582,7 +585,8 @@ public Person(final String name, final Integer age) {
582585
this.age = age;
583586
}
584587
}
585-
$.pluck(new LinkedHashSet(asList(new Person("moe", 40), new Person("larry", 50), new Person("curly", 40))), "name2");
588+
$.pluck(new LinkedHashSet(
589+
asList(new Person("moe", 40), new Person("larry", 50), new Person("curly", 40))), "name2");
586590
}
587591

588592
/*
@@ -704,7 +708,8 @@ public Person(final String name, final Integer age) {
704708
this.age = age;
705709
}
706710
}
707-
final Person resultPerson = $.max(asList(new Person("moe", 40), new Person("larry", 50), new Person("curly", 60)),
711+
final Person resultPerson = $.max(
712+
asList(new Person("moe", 40), new Person("larry", 50), new Person("curly", 60)),
708713
new Function1<Person, Integer>() {
709714
public Integer apply(Person item) {
710715
return item.age;
@@ -747,7 +752,8 @@ public Person(final String name, final Integer age) {
747752
this.age = age;
748753
}
749754
}
750-
final Person resultPerson = $.min(asList(new Person("moe", 40), new Person("larry", 50), new Person("curly", 60)),
755+
final Person resultPerson = $.min(
756+
asList(new Person("moe", 40), new Person("larry", 50), new Person("curly", 60)),
751757
new Function1<Person, Integer>() {
752758
public Integer apply(Person item) {
753759
return item.age;
@@ -789,15 +795,21 @@ public Integer apply(Integer item) {
789795
@Test
790796
public void sortByMap() {
791797
final List<Map<String, Comparable>> result = $.sortBy(asList(
792-
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { { put("name", "moe"); put("age", 40); } },
793-
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { { put("name", "larry"); put("age", 50); } },
794-
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { { put("name", "curly"); put("age", 60); } }
798+
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { {
799+
put("name", "moe"); put("age", 40); } },
800+
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { {
801+
put("name", "larry"); put("age", 50); } },
802+
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { {
803+
put("name", "curly"); put("age", 60); } }
795804
), "name");
796805
assertEquals("[{name=curly, age=60}, {name=larry, age=50}, {name=moe, age=40}]", result.toString());
797806
final List<Map<String, Comparable>> resultChain = $.chain(asList(
798-
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { { put("name", "moe"); put("age", 40); } },
799-
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { { put("name", "larry"); put("age", 50); } },
800-
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { { put("name", "curly"); put("age", 60); } }
807+
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { {
808+
put("name", "moe"); put("age", 40); } },
809+
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { {
810+
put("name", "larry"); put("age", 50); } },
811+
(Map<String, Comparable>) new LinkedHashMap<String, Comparable>() { {
812+
put("name", "curly"); put("age", 60); } }
801813
)).sortBy("name").value();
802814
assertEquals("[{name=curly, age=60}, {name=larry, age=50}, {name=moe, age=40}]", resultChain.toString());
803815
}

0 commit comments

Comments
 (0)