Merge pull request #123 from ponder-lab/issue_120

Fall back to ORDERED

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/Stream.java

@@ -188,27 +188,7 @@ public Stream(MethodInvocation streamCreation) throws ClassHierarchyException, I
 		this.orderingInference = new OrderingInference(this.getClassHierarchy());
 
 		this.inferInitialExecution();
-
-		try {
-			this.inferInitialOrdering();
-		} catch (InconsistentPossibleOrderingException e) {
-			LOGGER.log(Level.WARNING, "Exception caught while processing: " + streamCreation, e);
-			addStatusEntry(PreconditionFailure.INCONSISTENT_POSSIBLE_STREAM_SOURCE_ORDERING,
-					"Stream: " + streamCreation + " has inconsistent possible source orderings.");
-		} catch (NoniterableException e) {
-			LOGGER.log(Level.WARNING, "Exception caught while processing: " + streamCreation, e);
-			addStatusEntry(PreconditionFailure.NON_ITERABLE_POSSIBLE_STREAM_SOURCE,
-					"Stream: " + streamCreation + " has a non-iterable possible source.");
-		} catch (NoninstantiableException e) {
-			LOGGER.log(Level.WARNING, "Exception caught while processing: " + streamCreation, e);
-			addStatusEntry(PreconditionFailure.NON_INSTANTIABLE_POSSIBLE_STREAM_SOURCE, "Stream: " + streamCreation
-					+ " has a non-instantiable possible source with type: " + e.getSourceType() + ".");
-		} catch (CannotExtractSpliteratorException e) {
-			LOGGER.log(Level.WARNING, "Exception caught while processing: " + streamCreation, e);
-			addStatusEntry(PreconditionFailure.NON_DETERMINABLE_STREAM_SOURCE_ORDERING,
-					"Cannot extract spliterator from type: " + e.getFromType() + " for stream: " + streamCreation
-							+ ".");
-		}
+		this.inferInitialOrdering();
 
 		try {
 			// start the state machine.
@@ -468,7 +448,7 @@ public TypeDeclaration getEnclosingTypeDeclaration() {
 		return enclosingTypeDeclaration;
 	}
 
-	private TypeReference getEnclosingTypeReference() {
+	public TypeReference getEnclosingTypeReference() {
 		JDTIdentityMapper mapper = getJDTIdentifyMapper(getEnclosingTypeDeclaration());
 		TypeReference ref = mapper.getTypeRef(getEnclosingTypeDeclaration().resolveBinding());
 
@@ -572,10 +552,8 @@ private void inferInitialExecution() {
 			this.setInitialExecutionMode(ExecutionMode.SEQUENTIAL);
 	}
 
-	private void inferInitialOrdering()
-			throws IOException, CoreException, ClassHierarchyException, InvalidClassFileException,
-			InconsistentPossibleOrderingException, NoniterableException, NoninstantiableException,
-			CannotExtractSpliteratorException, CallGraphBuilderCancelException, CancelException {
+	private void inferInitialOrdering() throws IOException, CoreException, ClassHierarchyException,
+			InvalidClassFileException, CallGraphBuilderCancelException, CancelException {
 		ITypeBinding expressionTypeBinding = this.getCreation().getExpression().resolveTypeBinding();
 		String expressionTypeQualifiedName = expressionTypeBinding.getErasure().getQualifiedName();
 		IMethodBinding calledMethodBinding = this.getCreation().resolveMethodBinding();
@@ -604,19 +582,42 @@ private void inferInitialOrdering()
 				node = this.getEnclosingMethodNode();
 			} catch (NoEnclosingMethodNodeFoundException e) {
 				LOGGER.log(Level.WARNING, "Can't find enclosing method node for " + this.getCreation()
-						+ ". Falling back to " + Ordering.ORDERED, e);
+						+ ". Falling back to: " + Ordering.ORDERED + ".", e);
 				this.setInitialOrdering(Ordering.ORDERED);
 				return;
 			}
 
-			Collection<TypeAbstraction> possibleTypes = getPossibleTypesInterprocedurally(node, valueNumber,
-					this.getAnalysisEngine().getHeapGraph().getHeapModel(),
-					this.getAnalysisEngine().getPointerAnalysis(), this, LOGGER);
+			Collection<TypeAbstraction> possibleTypes = null;
+			IMethod calledMethod = null;
+			Ordering ordering = null;
+			try {
+				possibleTypes = getPossibleTypesInterprocedurally(node, valueNumber,
+						this.getAnalysisEngine().getHeapGraph().getHeapModel(),
+						this.getAnalysisEngine().getPointerAnalysis(), this, LOGGER);
 
-			// Possible types: check each one.
-			IMethod calledMethod = (IMethod) calledMethodBinding.getJavaElement();
+				// Possible types: check each one.
+				calledMethod = (IMethod) calledMethodBinding.getJavaElement();
 
-			Ordering ordering = this.getOrderingInference().inferOrdering(possibleTypes, calledMethod);
+				ordering = this.getOrderingInference().inferOrdering(possibleTypes, calledMethod);
+			} catch (NoniterableException e) {
+				LOGGER.log(Level.WARNING, "Stream: " + this.getCreation()
+						+ " has a non-iterable possible source. Falling back to: " + Ordering.ORDERED + ".", e);
+				ordering = Ordering.ORDERED;
+			} catch (NoninstantiableException e) {
+				LOGGER.log(Level.WARNING,
+						"Stream: " + this.getCreation() + " has a non-instantiable possible source with type: "
+								+ e.getSourceType() + ". Falling back to: " + Ordering.ORDERED + ".",
+						e);
+				ordering = Ordering.ORDERED;
+			} catch (CannotExtractSpliteratorException e) {
+				LOGGER.log(Level.WARNING, "Cannot extract spliterator from type: " + e.getFromType() + " for stream: "
+						+ this.getCreation() + ". Falling back to: " + Ordering.ORDERED + ".", e);
+				ordering = Ordering.ORDERED;
+			} catch (InconsistentPossibleOrderingException e) {
+				LOGGER.log(Level.WARNING, "Stream: " + this.getCreation()
+						+ " has inconsistent possible source orderings. Falling back to: " + Ordering.ORDERED + ".", e);
+				ordering = Ordering.ORDERED;
+			}
 
 			if (ordering == null) {
 				ordering = Ordering.ORDERED;
@@ -656,6 +657,7 @@ protected CGNode getEnclosingMethodNode() throws IOException, CoreException, NoE
 	 *         in the {@link CallGraph} are {@link FakeRootMethod}s.
 	 * @apiNote The may be an issue here related to #106.
 	 */
+	@SuppressWarnings("unused")
 	private static boolean allFake(Set<CGNode> nodes, CallGraph callGraph) {
 		// for each node.
 		for (CGNode cgNode : nodes) {
@@ -787,7 +789,13 @@ protected void buildCallGraph() throws IOException, CoreException, CallGraphBuil
 			// Doesn't make sense. Maybe we need to collect all enclosing
 			// methods
 			// and use those as entry points.
-			getAnalysisEngine().buildSafeCallGraph(options);
+			try {
+				getAnalysisEngine().buildSafeCallGraph(options);
+			} catch (IllegalStateException e) {
+				LOGGER.log(Level.SEVERE, e, () -> "Exception encountered while building call graph for Stream: " + this
+						+ " in project: " + this.getCreationJavaProject());
+				throw e;
+			}
 			// TODO: Can I slice the graph so that only nodes relevant to the
 			// instance in question are present?
 

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/wala/EclipseProjectAnalysisEngine.java

@@ -126,7 +126,7 @@ public IClassHierarchy buildClassHierarchy() {
 	}
 
 	public CallGraph buildSafeCallGraph(AnalysisOptions options)
-			throws IllegalArgumentException, CallGraphBuilderCancelException, CancelException {
+			throws CallGraphBuilderCancelException, CancelException {
 		LOGGER.entering(this.getClass().getName(), "buildSafeCallGraph", this.callGraphBuilder);
 
 		if (callGraphBuilder == null) {

edu.cuny.hunter.streamrefactoring.tests/resources/ConvertStreamToParallel/testDoubleStreamOf/in/A.java

@@ -7,7 +7,6 @@
 public class A {
 	@EntryPoint
 	void m() {
-		DoubleStream.of(1.111)
-	    .count();
+		DoubleStream.of(1.111).count();
 	}
 }

edu.cuny.hunter.streamrefactoring.tests/test cases/edu/cuny/hunter/streamrefactoring/ui/tests/ConvertStreamToParallelRefactoringTest.java

@@ -58,8 +58,7 @@
 public class ConvertStreamToParallelRefactoringTest extends RefactoringTest {
 
 	/**
-	 * The name of the directory containing resources under the project
-	 * directory.
+	 * The name of the directory containing resources under the project directory.
 	 */
 	private static final String RESOURCE_PATH = "resources";
 
@@ -223,10 +222,9 @@ private Path getAbsolutionPath(String fileName) {
 	 *
 	 * @see
 	 * org.eclipse.jdt.ui.tests.refactoring.RefactoringTest#getFileContents(java
-	 * .lang.String) Had to override this method because, since this plug-in is
-	 * a fragment (at least I think that this is the reason), it doesn't have an
-	 * activator and the bundle is resolving to the eclipse refactoring test
-	 * bundle.
+	 * .lang.String) Had to override this method because, since this plug-in is a
+	 * fragment (at least I think that this is the reason), it doesn't have an
+	 * activator and the bundle is resolving to the eclipse refactoring test bundle.
 	 */
 	@Override
 	public String getFileContents(String fileName) throws IOException {
@@ -474,8 +472,8 @@ public void testCollectionFromParameter2() throws Exception {
 	 */
 	public void testCollectionFromParameter3() throws Exception {
 		helper(new StreamAnalysisExpectedResult("h.parallelStream()", Collections.singleton(ExecutionMode.PARALLEL),
-				Collections.singleton(Ordering.UNORDERED), false, true, false, null, null, null, RefactoringStatus.ERROR,
-				EnumSet.of(PreconditionFailure.UNORDERED)));
+				Collections.singleton(Ordering.UNORDERED), false, true, false, null, null, null,
+				RefactoringStatus.ERROR, EnumSet.of(PreconditionFailure.UNORDERED)));
 	}
 
 	/**