Skip to content

Commit 3a5281c

Browse files
committed
Sync with underscore-java.
1 parent 3f27a26 commit 3a5281c

File tree

21 files changed

+1427
-2684
lines changed

21 files changed

+1427
-2684
lines changed

checkstyle.xml

Lines changed: 130 additions & 207 deletions
Large diffs are not rendered by default.

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<plugin>
7676
<groupId>org.apache.maven.plugins</groupId>
7777
<artifactId>maven-checkstyle-plugin</artifactId>
78-
<version>2.13</version>
78+
<version>2.17</version>
7979
<executions>
8080
<execution>
8181
<id>checkstyle</id>
@@ -160,7 +160,7 @@
160160
<plugin>
161161
<groupId>org.apache.maven.plugins</groupId>
162162
<artifactId>maven-checkstyle-plugin</artifactId>
163-
<version>2.13</version>
163+
<version>2.17</version>
164164
<configuration>
165165
<configLocation>${basedir}/checkstyle.xml</configLocation>
166166
<includeTestSourceDirectory>true</includeTestSourceDirectory>

src/main/java/com/github/underscore/MemoizeFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.function.Function;
66

77
public abstract class MemoizeFunction<F, T> implements Function<F, T> {
8-
private final Map<F, T> cache = new LinkedHashMap<F, T>();
8+
private final Map<F, T> cache = new LinkedHashMap<>();
99
public abstract T calc(final F n);
1010

1111
public T apply(final F key) {

src/main/java/com/github/underscore/Optional.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.github.underscore;
22

3+
import java.util.Objects;
34
import java.util.function.Function;
45
import java.util.function.Predicate;
56
import java.util.function.Supplier;
@@ -20,16 +21,16 @@ private Optional(final T arg) {
2021
}
2122

2223
public static <T> Optional<T> of(final T arg) {
23-
return new Optional<T>(arg);
24+
return new Optional<>(arg);
2425
}
2526

2627
public static <T> Optional<T> fromNullable(final T nullableReference) {
2728
return nullableReference == null ? Optional.<T>absent()
28-
: new Optional<T>(nullableReference);
29+
: new Optional<>(nullableReference);
2930
}
3031

3132
@SuppressWarnings("unchecked")
32-
public static<T> Optional<T> absent() {
33+
public static <T> Optional<T> absent() {
3334
return (Optional<T>) EMPTY;
3435
}
3536

@@ -100,7 +101,7 @@ public boolean equals(final Object o) {
100101

101102
final Optional optional = (Optional) o;
102103

103-
return absent == optional.absent && !(arg == null ? optional.arg != null : !arg.equals(optional.arg));
104+
return absent == optional.absent && Objects.equals(arg, optional.arg);
104105
}
105106

106107
@Override

src/main/java/com/github/underscore/Tuple.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public Tuple(final A first, final B second) {
1111
}
1212

1313
public static <A, B> Tuple<A, B> create(final A a, final B b) {
14-
return new Tuple<A, B>(a, b);
14+
return new Tuple<>(a, b);
1515
}
1616

1717
public A fst() {

0 commit comments

Comments
 (0)