Sync with underscore-java.

Author: javadev

pom.xml

@@ -66,10 +66,9 @@
           <version>3.2.0</version>
           <configuration>
               <archive>
-                  <manifestEntries>
-                       <Automatic-Module-Name>com.github.underscore</Automatic-Module-Name>
-                       <mainClass>com.github.underscore.U</mainClass>
-                  </manifestEntries>
+                  <manifest>
+                      <mainClass>com.github.underscore.U</mainClass>
+                  </manifest>
               </archive>
           </configuration>
       </plugin>

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

@@ -6,6 +6,7 @@
 
 public abstract class MemoizeFunction<F, T> implements Function<F, T> {
     private final Map<F, T> cache = new LinkedHashMap<>();
+
     public abstract T calc(final F n);
 
     public T apply(final F key) {

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

@@ -25,18 +25,17 @@ public static <T> Optional<T> of(final T arg) {
     }
 
     public static <T> Optional<T> fromNullable(final T nullableReference) {
-        return nullableReference == null ? Optional.<T>absent()
-            : new Optional<>(nullableReference);
+        return nullableReference == null ? Optional.<T>empty() : new Optional<>(nullableReference);
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> Optional<T> absent() {
+    public static <T> Optional<T> empty() {
         return (Optional<T>) EMPTY;
     }
 
     public T get() {
         if (absent) {
-            throw new IllegalStateException("Optional.get() cannot be called on an absent value");
+            throw new IllegalStateException("Optional.get() cannot be called on an empty value");
         }
         return arg;
     }
@@ -67,7 +66,7 @@ public boolean isPresent() {
     public Optional<T> filter(Predicate<? super T> predicate) {
         U.checkNotNull(predicate);
         if (isPresent()) {
-            return predicate.test(arg) ? this : Optional.<T>absent();
+            return predicate.test(arg) ? this : Optional.<T>empty();
         } else {
             return this;
         }
@@ -78,7 +77,7 @@ public <F> Optional<F> map(Function<? super T, F> mapper) {
         if (isPresent()) {
             return Optional.fromNullable(mapper.apply(arg));
         } else {
-            return absent();
+            return empty();
         }
     }
 
@@ -90,6 +89,10 @@ public <X extends Throwable> T orThrow(Supplier<? extends X> exceptionFunction)
         }
     }
 
+    public java.util.Optional<T> toJavaOptional() {
+        return java.util.Optional.ofNullable(arg);
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {
@@ -113,6 +116,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return absent ? "Optional.absent()" : "Optional.of(" + arg + ")";
+        return absent ? "Optional.empty" : "Optional[" + arg + "]";
     }
 }

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

@@ -28,6 +28,7 @@ public static class TrieNode {
         // Initialize your data structure here.
         TrieNode[] children;
         boolean isWord;
+
         public TrieNode() {
             children = new TrieNode[1071];
         }