From 28ff404c59aeff1b6604b70fb153d4d33e21635b Mon Sep 17 00:00:00 2001
From: Evan Chen <chene@us.ibm.com>
Date: Wed, 16 Dec 2015 12:27:51 -0800
Subject: [PATCH 1/3] Changes to Spark Streaming Java8APISuite.java

---
 .../java/org/apache/spark/streaming/Java8APISuite.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java b/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java
index 89e0c7fdf7eec..949f9b7234cfa 100644
--- a/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java
+++ b/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java
@@ -25,6 +25,7 @@
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import com.google.common.collect.Ordering;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -440,8 +441,13 @@ public void testPairFlatMap() {
   public static <T extends Comparable<T>> void assertOrderInvariantEquals(
     List<List<T>> expected, List<List<T>> actual) {
     expected.forEach((List<T> list) -> Collections.sort(list));
-    actual.forEach((List<T> list) -> Collections.sort(list));
-    Assert.assertEquals(expected, actual);
+    ArrayList<ArrayList<T>> sortedActual = new ArrayList<ArrayList<T>>();
+    actual.forEach((List<T> list) -> {
+        ArrayList<T> sortedList = new ArrayList<T>(list);
+        Collections.sort(sortedList);
+        sortedActual.add(sortedList);
+    });
+    Assert.assertEquals(expected, sortedActual);
   }
 
   @Test

From 23ace37ba6cd5353861dec68d73958abe5711602 Mon Sep 17 00:00:00 2001
From: Evan Chen <chene@us.ibm.com>
Date: Wed, 16 Dec 2015 13:43:23 -0800
Subject: [PATCH 2/3] Changed ArrayList to List type

---
 .../test/java/org/apache/spark/streaming/Java8APISuite.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java b/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java
index 949f9b7234cfa..a6e0a069d8f2d 100644
--- a/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java
+++ b/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java
@@ -441,9 +441,9 @@ public void testPairFlatMap() {
   public static <T extends Comparable<T>> void assertOrderInvariantEquals(
     List<List<T>> expected, List<List<T>> actual) {
     expected.forEach((List<T> list) -> Collections.sort(list));
-    ArrayList<ArrayList<T>> sortedActual = new ArrayList<ArrayList<T>>();
+    List<List<T>> sortedActual = new ArrayList<>();
     actual.forEach((List<T> list) -> {
-        ArrayList<T> sortedList = new ArrayList<T>(list);
+        List<T> sortedList = new ArrayList<>(list);
         Collections.sort(sortedList);
         sortedActual.add(sortedList);
     });

From 8addf75bd064f7f02bcb5373bb84d7d925a5f0eb Mon Sep 17 00:00:00 2001
From: Evan Chen <chene@us.ibm.com>
Date: Wed, 16 Dec 2015 14:24:10 -0800
Subject: [PATCH 3/3] Removed foreach argument type

---
 .../test/java/org/apache/spark/streaming/Java8APISuite.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java b/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java
index a6e0a069d8f2d..e8a0dfc0f0a5f 100644
--- a/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java
+++ b/extras/java8-tests/src/test/java/org/apache/spark/streaming/Java8APISuite.java
@@ -25,7 +25,6 @@
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.google.common.collect.Ordering;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -440,9 +439,9 @@ public void testPairFlatMap() {
    */
   public static <T extends Comparable<T>> void assertOrderInvariantEquals(
     List<List<T>> expected, List<List<T>> actual) {
-    expected.forEach((List<T> list) -> Collections.sort(list));
+    expected.forEach(list -> Collections.sort(list));
     List<List<T>> sortedActual = new ArrayList<>();
-    actual.forEach((List<T> list) -> {
+    actual.forEach(list -> {
         List<T> sortedList = new ArrayList<>(list);
         Collections.sort(sortedList);
         sortedActual.add(sortedList);