Merge branch 'master' of https://github.com/ponder-lab/Java-8-Stream-Refactoring

Author: khatchad

.travis.yml

@@ -1,13 +1,12 @@
 sudo: false
 language: java
-jdk: oraclejdk8
+jdk: openjdk8
 cache:
     apt: true
     directories:
         - $HOME/.m2
+services:
+    - xvfb
 script: mvn clean verify -Pjacoco coveralls:report
-before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
 notifications:
     slack: cunyponder:A8GuEoj0voEn2H7MJDL1eNji

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Please see [the wiki][wiki] for more information regarding development.
 
 ## Building
 
-The project includes a maven configuration file using the tycho plug-in, which is part of the [maven eclipse plugin](http://www.eclipse.org/m2e/). Running `mvn install` will install *most* dependencies. Note that if you are not using maven, this plugin depends on https://github.com/khatchad/edu.cuny.citytech.refactoring.common, the **Eclipse SDK**, **Eclipse SDK tests**, and the **Eclipse testing framework** (may also be called the **Eclipse Test Framework**). The latter three can be installed from the "Install New Software..." menu option under "Help" in Eclipse.
+The project includes a maven configuration file using the tycho plug-in, which is part of the [maven eclipse plugin](http://www.eclipse.org/m2e/). Running `mvn install` will install *most* dependencies. Note that if you are not using maven, this plugin depends on https://github.com/khatchad/edu.cuny.citytech.refactoring.common, the **Eclipse SDK**, **Eclipse SDK tests**, the **Eclipse testing framework** (may also be called the **Eclipse Test Framework**), and [Metrics](http://metrics2.sourceforge.net). Some of these can be installed from the "Install New Software..." menu option under "Help" in Eclipse.
 
 ## Generating Entry Points Files
 
@@ -30,6 +30,8 @@ Key              | Value Type | Description
 ---------------- | ---------- | ----------
 nToUseForStreams | Integer    | The value of N to use while building the nCFA for stream types.
 
+More info can be found on [this wiki page](https://github.com/ponder-lab/Optimize-Java-8-Streams-Refactoring/wiki/Running-the-Evaluator).
+
 [wiki]: https://github.com/ponder-lab/Optimize-Java-8-Streams-Refactoring/wiki
 [annotations]: https://github.com/ponder-lab/edu.cuny.hunter.streamrefactoring.annotations
 [wala]: https://github.com/wala/WALA

README.md

@@ -1,14 +1,15 @@
 # Optimize Java 8 Streams Refactoring
 
-[![Build Status](https://travis-ci.com/ponder-lab/Optimize-Java-8-Streams-Refactoring.svg?branch=master)](https://travis-ci.com/ponder-lab/Optimize-Java-8-Streams-Refactoring) [![Coverage Status](https://coveralls.io/repos/github/ponder-lab/Optimize-Java-8-Streams-Refactoring/badge.svg?branch=master)](https://coveralls.io/github/ponder-lab/Optimize-Java-8-Streams-Refactoring?branch=master) [![GitHub license](https://img.shields.io/badge/license-Eclipse-blue.svg)](https://github.com/khatchadourian-lab/Java-8-Stream-Refactoring/raw/master/LICENSE.txt) [![DOI](https://zenodo.org/badge/78147265.svg)](https://zenodo.org/badge/latestdoi/78147265)
+[![Build Status](https://travis-ci.com/ponder-lab/Optimize-Java-8-Streams-Refactoring.svg?branch=master)](https://travis-ci.com/ponder-lab/Optimize-Java-8-Streams-Refactoring) [![Coverage Status](https://coveralls.io/repos/github/ponder-lab/Optimize-Java-8-Streams-Refactoring/badge.svg?branch=master)](https://coveralls.io/github/ponder-lab/Optimize-Java-8-Streams-Refactoring?branch=master) [![GitHub license](https://img.shields.io/badge/license-Eclipse-blue.svg)](https://github.com/khatchadourian-lab/Java-8-Stream-Refactoring/raw/master/LICENSE.txt) [![DOI](https://zenodo.org/badge/78147265.svg)](https://zenodo.org/badge/latestdoi/78147265) [![Java profiler](https://www.ej-technologies.com/images/product_banners/jprofiler_small.png)](https://www.ej-technologies.com/products/jprofiler/overview.html)
 
 ## Introduction
 
-<img src="https://raw.githubusercontent.com/ponder-lab/Optimize-Java-8-Streams-Refactoring/master/edu.cuny.hunter.streamrefactoring.ui/icons/icon.png" alt="Icon" align="left" height=150px width=150px/> The Java 8 Stream API sets forth a promising new programming model that incorporates functional-like, MapReduce-style features into a mainstream programming language. However, using streams efficiently may involve subtle considerations. 
+<img src="https://raw.githubusercontent.com/ponder-lab/Optimize-Java-8-Streams-Refactoring/master/edu.cuny.hunter.streamrefactoring.ui/icons/icon.png" alt="Icon" align="left" height=150px width=150px/> The Java 8 Stream API sets forth a promising new programming model that incorporates functional-like, MapReduce-style features into a mainstream programming language. However, using streams efficiently may involve subtle considerations.
 
 This tool consists of automated refactoring research prototype plug-ins for [Eclipse][eclipse] that assists developers in writing optimal stream client code in a semantics-preserving fashion. Refactoring preconditions and transformations for automatically determining when it is safe and possibly advantageous to convert a sequential stream to parallel and improve upon already parallel streams are included. The approach utilizes both [WALA][wala] and [SAFE][safe].
 
 ## Screenshot
+
 ![Screenshot](http://i2.wp.com/khatchad.commons.gc.cuny.edu/files/2018/03/Screenshot-from-2018-04-28-17-34-53.png)
 
 ## Demonstration
@@ -32,14 +33,16 @@ Currently, the refactoring works only via the package explorer and the outline v
 
 ## Installation
 
+The latest release is [v0.18.0][v0.18.0]. It has been tested on Eclipse IDE for RCP and RAP Developers Version: 2019-03 (4.11.0), Build id: 20190314-1200 under OpenJDK Runtime Environment (build 1.8.0_212-8u212-b03-0ubuntu1.19.04.2-b03) and OpenJDK 64-Bit Server VM (build 25.212-b03, mixed mode) on Ubuntu 19.04.
+
 [This video][install] demonstrates the different ways that this tool can be installed.
 
 ### Update Site
 
 An alpha version of our tool is available via an Eclipse update site at: https://raw.githubusercontent.com/ponder-lab/Optimize-Java-8-Streams-Refactoring/master/edu.cuny.hunter.streamrefactoring.updatesite. Please choose the latest version of the "Optimize Stream Refactoring."
 
 ### Eclipse Marketplace
-
+ 
 You may also install the tool via the [Eclipse Marketplace](https://marketplace.eclipse.org/content/optimize-java-8-streams-refactoring) by dragging this icon to your running Eclipse workspace: [![Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client](https://marketplace.eclipse.org/sites/all/themes/solstice/public/images/marketplace/btn-install.png)](http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=4056021 "Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client")
 
 ### Dependencies
@@ -68,7 +71,7 @@ Explicit entry points may be marked using the appropriate annotation found in th
 
 There are currently some limitations with embedded streams (i.e., streams declared as part of lambda expressions sent as arguments to intermediate stream operations). This is due to model differences between the Eclipse JDT and WALA. See [#155](https://github.com/ponder-lab/Java-8-Stream-Refactoring/issues/155) for details.
 
-In general, there is [an issue](https://github.com/wala/WALA/issues/281) with the mapping between the Eclipse DOM and WALA DOM, particuarly when using Anonymous Inner Classes (AICs). We are currently working with the WALA developers to resolve [this issue](https://github.com/ponder-lab/Java-8-Stream-Refactoring/issues/155).
+In general, there is [an issue](https://github.com/wala/WALA/issues/2/edit81) with the mapping between the Eclipse DOM and WALA DOM, particuarly when using Anonymous Inner Classes (AICs). We are currently working with the WALA developers to resolve [this issue](https://github.com/ponder-lab/Java-8-Stream-Refactoring/issues/155).
 
 ## Contributing
 
@@ -82,6 +85,35 @@ For information on contributing, see [CONTRIBUTING.md][contrib].
 
 See the [wiki][wiki] for further information.
 
+## Publications
+
+<a name="Khatchadourian2019"></a>Raffi Khatchadourian, Yiming Tang, Mehdi Bagherzadeh, and Syed Ahmed. Safe automated refactoring for intelligent parallelization of Java 8 streams. In <em>International Conference on Software Engineering</em>, ICSE '19, pages 619--630, Piscataway, NJ, USA, May 2019. ACM/IEEE, IEEE Press. [ <a href="http://www.cs.hunter.cuny.edu/~Raffi.Khatchadourian99/all_bib.html#Khatchadourian2019">bib</a> | <a href="http://dx.doi.org/10.1109/ICSE.2019.00072">DOI</a> | <a href="http://www.slideshare.net/khatchad/safe-automated-refactoring-for-intelligent-parallelization-of-java-8-streams">slides</a> | <a href="http://academicworks.cuny.edu/hc_pubs/489">http</a> ]
+
+<a name="Khatchadourian2018b"></a>Raffi Khatchadourian, Yiming Tang, Mehdi Bagherzadeh, and Syed Ahmed. A tool for optimizing Java 8 stream software via automated refactoring. In <em>International Working Conference on Source Code Analysis and Manipulation</em>, SCAM '18, pages 34--39. IEEE, IEEE Press, September 2018. Engineering Track. [ <a href="http://www.cs.hunter.cuny.edu/~Raffi.Khatchadourian99/all_bib.html#Khatchadourian2018b">bib</a> | <a href="http://dx.doi.org/10.1109/SCAM.2018.00011">DOI</a> | <a href="http://www.slideshare.net/khatchad/a-tool-for-optimizing-java-8-stream-softwarevia-automated-refactoring">slides</a> | <a href="http://academicworks.cuny.edu/hc_pubs/429">http</a> ]
+
+## Citation
+
+Please cite this work as follows:
+
+```bibtex
+@inproceedings{Khatchadourian2018b,
+  author = {Raffi Khatchadourian and Yiming Tang and Mehdi Bagherzadeh and Syed Ahmed},
+  title = {A Tool for Optimizing {Java} 8 Stream Software via Automated Refactoring},
+  booktitle = {International Working Conference on Source Code Analysis and Manipulation},
+  year = {2018},
+  series = {SCAM '18},
+  pages = {34--39},
+  month = sep,
+  organization = {IEEE},
+  publisher = {IEEE Press},
+  note = {Engineering Track.},
+  doi = {10.1109/SCAM.2018.00011},
+  issn = {2470-6892},
+  location = {Madrid, Spain},
+  numpages = {6},
+}
+```
+
 [wiki]: https://github.com/ponder-lab/Java-8-Stream-Refactoring/wiki
 [challenges]: https://github.com/ponder-lab/Optimize-Java-8-Streams-Refactoring/wiki/Solutions-to-Engineering-Challenges
 [annotations]: https://github.com/ponder-lab/edu.cuny.hunter.streamrefactoring.annotations
@@ -92,4 +124,5 @@ See the [wiki][wiki] for further information.
 [install]: https://youtu.be/On4xBzvFk1c
 [entrypoints]: https://youtu.be/On4xBzvFk1c?t=2m6s
 [SCAM 2018]: http://www.ieee-scam.org/2018
-[paper]: https://khatchad.commons.gc.cuny.edu/research/publications/#Khatchadourian2018a
+[paper]: https://khatchad.commons.gc.cuny.edu/research/publications/#Khatchadourian2018b
+[v0.18.0]: https://github.com/ponder-lab/Optimize-Java-8-Streams-Refactoring/releases/tag/v0.18.0

edu.cuny.hunter.streamrefactoring.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: edu.cuny.hunter.streamrefactoring.core;singleton:=true
-Bundle-Version: 1.6.0
+Bundle-Version: 1.9.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .,

edu.cuny.hunter.streamrefactoring.core/pom.xml

@@ -11,5 +11,5 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   </parent>
   <artifactId>edu.cuny.hunter.streamrefactoring.core</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.6.0</version>
+  <version>1.9.0</version>
 </project>

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

@@ -41,8 +41,8 @@
 import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
 import org.eclipse.jdt.internal.corext.dom.ASTNodes;
 import org.eclipse.jdt.internal.corext.dom.Bindings;
-import org.eclipse.jdt.internal.corext.refactoring.base.JavaStatusContext;
 import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
+import org.eclipse.jdt.internal.corext.refactoring.util.JavaStatusContext;
 import org.eclipse.jdt.internal.corext.util.JdtFlags;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.eclipse.ltk.core.refactoring.RefactoringStatusContext;

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

@@ -160,15 +160,17 @@ public int getNumberOfStreamInstancesSkipped() {
 			"java.util.stream.Stream.toArray", "java.util.stream.Stream.reduce", "java.util.stream.Stream.collect",
 			"java.util.stream.Stream.min", "java.util.stream.Stream.max", "java.util.stream.Stream.count",
 			"java.util.stream.Stream.anyMatch", "java.util.stream.Stream.allMatch", "java.util.stream.Stream.noneMatch",
-			"java.util.stream.Stream.findFirst", "java.util.stream.Stream.findAny" };
+			"java.util.stream.Stream.findFirst", "java.util.stream.Stream.findAny",
+			"java.util.stream.BaseStream.iterator", "java.util.stream.BaseStream.spliterator" };
 	// @formatter:on
 
 	// @formatter:off
 	private static final String[] TERMINAL_OPERATIONS_WERE_REDUCE_ORDERING_MATTERS = {
 			"java.util.stream.DoubleStream.forEachOrdered", "java.util.stream.IntStream.forEachOrdered",
 			"java.util.stream.LongStream.forEachOrdered", "java.util.stream.Stream.forEachOrdered",
 			"java.util.stream.DoubleStream.findFirst", "java.util.stream.IntStream.findFirst",
-			"java.util.stream.LongStream.findFirst", "java.util.stream.Stream.findFirst" };
+			"java.util.stream.LongStream.findFirst", "java.util.stream.Stream.findFirst",
+			"java.util.stream.BaseStream.iterator", "java.util.stream.BaseStream.spliterator" };
 	// @formatter:on
 
 	// @formatter:off

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

@@ -26,6 +26,7 @@
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.ASTVisitor;
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.SimpleName;
@@ -763,10 +764,27 @@ public static boolean matches(SSAInstruction instruction, MethodInvocation invoc
 
 	private static boolean matches(TypeReference methodDeclaringType, MethodReference method,
 			MethodInvocation invocation) {
-		if (getBinaryName(methodDeclaringType).equals(invocation.getExpression().resolveTypeBinding().getBinaryName()))
-			// FIXME: This matching needs much work #153.
-			if (method.getName().toString().equals(invocation.resolveMethodBinding().getName()))
-				return true;
+		String declaringTypeBinaryName = getBinaryName(methodDeclaringType);
+
+		if (declaringTypeBinaryName != null) {
+			Expression expression = invocation.getExpression();
+
+			if (expression != null) {
+				ITypeBinding typeBinding = expression.resolveTypeBinding();
+
+				if (typeBinding != null) {
+					String expressionBinaryName = typeBinding.getBinaryName();
+
+					if (declaringTypeBinaryName.equals(expressionBinaryName))
+						// FIXME: This matching needs much work #153.
+						if (method.getName().toString().equals(invocation.resolveMethodBinding().getName()))
+							return true;
+				} else
+					LOGGER.warning("typeBinding is null for expression: " + expression);
+			} else
+				LOGGER.warning("expression is null for invocation: " + invocation);
+		} else
+			LOGGER.warning("Binary name is null for method declarying type: " + methodDeclaringType);
 		return false;
 	}
 

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

@@ -34,9 +34,9 @@
 import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
 import org.eclipse.jdt.core.search.SearchEngine;
 import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
-import org.eclipse.jdt.internal.corext.refactoring.base.JavaStatusContext;
 import org.eclipse.jdt.internal.corext.refactoring.changes.DynamicValidationRefactoringChange;
 import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
+import org.eclipse.jdt.internal.corext.refactoring.util.JavaStatusContext;
 import org.eclipse.jdt.internal.corext.refactoring.util.RefactoringASTParser;
 import org.eclipse.jdt.internal.corext.refactoring.util.TextEditBasedChangeManager;
 import org.eclipse.jdt.internal.ui.JavaPlugin;

edu.cuny.hunter.streamrefactoring.eval/plugin.xml

@@ -7,6 +7,13 @@
           description="Evaluates the Convert Stream to Parallel refactoring"
           id="edu.cuny.hunter.evaluate.convert.stream.to.parallel.refactoring.command"
           name="Evaluate Convert Stream To Parallel Refactoring"/>
+    <command
+          categoryId="org.eclipse.jdt.ui.category.source"
+          defaultHandler="edu.cuny.hunter.streamrefactoring.eval.handlers.StreamMethodCallFinder"
+          description="Counts the number of methods called that are stream methods"
+          id="edu.cuny.hunter.count.stream.methods.command"
+          name="Count the number of stream methods called">
+    </command>
   </extension>
   <extension point="org.eclipse.ui.handlers">
     <handler
@@ -20,5 +27,21 @@
         </with>
       </activeWhen>
     </handler>
+    <handler
+          class="edu.cuny.hunter.streamrefactoring.eval.handlers.StreamMethodCallFinder"
+          commandId="edu.cuny.hunter.count.stream.methods.command">
+       <activeWhen>
+          <with
+                variable="selection">
+             <iterate
+                   ifEmpty="false"
+                   operator="or">
+                <instanceof
+                      value="org.eclipse.jdt.core.IJavaProject">
+                </instanceof>
+             </iterate>
+          </with>
+       </activeWhen>
+    </handler>
   </extension>
 </plugin>