minor changes

Author: winterbe

src/com/winterbe/java8/Optional2.java

@@ -28,6 +28,6 @@ private static void test1() {
  .flatMap(o -> Optional.ofNullable(o.nested))
  .flatMap(n -> Optional.ofNullable(n.inner))
  .flatMap(i -> Optional.ofNullable(i.foo))
- .ifPresent(System.out::print);
+ .ifPresent(System.out::println);
  }
 }

src/com/winterbe/java8/Streams5.java

@@ -16,26 +16,23 @@ public static void main(String[] args) {
  stringCollection.add("ddd2");
  stringCollection.add("aaa2");
  stringCollection.add("bbb1");
- stringCollection.add("aaa1");
  stringCollection.add("bbb3");
  stringCollection.add("ccc");
- stringCollection.add("bbb2");
- stringCollection.add("ddd1");
 
 // test1(stringCollection);
 // test2(stringCollection);
 // test3(stringCollection);
 // test4(stringCollection);
-// test5(stringCollection);
+ test5(stringCollection);
 // test6(stringCollection);
- test7(stringCollection);
+// test7(stringCollection);
  }
 
  // stream has already been operated upon or closed
  private static void test7(List<String> stringCollection) {
  Stream<String> stream = stringCollection
  .stream()
- .filter(s -> s.toLowerCase().startsWith("a"));
+ .filter(s -> s.startsWith("a"));
 
  stream.anyMatch(s -> true);
  stream.noneMatch(s -> true);
@@ -47,28 +44,28 @@ private static void test6(List<String> stringCollection) {
  .stream()
  .filter(s -> {
  System.out.println("filter: " + s);
- return s.toLowerCase().startsWith("a");
+ return s.startsWith("a");
  })
  .map(s -> {
- System.out.println("map: " + s);
+ System.out.println("map:  " + s);
  return s.toUpperCase();
  })
- .anyMatch(s -> true);
+ .anyMatch(s -> s.startsWith("A"));
  }
 
  private static void test5(List<String> stringCollection) {
  stringCollection
  .stream()
  .filter(s -> {
- System.out.println("filter: " + s);
+ System.out.println("filter:  " + s);
  return s.toLowerCase().startsWith("a");
  })
  .sorted((s1, s2) -> {
- System.out.printf("sort: %s; %s\n", s1, s2);
+ System.out.printf("sort:  %s; %s\n", s1, s2);
  return s1.compareTo(s2);
  })
  .map(s -> {
- System.out.println("map: " + s);
+ System.out.println("map:  " + s);
  return s.toUpperCase();
  })
  .forEach(s -> System.out.println("forEach: " + s));
@@ -79,15 +76,15 @@ private static void test4(List<String> stringCollection) {
  stringCollection
  .stream()
  .sorted((s1, s2) -> {
- System.out.printf("sort: %s; %s\n", s1, s2);
+ System.out.printf("sort:  %s; %s\n", s1, s2);
  return s1.compareTo(s2);
  })
  .filter(s -> {
- System.out.println("filter: " + s);
+ System.out.println("filter:  " + s);
  return s.toLowerCase().startsWith("a");
  })
  .map(s -> {
- System.out.println("map: " + s);
+ System.out.println("map:  " + s);
  return s.toUpperCase();
  })
  .forEach(s -> System.out.println("forEach: " + s));
@@ -97,11 +94,11 @@ private static void test3(List<String> stringCollection) {
  stringCollection
  .stream()
  .filter(s -> {
- System.out.println("filter: " + s);
- return s.toLowerCase().startsWith("a");
+ System.out.println("filter:  " + s);
+ return s.startsWith("a");
  })
  .map(s -> {
- System.out.println("map: " + s);
+ System.out.println("map:  " + s);
  return s.toUpperCase();
  })
  .forEach(s -> System.out.println("forEach: " + s));
@@ -111,12 +108,12 @@ private static void test2(List<String> stringCollection) {
  stringCollection
  .stream()
  .map(s -> {
- System.out.println("map: " + s);
+ System.out.println("map:  " + s);
  return s.toUpperCase();
  })
  .filter(s -> {
- System.out.println("filter: " + s);
- return s.toLowerCase().startsWith("a");
+ System.out.println("filter:  " + s);
+ return s.startsWith("A");
  })
  .forEach(s -> System.out.println("forEach: " + s));
  }
@@ -125,7 +122,7 @@ private static void test1(List<String> stringCollection) {
  stringCollection
  .stream()
  .filter(s -> {
- System.out.println("filter: " + s);
+ System.out.println("filter:  " + s);
  return true;
  })
  .forEach(s -> System.out.println("forEach: " + s));

src/com/winterbe/java8/Streams7.java

@@ -35,7 +35,7 @@ static void test2() {
  IntStream.range(1, 4)
  .mapToObj(num -> new Foo("Foo" + num))
  .peek(f -> IntStream.range(1, 4)
- .mapToObj(num -> new Bar(f.name + " -> Bar" + num))
+ .mapToObj(num -> new Bar("Bar" + num + " <- " + f.name))
  .forEach(f.bars::add))
  .flatMap(f -> f.bars.stream())
  .forEach(b -> System.out.println(b.name));
@@ -51,7 +51,7 @@ static void test1() {
  foos.forEach(f ->
  IntStream
  .range(1, 4)
- .forEach(num -> f.bars.add(new Bar(f.name + " -> Bar" + num))));
+ .forEach(num -> f.bars.add(new Bar("Bar" + num + " <- " + f.name))));
 
  foos.stream()
  .flatMap(f -> f.bars.stream())