Merge branch 'features-extraction' of github.com:ml-in-programming/ArchitectureReloaded into integration2

Author: Ivan-Veselov

build.gradle

@@ -32,9 +32,6 @@ dependencies {
   compile project(':refactorings-generation')
   compile project(':algorithms-evaluation')
   compile files('lib/args4j-2.32.jar', 'lib/jcommon-0.9.1.jar', 'lib/jfreechart-0.9.16.jar')
-
-  // testCompile project(':utils').sourceSets.test.output
-  testCompile files('hamcrest-all-1.3.jar')
 }
 
 task runRefactoringsGeneration(dependsOn: runIde) {}

features-extraction/build.gradle

@@ -1,7 +1,12 @@
+repositories {
+    mavenCentral()
+}
+
 dependencies {
     compile project(':core')
     compile project(':MetricsReloaded')
 
     testCompile project(':core').sourceSets.test.output
-    testCompile files('../lib/hamcrest-all-1.3.jar')
+    testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.1'
 }

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/features/extractors/AnotherInstanceCallersExtractor.java

@@ -14,9 +14,9 @@ public class AnotherInstanceCallersExtractor implements MoveMethodSingleFeatureE
         final @NotNull PsiClass targetClass
     ) {
         return new AnotherInstanceCallers(
-            methodInfo.getAnotherInstanceCallers(
-                MethodFilters.sameClass(methodInfo.getContainingClass())
-            ).count()
+            methodInfo.getAnotherInstanceCallers().stream()
+                    .filter(MethodFilters.sameClass(methodInfo.getContainingClass()))
+                    .count()
         );
     }
 }

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/features/extractors/AnotherInstanceNotPublicCallTargetsExtractor.java

@@ -12,11 +12,12 @@ public class AnotherInstanceNotPublicCallTargetsExtractor implements MoveMethodS
         final @NotNull PsiClass targetClass
     ) {
         return new AnotherInstanceNotPublicCallTargets(
-            methodInfo.getAnotherInstanceTargets(
-                MethodFilters.sameClass(methodInfo.getContainingClass()),
-                MethodFilters.isNotPublic,
-                MethodFilters.isNotStatic
-            ).count()
+            methodInfo.getAnotherInstanceTargets()
+                .stream()
+                .filter(MethodFilters.sameClass(methodInfo.getContainingClass()))
+                .filter(MethodFilters.isNotPublic)
+                .filter(MethodFilters.isNotStatic)
+                .count()
         );
     }
 }

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/features/extractors/AnotherInstancePublicCallTargetsExtractor.java

@@ -12,11 +12,12 @@ public class AnotherInstancePublicCallTargetsExtractor implements MoveMethodSing
         final @NotNull PsiClass targetClass
     ) {
         return new AnotherInstancePublicCallTargets(
-            methodInfo.getAnotherInstanceTargets(
-                MethodFilters.sameClass(methodInfo.getContainingClass()),
-                MethodFilters.isPublic,
-                MethodFilters.isNotStatic
-            ).count()
+            methodInfo.getAnotherInstanceTargets()
+                .stream()
+                .filter(MethodFilters.sameClass(methodInfo.getContainingClass()))
+                .filter(MethodFilters.isPublic)
+                .filter(MethodFilters.isNotStatic)
+                .count()
         );
     }
 }

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/features/extractors/SameClassFieldsAccessedExtractor.java

@@ -13,9 +13,10 @@ public class SameClassFieldsAccessedExtractor implements MoveMethodSingleFeature
         final @NotNull PsiClass targetClass
     ) {
         return new SameClassFieldsAccessed(
-            methodInfo.getAccessedFields(
-                FieldFilters.sameClass(methodInfo.getContainingClass())
-            ).count()
+            methodInfo.getAccessedFields()
+                .stream()
+                .filter(FieldFilters.sameClass(methodInfo.getContainingClass()))
+                .count()
         );
     }
 }

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/features/extractors/SameClassStaticNotPublicCallTargetsExtractor.java

@@ -12,11 +12,11 @@ public class SameClassStaticNotPublicCallTargetsExtractor implements MoveMethodS
         final @NotNull PsiClass targetClass
     ) {
         return new SameClassStaticNotPublicCallTargets(
-            methodInfo.getAnotherInstanceTargets(
-                MethodFilters.sameClass(methodInfo.getContainingClass()),
-                MethodFilters.isNotPublic,
-                MethodFilters.isStatic
-            ).count()
+            methodInfo.getAnotherInstanceTargets().stream()
+                .filter(MethodFilters.sameClass(methodInfo.getContainingClass()))
+                .filter(MethodFilters.isNotPublic)
+                .filter(MethodFilters.isStatic)
+                .count()
         );
     }
 }

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/features/extractors/SameClassStaticPublicCallTargetsExtractor.java

@@ -12,11 +12,12 @@ public class SameClassStaticPublicCallTargetsExtractor implements MoveMethodSing
         @NotNull PsiClass targetClass
     ) {
         return new SameClassStaticPublicCallTargets(
-            methodInfo.getAnotherInstanceTargets(
-                MethodFilters.sameClass(methodInfo.getContainingClass()),
-                MethodFilters.isPublic,
-                MethodFilters.isStatic
-            ).count()
+            methodInfo.getAnotherInstanceTargets()
+                .stream()
+                .filter(MethodFilters.sameClass(methodInfo.getContainingClass()))
+                .filter(MethodFilters.isPublic)
+                .filter(MethodFilters.isStatic)
+                .count()
         );
     }
 }

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/features/extractors/SameInstanceNotPublicCallTargetsExtractor.java

@@ -12,7 +12,10 @@ public class SameInstanceNotPublicCallTargetsExtractor implements MoveMethodSing
         final @NotNull PsiClass targetClass
     ) {
         return new SameInstanceNotPublicCallTargets(
-            methodInfo.getSameInstanceTargets(MethodFilters.isNotPublic).count()
+            methodInfo.getSameInstanceTargets()
+                .stream()
+                .filter(MethodFilters.isNotPublic)
+                .count()
         );
     }
 }

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/features/extractors/SameInstancePublicCallTargetsExtractor.java

@@ -12,7 +12,10 @@ public class SameInstancePublicCallTargetsExtractor implements MoveMethodSingleF
         final @NotNull PsiClass targetClass
     ) {
         return new SameInstancePublicCallTargets(
-            methodInfo.getSameInstanceTargets(MethodFilters.isPublic).count()
+            methodInfo.getSameInstanceTargets()
+                .stream()
+                .filter(MethodFilters.isPublic)
+                .count()
         );
     }
 }