Replace getEntity call of MoveToClassRefactoring by getEntityOrThrow where necessary (same with getTarget).

Author: Ivan-Veselov

core/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/MoveToClassRefactoring.java

@@ -55,12 +55,12 @@ public MoveToClassRefactoring(
      * Returns class in which entity is placed in this refactoring
      */
     public @NotNull PsiClass getTargetClassOrThrow() {
-        return getTargetClass().orElseThrow(() ->
+        return Optional.ofNullable(targetClass.getElement()).orElseThrow(() ->
                 new IllegalStateException("Cannot get target class. Reference is invalid."));
     }
 
     public @NotNull PsiMember getEntityOrThrow() {
-        return getEntity().orElseThrow(() ->
+        return Optional.ofNullable(entity.getElement()).orElseThrow(() ->
                 new IllegalStateException("Cannot get entity. Reference is invalid."));
     }
 

core/src/main/java/org/jetbrains/research/groups/ml_methods/utils/RefactoringUtil.java

@@ -72,7 +72,7 @@ private static CalculatedRefactoring intersect(List<CalculatedRefactoring> refac
     public static List<CalculatedRefactoring> combine(Collection<List<CalculatedRefactoring>> refactorings) {
         return refactorings.stream()
                 .flatMap(List::stream)
-                .collect(Collectors.groupingBy(it -> it.getRefactoring().getEntity(), Collectors.toList()))
+                .collect(Collectors.groupingBy(it -> it.getRefactoring().getEntityOrThrow(), Collectors.toList()))
                 .entrySet().stream()
                 .map(entry -> combine(entry.getValue(), refactorings.size()))
                 .filter(Objects::nonNull)

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

@@ -88,7 +88,7 @@ public void main(String[] args) {
             refactorings.forEach(refactoring ->
                     LOGGER.info(
                             refactoring.getMethod() + "->" +
-                                    refactoring.getTargetClass() + System.lineSeparator() +
+                                    refactoring.getTargetClassOrThrow() + System.lineSeparator() +
                                     extractMethodDeclaration(refactoring.getMethodOrThrow()))
             );
 

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

@@ -92,7 +92,7 @@ public void main(String[] args) {
             refactorings.forEach(refactoring ->
                     LOGGER.info(
                             refactoring.getMethod() + "->" +
-                                    refactoring.getTargetClass() + System.lineSeparator() +
+                                    refactoring.getTargetClassOrThrow() + System.lineSeparator() +
                                     extractMethodDeclaration(refactoring.getMethodOrThrow()))
             );
             writer.write(refactorings, out);

src/main/java/org/jetbrains/research/groups/ml_methods/ui/RefactoringsApplier.java

@@ -86,7 +86,7 @@ static Map<CalculatedRefactoring, String> getWarnings(List<CalculatedRefactoring
 
     private static boolean checkValid(Collection<MoveToClassRefactoring> refactorings) {
         final long uniqueUnits = refactorings.stream()
-                .map(MoveToClassRefactoring::getEntity)
+                .map(MoveToClassRefactoring::getEntityOrThrow)
                 .distinct()
                 .count();
         return uniqueUnits == refactorings.size();