Add environmental variable to control use of implicit entrypoints.

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/refactorings/ConvertToParallelStreamRefactoringProcessor.java

@@ -130,35 +130,43 @@ public static void setLoggingLevel(int level) {
 
 	private Set<Stream> streamSet;
 
+	private boolean useImplicitEntrypoints = true;
+
 	public ConvertToParallelStreamRefactoringProcessor() throws JavaModelException {
-		this(null, null, false, Optional.empty());
+		this(null, null, false, true, Optional.empty());
 	}
 
 	public ConvertToParallelStreamRefactoringProcessor(IJavaProject[] javaProjects,
-			final CodeGenerationSettings settings, boolean layer, Optional<IProgressMonitor> monitor)
-			throws JavaModelException {
+			final CodeGenerationSettings settings, boolean layer, boolean useImplicitEntrypoints,
+			Optional<IProgressMonitor> monitor) throws JavaModelException {
 		try {
 			this.javaProjects = javaProjects;
 			this.settings = settings;
 			this.layer = layer;
-
+			this.useImplicitEntrypoints = useImplicitEntrypoints;
 		} finally {
 			monitor.ifPresent(IProgressMonitor::done);
 		}
 	}
 
 	public ConvertToParallelStreamRefactoringProcessor(final CodeGenerationSettings settings,
 			Optional<IProgressMonitor> monitor) throws JavaModelException {
-		this(null, settings, false, monitor);
+		this(null, settings, false, true, monitor);
 	}
 
 	public ConvertToParallelStreamRefactoringProcessor(IJavaProject[] javaProjects,
 			final CodeGenerationSettings settings, Optional<IProgressMonitor> monitor) throws JavaModelException {
-		this(javaProjects, settings, false, monitor);
+		this(javaProjects, settings, false, true, monitor);
+	}
+
+	public ConvertToParallelStreamRefactoringProcessor(IJavaProject[] javaProjects,
+			final CodeGenerationSettings settings, boolean useImplicitJoinpoints, Optional<IProgressMonitor> monitor)
+			throws JavaModelException {
+		this(javaProjects, settings, false, useImplicitJoinpoints, monitor);
 	}
 
 	public ConvertToParallelStreamRefactoringProcessor(Optional<IProgressMonitor> monitor) throws JavaModelException {
-		this(null, null, false, monitor);
+		this(null, null, false, true, monitor);
 	}
 
 	private RefactoringStatus checkExistence(IMember member, PreconditionFailure failure) {
@@ -175,7 +183,7 @@ public RefactoringStatus checkFinalConditions(final IProgressMonitor monitor, fi
 			SubMonitor subMonitor = SubMonitor.convert(monitor, Messages.CheckingPreconditions,
 					this.getJavaProjects().length * 1000);
 			final RefactoringStatus status = new RefactoringStatus();
-			StreamAnalyzer analyzer = new StreamAnalyzer();
+			StreamAnalyzer analyzer = new StreamAnalyzer(false, this.getUseImplicitEntrypoints());
 			setStreamSet(analyzer.getStreamSet());
 
 			for (IJavaProject jproj : this.getJavaProjects()) {
@@ -194,7 +202,7 @@ public RefactoringStatus checkFinalConditions(final IProgressMonitor monitor, fi
 					}
 				}
 			}
-			
+
 			analyzer.analyze();
 
 			RefactoringStatus collectedStatus = getStreamSet().stream().map(Stream::getStatus)
@@ -224,6 +232,10 @@ public RefactoringStatus checkFinalConditions(final IProgressMonitor monitor, fi
 		}
 	}
 
+	private boolean getUseImplicitEntrypoints() {
+		return this.useImplicitEntrypoints;
+	}
+
 	@Override
 	public RefactoringStatus checkInitialConditions(IProgressMonitor pm)
 			throws CoreException, OperationCanceledException {

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

@@ -46,8 +46,17 @@ public static ProcessorBasedRefactoring createRefactoring(IJavaProject[] project
 	public static ConvertToParallelStreamRefactoringProcessor createConvertToParallelStreamRefactoringProcessor(
 			IJavaProject[] projects, Optional<IProgressMonitor> monitor) throws JavaModelException {
 		CodeGenerationSettings settings = JavaPreferencesSettings.getCodeGenerationSettings(projects[0]);
-		ConvertToParallelStreamRefactoringProcessor processor = new ConvertToParallelStreamRefactoringProcessor(projects,
-				settings, monitor);
+		ConvertToParallelStreamRefactoringProcessor processor = new ConvertToParallelStreamRefactoringProcessor(
+				projects, settings, monitor);
+		return processor;
+	}
+
+	public static ConvertToParallelStreamRefactoringProcessor createConvertToParallelStreamRefactoringProcessor(
+			IJavaProject[] projects, boolean useImplicitJoinpoints, Optional<IProgressMonitor> monitor)
+			throws JavaModelException {
+		CodeGenerationSettings settings = JavaPreferencesSettings.getCodeGenerationSettings(projects[0]);
+		ConvertToParallelStreamRefactoringProcessor processor = new ConvertToParallelStreamRefactoringProcessor(
+				projects, settings, useImplicitJoinpoints, monitor);
 		return processor;
 	}
 
@@ -133,7 +142,7 @@ public static ASTNode stripParenthesizedExpressions(ASTNode node) {
 		} else
 			return node;
 	}
-	
+
 	public static String getMethodIdentifier(IMethod method) throws JavaModelException {
 		StringBuilder sb = new StringBuilder();
 		sb.append((method.getElementName()) + "(");

edu.cuny.hunter.streamrefactoring.eval/src/edu/cuny/hunter/streamrefactoring/eval/handlers/EvaluateConvertToParallelStreamRefactoringHandler.java

@@ -76,6 +76,8 @@ public class EvaluateConvertToParallelStreamRefactoringHandler extends AbstractH
 	private static final int LOGGING_LEVEL = IStatus.INFO;
 	private static final boolean PERFORM_CHANGE_DEFAULT = false;
 	private static final String PERFORM_CHANGE_PROPERTY_KEY = "edu.cuny.hunter.streamrefactoring.eval.performChange";
+	private static final boolean FIND_IMPLICIT_ENTRYPOINTS_DEFAULT = true;
+	private static final String FIND_IMPLICIT_ENTRYPOINTS_PROPERTY_KEY = "edu.cuny.hunter.streamrefactoring.eval.findImplicitEntrypoints";
 
 	private static String[] buildAttributeColumns(String attribute) {
 		return new String[] { "subject", "stream", "start pos", "length", "method", "type FQN", attribute };
@@ -229,7 +231,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 					resultsTimeCollector.start();
 					processor = createConvertToParallelStreamRefactoringProcessor(new IJavaProject[] { javaProject },
-							Optional.of(monitor));
+							this.shouldFindImplicitEntrypoints(), Optional.of(monitor));
 					resultsTimeCollector.stop();
 					ConvertToParallelStreamRefactoringProcessor.setLoggingLevel(LOGGING_LEVEL);
 
@@ -453,4 +455,13 @@ private boolean shouldPerformChange() {
 		else
 			return Boolean.valueOf(performChangePropertyValue);
 	}
+
+	private boolean shouldFindImplicitEntrypoints() {
+		String findImplicitEntrypoits = System.getenv(FIND_IMPLICIT_ENTRYPOINTS_PROPERTY_KEY);
+
+		if (findImplicitEntrypoits == null)
+			return FIND_IMPLICIT_ENTRYPOINTS_DEFAULT;
+		else
+			return Boolean.valueOf(findImplicitEntrypoits);
+	}
 }