Clean up.

Author: khatchad

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

@@ -87,14 +87,14 @@ private Spliterator<?> getSpliterator(Object instance, String calledMethodName)
 
 		Spliterator<?> spliterator = null;
 
-		if (instance instanceof Iterable) {
+		if (instance instanceof Iterable)
 			try {
 				spliterator = ((Iterable<?>) instance).spliterator();
 			} catch (NullPointerException e) {
 				LOGGER.log(Level.WARNING, "Possible trouble creating instance (most likely private type).", e);
 				return null;
 			}
-		} else {
+		else {
 			// try to call the stream() method to get the spliterator.
 			BaseStream<?, ?> baseStream = null;
 			try {
@@ -148,18 +148,16 @@ private Ordering inferOrdering(Collection<TypeAbstraction> possibleTypes, String
 			CannotExtractSpliteratorException {
 		Ordering ret = null;
 
-		for (TypeAbstraction typeAbstraction : possibleTypes) {
+		for (TypeAbstraction typeAbstraction : possibleTypes)
 			if (typeAbstraction != TypeAbstraction.TOP) {
 				Ordering ordering = this.inferOrdering(typeAbstraction, calledMethodName);
 
 				if (ret == null)
 					ret = ordering;
-				else if (ret != ordering) {
+				else if (ret != ordering)
 					throw new InconsistentPossibleOrderingException(
 							"Types have inconsistent orderings: " + possibleTypes);
-				}
 			}
-		}
 
 		return ret;
 	}

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

@@ -213,7 +213,7 @@ protected void check() {
 
 		// let's check that execution modes are consistent.
 		if (this.isConsistent(possibleExecutionModes, PreconditionFailure.INCONSISTENT_POSSIBLE_EXECUTION_MODES,
-				"Stream: " + creation + " has inconsitent possible execution modes.", creation)) {
+				"Stream: " + creation + " has inconsitent possible execution modes.", creation))
 			// do we have consistent ordering?
 			if (this.isConsistent(possibleOrderings, PreconditionFailure.INCONSISTENT_POSSIBLE_ORDERINGS,
 					"Stream: " + creation + " has inconsitent possible orderings.", creation)) {
@@ -242,26 +242,22 @@ protected void check() {
 						if (hasPossibleSideEffects)
 							this.addStatusEntry(PreconditionFailure.HAS_SIDE_EFFECTS2, "Stream: " + creation
 									+ " is associated with a behavioral parameter containing possible side-effects");
-						else {
-							// check SIO.
-							if (!hasPossibleStatefulIntermediateOperations) {
-								// it passed P2.
-								this.setRefactoring(Refactoring.CONVERT_SEQUENTIAL_STREAM_TO_PARALLEL);
-								this.setTransformationAction(TransformationAction.CONVERT_TO_PARALLEL);
-								this.setPassingPrecondition(PreconditionSuccess.P2);
-							} else {
-								// check ROM.
-								if (!reduceOrderingPossiblyMatters) {
-									// it passes P3.
-									this.setRefactoring(Refactoring.CONVERT_SEQUENTIAL_STREAM_TO_PARALLEL);
-									this.setTransformationAction(TransformationAction.UNORDER,
-											TransformationAction.CONVERT_TO_PARALLEL);
-									this.setPassingPrecondition(PreconditionSuccess.P3);
-								} else
-									this.addStatusEntry(PreconditionFailure.REDUCE_ORDERING_MATTERS,
-											"Ordering of the result produced by a terminal operation must be preserved");
-							}
-						}
+						else // check SIO.
+						if (!hasPossibleStatefulIntermediateOperations) {
+							// it passed P2.
+							this.setRefactoring(Refactoring.CONVERT_SEQUENTIAL_STREAM_TO_PARALLEL);
+							this.setTransformationAction(TransformationAction.CONVERT_TO_PARALLEL);
+							this.setPassingPrecondition(PreconditionSuccess.P2);
+						} else // check ROM.
+						if (!reduceOrderingPossiblyMatters) {
+							// it passes P3.
+							this.setRefactoring(Refactoring.CONVERT_SEQUENTIAL_STREAM_TO_PARALLEL);
+							this.setTransformationAction(TransformationAction.UNORDER,
+									TransformationAction.CONVERT_TO_PARALLEL);
+							this.setPassingPrecondition(PreconditionSuccess.P3);
+						} else
+							this.addStatusEntry(PreconditionFailure.REDUCE_ORDERING_MATTERS,
+									"Ordering of the result produced by a terminal operation must be preserved");
 						break;
 					}
 					break;
@@ -292,7 +288,6 @@ protected void check() {
 					}
 				}
 			}
-		}
 	}
 
 	protected InstanceKey computeInstanceKey(Collection<InstanceKey> trackedInstances,
@@ -459,14 +454,13 @@ Optional<SSAInvokeInstruction> getInstructionForCreation(EclipseProjectAnalysisE
 				int lineNumberFromIR = getLineNumberFromIR(method, instruction);
 				int lineNumberFromAST = getLineNumberFromAST(methodName);
 
-				if (lineNumberFromIR == lineNumberFromAST) {
+				if (lineNumberFromIR == lineNumberFromAST)
 					// lines from the AST and the IR match. Let's dive a little
 					// deeper to be more confident of the correspondence.
 					if (matches(instruction, this.getCreation(), Optional.of(LOGGER))) {
 						this.instructionForCreation = Optional.of((SSAInvokeInstruction) instruction);
 						return this.instructionForCreation;
 					}
-				}
 			}
 			this.instructionForCreation = Optional.empty();
 		}
@@ -529,13 +523,12 @@ public TypeReference getTypeReference() {
 		// try to get the top-most type.
 		ITypeBinding[] allSuperTypes = Bindings.getAllSuperTypes(typeBinding);
 
-		for (ITypeBinding supertype : allSuperTypes) {
+		for (ITypeBinding supertype : allSuperTypes)
 			// if it's the top-most interface.
 			if (supertype.isInterface() && supertype.getName().startsWith(BASE_STREAM_TYPE_NAME)) {
 				typeBinding = supertype; // use it.
 				break;
 			}
-		}
 
 		TypeReference typeRef = mapper.getTypeRef(typeBinding);
 		return typeRef;
@@ -599,7 +592,7 @@ private void inferInitialOrdering(EclipseProjectAnalysisEngine<InstanceKey> engi
 		String expressionTypeQualifiedName = expressionTypeBinding.getErasure().getQualifiedName();
 		IMethodBinding calledMethodBinding = this.getCreation().resolveMethodBinding();
 
-		if (JdtFlags.isStatic(calledMethodBinding)) {
+		if (JdtFlags.isStatic(calledMethodBinding))
 			// static methods returning unordered streams.
 			switch (expressionTypeQualifiedName) {
 			case JAVA_UTIL_STREAM_STREAM:
@@ -619,8 +612,8 @@ private void inferInitialOrdering(EclipseProjectAnalysisEngine<InstanceKey> engi
 						+ ". Falling back to: " + defaultOrdering + ".");
 				this.setInitialOrdering(defaultOrdering);
 			}
-		} else { // instance method.
-			// get the use value number for the stream creation.
+		else { // instance method.
+				// get the use value number for the stream creation.
 			int valueNumber = this.getUseValueNumberForCreation(engine);
 
 			if (valueNumber < 0) {

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

@@ -272,14 +272,11 @@ public static Set<Entrypoint> findEntryPoints(IClassHierarchy classHierarchy, Se
 		final Set<Entrypoint> result = new HashSet<>();
 
 		for (IClass klass : classHierarchy)
-			if (!(isJDKClass(klass) || isLibraryClass(klass))) {
+			if (!(isJDKClass(klass) || isLibraryClass(klass)))
 				// iterate over all declared methods
-				for (com.ibm.wala.classLoader.IMethod method : klass.getDeclaredMethods()) {
-					if (signatures.contains(method.getSignature())) {
+				for (com.ibm.wala.classLoader.IMethod method : klass.getDeclaredMethods())
+					if (signatures.contains(method.getSignature()))
 						addEntryPoint(result, method, classHierarchy);
-					}
-				}
-			}
 		return result;
 	}
 

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

@@ -112,19 +112,16 @@ public static boolean instanceKeyCorrespondsWithInstantiationInstruction(Instanc
 				ClassLoaderReference methodClassLoader = method.getReference().getDeclaringClass().getClassLoader();
 
 				// if we haven't encountered application code in the call string yet.
-				if (!applicationCodeInCallString) {
-					// get the class loaders.
-
+				if (!applicationCodeInCallString)
 					// if either the call site reference class loader or the (enclosing) method
 					// class loader is of type Application.
 					if (callSiteReferenceClassLoaderReference.equals(ClassLoaderReference.Application)
 							|| methodClassLoader.equals(ClassLoaderReference.Application))
 						// then, we've seen application code.
 						applicationCodeInCallString = true;
-				}
 
 				// if all non-application code in the call strings return streams.
-				if (allNonApplicationCodeReturnsStreams) {
+				if (allNonApplicationCodeReturnsStreams)
 					// find out if this one does as well.
 					if (!callSiteReferenceClassLoaderReference.equals(ClassLoaderReference.Application)) {
 						IMethod target = engine.getClassHierarchy()
@@ -139,7 +136,6 @@ public static boolean instanceKeyCorrespondsWithInstantiationInstruction(Instanc
 							// we found one that doesn't.
 							allNonApplicationCodeReturnsStreams = false;
 					}
-				}
 
 				// if the call site reference equals the call site corresponding
 				// to the creation instruction.

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

@@ -32,11 +32,9 @@ public static boolean isAnnotatedFactoryMethod(IMethod callee) {
 		if (annotations == null)
 			return false;
 
-		for (Annotation annotation : annotations) {
-			if (annotation.getType().getName().getClassName().toString().contains("JFlowFactory")) {
+		for (Annotation annotation : annotations)
+			if (annotation.getType().getName().getClassName().toString().contains("JFlowFactory"))
 				return true;
-			}
-		}
 		return false;
 	}
 

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

@@ -55,10 +55,9 @@ protected void resolveLibraryPathEntry(EclipseProjectPath.ILoader loader, IPath
 			// should ignore directories as well..
 			return;
 		}
-		if (this.isPrimordialJarFile(j)) {
+		if (this.isPrimordialJarFile(j))
 			// force it.
 			loader = Loader.PRIMORDIAL;
-		}
 		List<Module> s = MapUtil.findOrCreateList(this.modules, loader);
 		s.add(file.isDirectory() ? (Module) new BinaryDirectoryTreeModule(file) : (Module) new JarFileModule(j));
 	}

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

@@ -18,14 +18,13 @@ public static String getMethodIdentifier(IMethod method) throws JavaModelExcepti
 			return null;
 
 		StringBuilder sb = new StringBuilder();
-		sb.append((method.getElementName()) + "(");
+		sb.append(method.getElementName() + "(");
 		ILocalVariable[] parameters = method.getParameters();
 		for (int i = 0; i < parameters.length; i++) {
 			sb.append(edu.cuny.hunter.streamrefactoring.core.utils.Util
 					.getQualifiedNameFromTypeSignature(parameters[i].getTypeSignature(), method.getDeclaringType()));
-			if (i != (parameters.length - 1)) {
+			if (i != parameters.length - 1)
 				sb.append(",");
-			}
 		}
 		sb.append(")");
 		return sb.toString();

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

@@ -186,8 +186,8 @@ public static Test suite() {
 
 	private static void tryDeletingAllJavaClassFiles(IPackageFragment pack) throws JavaModelException {
 		IJavaElement[] kids = pack.getChildren();
-		for (int i = 0; i < kids.length; i++) {
-			if (kids[i] instanceof ISourceManipulation) {
+		for (int i = 0; i < kids.length; i++)
+			if (kids[i] instanceof ISourceManipulation)
 				if (kids[i].exists() && !kids[i].isReadOnly()) {
 					IPath path = kids[i].getPath();
 
@@ -226,8 +226,6 @@ private static void tryDeletingAllJavaClassFiles(IPackageFragment pack) throws J
 								"Class file for " + kids[i].getElementName() + " does not exist.", e);
 					}
 				}
-			}
-		}
 	}
 
 	public ConvertStreamToParallelRefactoringTest(String name) {
@@ -262,9 +260,9 @@ protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, String cu
 			throws Exception {
 		String testFileName;
 
-		if (input) {
+		if (input)
 			testFileName = this.getInputTestFileName(cuName);
-		} else // output case.
+		else // output case.
 			testFileName = this.getOutputTestFileName(cuName);
 
 		String contents = this.getFileContents(testFileName);

edu.cuny.hunter.streamrefactoring.ui/src/edu/cuny/hunter/streamrefactoring/ui/handlers/ConvertStreamToParallelHandler.java

@@ -43,9 +43,9 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		Set<IJavaProject> javaProjectSet = new HashSet<>();
 
-		if (list != null) {
+		if (list != null)
 			try {
-				for (Object obj : list) {
+				for (Object obj : list)
 					if (obj instanceof IJavaElement) {
 						IJavaElement jElem = (IJavaElement) obj;
 						switch (jElem.getElementType()) {
@@ -64,7 +64,6 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 							break;
 						}
 					}
-				}
 
 				Shell shell = HandlerUtil.getActiveShellChecked(event);
 				ConvertStreamToParallelRefactoringWizard.startRefactoring(
@@ -73,7 +72,6 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 				JavaPlugin.log(e);
 				throw new ExecutionException("Failed to start refactoring", e);
 			}
-		}
 		// TODO: What do we do if there was no input? Do we display some
 		// message?
 		return null;
@@ -83,7 +81,7 @@ private Set<IMethod> extractMethodsFromClass(IType type, Optional<IProgressMonit
 			throws JavaModelException {
 		Set<IMethod> methodSet = new HashSet<>();
 
-		if (type.isClass()) {
+		if (type.isClass())
 			for (IMethod method : type.getMethods())
 				// if (RefactoringAvailabilityTester.isInterfaceMigrationAvailable(method,
 				// monitor)) {
@@ -93,8 +91,6 @@ private Set<IMethod> extractMethodsFromClass(IType type, Optional<IProgressMonit
 				} else
 					this.logNonMigratableMethod(method);
 
-		}
-
 		return methodSet;
 	}