Rename to Some

Author: winterbe

src/com/winterbe/java8/Take.java renamed to src/com/winterbe/java8/Some.java

@@ -10,13 +10,13 @@
  * @see Optional2
  * @author Benjamin Winterberg
  */
-public class Take<T> {
+public class Some<T> {
 
- private static final Take<?> EMPTY = new Take<>(null);
+ private static final Some<?> EMPTY = new Some<>(null);
 
  private T value;
 
- private Take(T value) {
+ private Some(T value) {
  this.value = value;
  }
 
@@ -30,36 +30,32 @@ public static <T> Optional<T> of(Supplier<T> resolver) {
  }
  }
 
- public static <T> Take<T> of(T something) {
- return new Take<>(something);
+ public static <T> Some<T> of(T something) {
+ return new Some<>(something);
  }
 
- public <S> Take<S> take(Function<? super T, S> resolver) {
- if (!isPresent()) {
+ public <S> Some<S> get(Function<? super T, S> resolver) {
+ if (value == null) {
  return empty();
  }
  S result = resolver.apply(value);
- return new Take<>(result);
+ return new Some<>(result);
  }
 
  public Optional<T> get() {
  return Optional.ofNullable(value);
  }
 
  public T orElse(T fallback) {
- if (isPresent()) {
+ if (value != null) {
  return value;
  }
  return fallback;
  }
 
- public boolean isPresent() {
- return value != null;
- }
-
  @SuppressWarnings("unchecked")
- private static <T> Take<T> empty() {
- return (Take<T>) EMPTY;
+ private static <T> Some<T> empty() {
+ return (Some<T>) EMPTY;
  }
 
 }

src/com/winterbe/java8/TakeTest.java renamed to src/com/winterbe/java8/SomeTest.java

@@ -5,7 +5,7 @@
 /**
  * @author Benjamin Winterberg
  */
-public class TakeTest {
+public class SomeTest {
 
  static class Outer {
  Nested nested = new Nested();
@@ -34,23 +34,25 @@ String getFoo() {
  public static void main(String[] args) {
  Outer something = new Outer();
 
- Optional<String> optional = Take.of(something)
- .take(Outer::getNested)
- .take(Nested::getInner)
- .take(Inner::getFoo)
+ Optional<String> optional = Some.of(something)
+ .get(Outer::getNested)
+ .get(Nested::getInner)
+ .get(Inner::getFoo)
  .get();
 
  System.out.println(optional.isPresent());
 
  something.getNested().inner = null;
- Optional<String> optional2 = Take.of(() ->
+
+ optional = Some.of(() ->
  something.getNested().getInner().getFoo());
- System.out.println(optional2.isPresent());
+
+ System.out.println(optional.isPresent());
 
 
  String x = null;
  String y = "boo";
- String z = Take.of(x).orElse(y);
+ String z = Some.of(x).orElse(y);
 
  System.out.println(z);