Also include StreamSupport type in workaround for #80.

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/safe/Util.java

@@ -19,6 +19,22 @@
 
 public class Util {
 
+	/**
+	 * {@link Atom} corresponding the the stream() method.
+	 */
+	private static final Atom STREAM_METHOD_NAME_ATOM = Atom.findOrCreateAsciiAtom("stream");
+
+	/**
+	 * The {@link TypeName} of the type {@link java.util.Arrays}.
+	 */
+	private static final TypeName ARRAYS_TYPE_NAME = TypeName.string2TypeName("Ljava/util/Arrays");
+
+	/**
+	 * The {@link TypeName} for the type {@link java.util.stream.StreamSupport}.
+	 */
+	private static final TypeName STREAM_SUPPORT_TYPE_NAME = TypeName
+			.string2TypeName("Ljava/util/stream/StreamSupport");
+
 	private Util() {
 	}
 
@@ -75,19 +91,21 @@ public static boolean instanceKeyCorrespondsWithInstantiationInstruction(Instanc
 				else if (callSiteReference.getProgramCounter() == instructionCallSite.getProgramCounter()) {
 					// compare declared targets.
 					MethodReference callSiteDeclaredTarget = callSiteReference.getDeclaredTarget();
+					TypeName callSiteTargetDeclaringClassName = callSiteDeclaredTarget.getDeclaringClass().getName();
+
 					MethodReference instructionCallDeclaredTarget = instructionCallSite.getDeclaredTarget();
+					TypeName instructionTargetDeclaringClassName = instructionCallDeclaredTarget.getDeclaringClass()
+							.getName();
 
-					if (callSiteDeclaredTarget.getDeclaringClass().getName()
-							.equals(instructionCallDeclaredTarget.getDeclaringClass().getName())
-							&& callSiteDeclaredTarget.getDeclaringClass().getName()
-									.equals(TypeName.string2TypeName("Ljava/util/Arrays"))
+					if (callSiteTargetDeclaringClassName.equals(instructionTargetDeclaringClassName)
+							&& (callSiteTargetDeclaringClassName.equals(ARRAYS_TYPE_NAME)
+									|| callSiteTargetDeclaringClassName.equals(STREAM_SUPPORT_TYPE_NAME))
 							&& callSiteDeclaredTarget.getName().equals(instructionCallDeclaredTarget.getName())
-							&& callSiteDeclaredTarget.getName().equals(Atom.findOrCreateAsciiAtom("stream")))
+							&& callSiteDeclaredTarget.getName().equals(STREAM_METHOD_NAME_ATOM))
 						return true;
 				}
 			}
 		}
 		return false;
 	}
-
 }