Clean up.

Author: khatchad

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

@@ -81,7 +81,7 @@ public StreamAnalyzer(boolean visitDocTags, boolean findImplicitEntryPoints, boo
 
 	/**
 	 * Analyzes this {@link StreamAnalyzer}'s streams.
-	 * 
+	 *
 	 * @return {@link Map} of project's analyzed along with the entry points used.
 	 */
 	public Map<IJavaProject, Collection<Entrypoint>> analyze() throws CoreException {
@@ -171,7 +171,7 @@ public Map<IJavaProject, Collection<Entrypoint>> analyze() throws CoreException
 	/**
 	 * Builds the call graph that is part of the
 	 * {@link EclipseProjectAnalysisEngine}.
-	 * 
+	 *
 	 * @param engine
 	 *            The EclipseProjectAnalysisEngine for which to build the call
 	 *            graph.

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

@@ -62,7 +62,7 @@
 
 /**
  * The activator class controls the plug-in life cycle
- * 
+ *
  * @author <a href="mailto:[email protected]">Raffi
  *         Khatchadourian</a>
  */
@@ -102,7 +102,7 @@ private static void logWarning(String message) {
 	/**
 	 * Minimum logging level. One of the constants in
 	 * org.eclipse.core.runtime.IStatus.
-	 * 
+	 *
 	 * @param level
 	 *            The minimum logging level to set.
 	 * @see org.eclipse.core.runtime.IStatus.
@@ -118,30 +118,35 @@ public static void setLoggingLevel(int level) {
 	 */
 	private TimeCollector excludedTimeCollector = new TimeCollector();
 
+	private IJavaProject[] javaProjects;
+
 	/** Does the refactoring use a working copy layer? */
 	private final boolean layer;
 
+	private Map<IJavaProject, Collection<Entrypoint>> projectToEntryPoints;
+
 	private SearchEngine searchEngine = new SearchEngine();
 
 	/** The code generation settings, or <code>null</code> */
 	private CodeGenerationSettings settings;
 
+	private Set<Stream> streamSet;
+
 	private Map<ITypeRoot, CompilationUnit> typeRootToCompilationUnitMap = new HashMap<>();
 
 	private Map<IType, ITypeHierarchy> typeToTypeHierarchyMap = new HashMap<>();
 
-	private IJavaProject[] javaProjects;
-
-	private Set<Stream> streamSet;
-
-	private Map<IJavaProject, Collection<Entrypoint>> projectToEntryPoints;
-
 	private boolean useImplicitEntrypoints = true;
 
 	public ConvertToParallelStreamRefactoringProcessor() throws JavaModelException {
 		this(null, null, false, true, Optional.empty());
 	}
 
+	public ConvertToParallelStreamRefactoringProcessor(final CodeGenerationSettings settings,
+			Optional<IProgressMonitor> monitor) throws JavaModelException {
+		this(null, settings, false, true, monitor);
+	}
+
 	public ConvertToParallelStreamRefactoringProcessor(IJavaProject[] javaProjects,
 			final CodeGenerationSettings settings, boolean layer, boolean useImplicitEntrypoints,
 			Optional<IProgressMonitor> monitor) throws JavaModelException {
@@ -155,22 +160,17 @@ public ConvertToParallelStreamRefactoringProcessor(IJavaProject[] javaProjects,
 		}
 	}
 
-	public ConvertToParallelStreamRefactoringProcessor(final CodeGenerationSettings settings,
-			Optional<IProgressMonitor> monitor) throws JavaModelException {
-		this(null, 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(IJavaProject[] javaProjects,
 			final CodeGenerationSettings settings, Optional<IProgressMonitor> monitor) throws JavaModelException {
 		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, true, monitor);
 	}
@@ -190,35 +190,33 @@ public RefactoringStatus checkFinalConditions(final IProgressMonitor monitor, fi
 					this.getJavaProjects().length * 1000);
 			final RefactoringStatus status = new RefactoringStatus();
 			StreamAnalyzer analyzer = new StreamAnalyzer(false, this.getUseImplicitEntrypoints());
-			setStreamSet(analyzer.getStreamSet());
+			this.setStreamSet(analyzer.getStreamSet());
 
 			for (IJavaProject jproj : this.getJavaProjects()) {
 				IPackageFragmentRoot[] roots = jproj.getPackageFragmentRoots();
 				for (IPackageFragmentRoot root : roots) {
 					IJavaElement[] children = root.getChildren();
-					for (IJavaElement child : children) {
+					for (IJavaElement child : children)
 						if (child.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
 							IPackageFragment fragment = (IPackageFragment) child;
 							ICompilationUnit[] units = fragment.getCompilationUnits();
 							for (ICompilationUnit unit : units) {
-								CompilationUnit compilationUnit = getCompilationUnit(unit, subMonitor.split(1));
+								CompilationUnit compilationUnit = this.getCompilationUnit(unit, subMonitor.split(1));
 								compilationUnit.accept(analyzer);
 							}
 						}
-					}
 				}
 			}
 
 			// analyze and set entry points.
-			projectToEntryPoints = analyzer.analyze();
-			
+			this.projectToEntryPoints = analyzer.analyze();
+
 			// map empty set to unprocessed projects.
 			for (IJavaProject project : this.getJavaProjects())
 				this.projectToEntryPoints.computeIfAbsent(project, p -> Collections.emptySet());
-				
 
 			// get the status of each stream.
-			RefactoringStatus collectedStatus = getStreamSet().stream().map(Stream::getStatus)
+			RefactoringStatus collectedStatus = this.getStreamSet().stream().map(Stream::getStatus)
 					.collect(() -> new RefactoringStatus(), (a, b) -> a.merge(b), (a, b) -> a.merge(b));
 			status.merge(collectedStatus);
 
@@ -245,14 +243,6 @@ public RefactoringStatus checkFinalConditions(final IProgressMonitor monitor, fi
 		}
 	}
 
-	public Collection<Entrypoint> getEntryPoints(IJavaProject javaProject) {
-		return this.projectToEntryPoints.get(javaProject);
-	}
-
-	private boolean getUseImplicitEntrypoints() {
-		return this.useImplicitEntrypoints;
-	}
-
 	@Override
 	public RefactoringStatus checkInitialConditions(IProgressMonitor pm)
 			throws CoreException, OperationCanceledException {
@@ -288,12 +278,11 @@ private RefactoringStatus checkProjectCompliance(IJavaProject destinationProject
 	}
 
 	private RefactoringStatus checkStructure(IMember member) throws JavaModelException {
-		if (!member.isStructureKnown()) {
+		if (!member.isStructureKnown())
 			return RefactoringStatus.createErrorStatus(
 					MessageFormat.format(Messages.CUContainsCompileErrors, getElementLabel(member, ALL_FULLY_QUALIFIED),
 							getElementLabel(member.getCompilationUnit(), ALL_FULLY_QUALIFIED)),
 					JavaStatusContext.create(member.getCompilationUnit()));
-		}
 		return new RefactoringStatus();
 	}
 
@@ -305,9 +294,9 @@ private RefactoringStatus checkWritabilitiy(IMember member, PreconditionFailure
 	}
 
 	public void clearCaches() {
-		getTypeToTypeHierarchyMap().clear();
-		getCompilationUnitToCompilationUnitRewriteMap().clear();
-		getTypeRootToCompilationUnitMap().clear();
+		this.getTypeToTypeHierarchyMap().clear();
+		this.getCompilationUnitToCompilationUnitRewriteMap().clear();
+		this.getTypeRootToCompilationUnitMap().clear();
 	}
 
 	@Override
@@ -322,8 +311,8 @@ public Change createChange(IProgressMonitor pm) throws CoreException, OperationC
 					.filter(cu -> !manager.containsChangesIn(cu)).toArray(ICompilationUnit[]::new);
 
 			for (ICompilationUnit cu : units) {
-				CompilationUnit compilationUnit = getCompilationUnit(cu, pm);
-				manageCompilationUnit(manager, getCompilationUnitRewrite(cu, compilationUnit),
+				CompilationUnit compilationUnit = this.getCompilationUnit(cu, pm);
+				this.manageCompilationUnit(manager, this.getCompilationUnitRewrite(cu, compilationUnit),
 						Optional.of(new SubProgressMonitor(pm, IProgressMonitor.UNKNOWN)));
 			}
 
@@ -335,7 +324,7 @@ public Change createChange(IProgressMonitor pm) throws CoreException, OperationC
 			ConvertStreamToParallelRefactoringDescriptor descriptor = new ConvertStreamToParallelRefactoringDescriptor(
 					null, "TODO", null, arguments, flags);
 
-			return new DynamicValidationRefactoringChange(descriptor, getProcessorName(), manager.getAllChanges());
+			return new DynamicValidationRefactoringChange(descriptor, this.getProcessorName(), manager.getAllChanges());
 		} finally {
 			pm.done();
 			this.clearCaches();
@@ -395,22 +384,38 @@ public Object[] getElements() {
 		return null;
 	}
 
+	public Collection<Entrypoint> getEntryPoints(IJavaProject javaProject) {
+		return this.projectToEntryPoints.get(javaProject);
+	}
+
 	public TimeCollector getExcludedTimeCollector() {
-		return excludedTimeCollector;
+		return this.excludedTimeCollector;
 	}
 
 	@Override
 	public String getIdentifier() {
 		return ConvertStreamToParallelRefactoringDescriptor.REFACTORING_ID;
 	}
 
+	protected IJavaProject[] getJavaProjects() {
+		return this.javaProjects;
+	}
+
+	public Set<Stream> getOptimizableStreams() {
+		return this.getStreamSet().parallelStream().filter(s -> !s.getStatus().hasError()).collect(Collectors.toSet());
+	}
+
 	@Override
 	public String getProcessorName() {
 		return Messages.Name;
 	}
 
 	private SearchEngine getSearchEngine() {
-		return searchEngine;
+		return this.searchEngine;
+	}
+
+	public Set<Stream> getStreamSet() {
+		return this.streamSet;
 	}
 
 	private ITypeHierarchy getTypeHierarchy(IType type, Optional<IProgressMonitor> monitor) throws JavaModelException {
@@ -428,12 +433,20 @@ private ITypeHierarchy getTypeHierarchy(IType type, Optional<IProgressMonitor> m
 		}
 	}
 
+	protected Map<ITypeRoot, CompilationUnit> getTypeRootToCompilationUnitMap() {
+		return this.typeRootToCompilationUnitMap;
+	}
+
 	protected Map<IType, ITypeHierarchy> getTypeToTypeHierarchyMap() {
-		return typeToTypeHierarchyMap;
+		return this.typeToTypeHierarchyMap;
 	}
 
-	protected Map<ITypeRoot, CompilationUnit> getTypeRootToCompilationUnitMap() {
-		return typeRootToCompilationUnitMap;
+	public Set<Stream> getUnoptimizableStreams() {
+		return this.getStreamSet().parallelStream().filter(s -> s.getStatus().hasError()).collect(Collectors.toSet());
+	}
+
+	private boolean getUseImplicitEntrypoints() {
+		return this.useImplicitEntrypoints;
 	}
 
 	@Override
@@ -467,23 +480,7 @@ private void manageCompilationUnit(final TextEditBasedChangeManager manager, Com
 		manager.manage(rewrite.getCu(), change);
 	}
 
-	protected IJavaProject[] getJavaProjects() {
-		return javaProjects;
-	}
-
-	public Set<Stream> getStreamSet() {
-		return streamSet;
-	}
-
 	protected void setStreamSet(Set<Stream> streamSet) {
 		this.streamSet = streamSet;
 	}
-
-	public Set<Stream> getOptimizableStreams() {
-		return this.getStreamSet().parallelStream().filter(s -> !s.getStatus().hasError()).collect(Collectors.toSet());
-	}
-
-	public Set<Stream> getUnoptimizableStreams() {
-		return this.getStreamSet().parallelStream().filter(s -> s.getStatus().hasError()).collect(Collectors.toSet());
-	}
 }

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

@@ -74,11 +74,11 @@
 public class EvaluateConvertToParallelStreamRefactoringHandler extends AbstractHandler {
 
 	private static final boolean BUILD_WORKSPACE = false;
+	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 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 };
@@ -124,6 +124,11 @@ private static int getMethodLinesOfCode(IMethod method) {
 		}
 	}
 
+	private static Collection<Entrypoint> getProjectEntryPoints(IJavaProject javaProject,
+			ConvertToParallelStreamRefactoringProcessor processor) {
+		return processor.getEntryPoints(javaProject);
+	}
+
 	private static int getProjectLinesOfCode(IJavaProject javaProject) {
 		AbstractMetricSource metricSource = Dispatcher.getAbstractMetricSource(javaProject);
 
@@ -449,11 +454,6 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 		return null;
 	}
 
-	private static Collection<Entrypoint> getProjectEntryPoints(IJavaProject javaProject,
-			ConvertToParallelStreamRefactoringProcessor processor) {
-		return processor.getEntryPoints(javaProject);
-	}
-
 	private Set<SearchMatch> findReferences(Set<? extends IJavaElement> elements) throws CoreException {
 		Set<SearchMatch> ret = new HashSet<>();
 		for (IJavaElement elem : elements)
@@ -470,15 +470,6 @@ public void acceptSearchMatch(SearchMatch match) throws CoreException {
 		return ret;
 	}
 
-	private boolean shouldPerformChange() {
-		String performChangePropertyValue = System.getenv(PERFORM_CHANGE_PROPERTY_KEY);
-
-		if (performChangePropertyValue == null)
-			return PERFORM_CHANGE_DEFAULT;
-		else
-			return Boolean.valueOf(performChangePropertyValue);
-	}
-
 	private boolean shouldFindImplicitEntrypoints() {
 		String findImplicitEntrypoits = System.getenv(FIND_IMPLICIT_ENTRYPOINTS_PROPERTY_KEY);
 
@@ -487,4 +478,13 @@ private boolean shouldFindImplicitEntrypoints() {
 		else
 			return Boolean.valueOf(findImplicitEntrypoits);
 	}
+
+	private boolean shouldPerformChange() {
+		String performChangePropertyValue = System.getenv(PERFORM_CHANGE_PROPERTY_KEY);
+
+		if (performChangePropertyValue == null)
+			return PERFORM_CHANGE_DEFAULT;
+		else
+			return Boolean.valueOf(performChangePropertyValue);
+	}
 }