Enable detection of Move Class in commit

javaparser/javaparser@2f5b010
Move Class	japa.bdd.samples.JavaConcepts.A moved to japa.bdd.samples.JavaConceptsMethods.A

Author: tsantalis

README.md

@@ -509,11 +509,11 @@ Moreover, the benchmark has been extended with valid instances for the following
 * `Move Code`
 * `Split Class`
 
-As of **November 14, 2025** the precision and recall of RefactoringMiner on this benchmark is:
+As of **November 15, 2025** the precision and recall of RefactoringMiner on this benchmark is:
 
 | Refactoring Type | TP | FP | FN | Precision | Recall |
 |:-----------------------|-----------:|--------:|--------:|--------:|--------:|
-|**Total**|3443  | 46  | 86  | 0.987  | 0.976|
+|**Total**|3446  | 44  | 85  | 0.987  | 0.976|
 |Extract Method|373  |  1  |  4  | 0.997  | 0.989|
 |Rename Class|233  |  0  |  1  | 1.000  | 0.996|
 |Move Attribute|72  |  0  |  7  | 1.000  | 0.911|
@@ -523,7 +523,7 @@ As of **November 14, 2025** the precision and recall of RefactoringMiner on this
 |Move Method|266  |  1  |  0  | 0.996  | 1.000|
 |Move And Rename Method|24  |  4  |  1  | 0.857  | 0.960|
 |Pull Up Method|45  |  0  |  1  | 1.000  | 0.978|
-|Move Class|141  |  4  |  2  | 0.972  | 0.986|
+|Move Class|144  |  2  |  1  | 0.986  | 0.993|
 |Move And Rename Class|28  |  0  |  0  | 1.000  | 1.000|
 |Pull Up Attribute|12  |  0  |  0  | 1.000  | 1.000|
 |Push Down Attribute| 6  |  0  |  0  | 1.000  | 1.000|

src/main/java/gr/uom/java/xmi/diff/UMLModelDiff.java

@@ -105,6 +105,7 @@ public class UMLModelDiff {
 	private Map<MergeVariableReplacement, Set<CandidateMergeVariableRefactoring>> mergeMap = new LinkedHashMap<MergeVariableReplacement, Set<CandidateMergeVariableRefactoring>>();
 	private List<UMLCommentListDiff> commentsMovedBetweenClasses = new ArrayList<UMLCommentListDiff>();
 	private Map<MethodInvocationReplacement, UMLOperationBodyMapper> consistentMethodInvocationRenames = new LinkedHashMap<>();
+	private List<UMLClassMoveDiff> classMoveDiffListToBePostProcessed = new ArrayList<>();
 
 	public UMLModelDiff(UMLModel parentModel, UMLModel childModel) {
 		this.parentModel = parentModel;
@@ -778,6 +779,11 @@ public void checkForMovedClasses(Set<String> repositoryDirectories, UMLClassMatc
 							UMLClassMoveDiff classMoveDiff = new UMLClassMoveDiff(removedClass, addedClass, this, matchResult);
 							diffSet.add(classMoveDiff);
 						}
+						else {
+							UMLClassMoveDiff classMoveDiff = new UMLClassMoveDiff(removedClass, addedClass, this, matchResult);
+							if(!classMoveDiffListToBePostProcessed.contains(classMoveDiff))
+								classMoveDiffListToBePostProcessed.add(classMoveDiff);
+						}
 					}
 				}
 				if(!diffSet.isEmpty()) {
@@ -841,6 +847,11 @@ public void checkForMovedClasses(Set<String> repositoryDirectories, UMLClassMatc
 							UMLClassMoveDiff classMoveDiff = new UMLClassMoveDiff(removedClass, addedClass, this, matchResult);
 							diffSet.add(classMoveDiff);
 						}
+						else {
+							UMLClassMoveDiff classMoveDiff = new UMLClassMoveDiff(removedClass, addedClass, this, matchResult);
+							if(!classMoveDiffListToBePostProcessed.contains(classMoveDiff))
+								classMoveDiffListToBePostProcessed.add(classMoveDiff);
+						}
 					}
 				}
 				if(!diffSet.isEmpty()) {
@@ -4365,6 +4376,63 @@ else if(r.getRefactoringType().equals(RefactoringType.EXTRACT_AND_MOVE_OPERATION
 				}
 			}
 		}
+		//check the presence of the same class being moved to multiple targets
+		Map<String, Set<String>> moveTargetMap = new LinkedHashMap<>();
+		for(Refactoring r : refactorings) {
+			if(r instanceof PackageLevelRefactoring pack) {
+				UMLClass originalClass = pack.getOriginalClass();
+				UMLClass movedClass = pack.getMovedClass();
+				if(!originalClass.isTopLevel() && !movedClass.isTopLevel()) {
+					String outerOriginalClass = originalClass.getPackageName();
+					String outerMovedClass = movedClass.getPackageName();
+					String topOriginalClass = outerOriginalClass.contains(".") ? outerOriginalClass.substring(0, outerOriginalClass.lastIndexOf(".")) : outerOriginalClass;
+					String topMovedClass = outerMovedClass.contains(".") ? outerMovedClass.substring(0, outerMovedClass.lastIndexOf(".")) : outerMovedClass;
+					if(moveTargetMap.containsKey(outerOriginalClass)) {
+						moveTargetMap.get(outerOriginalClass).add(outerMovedClass);
+					}
+					else if(moveTargetMap.containsKey(topOriginalClass)) {
+						moveTargetMap.get(topOriginalClass).add(topMovedClass);
+					}
+					else {
+						Set<String> set = new LinkedHashSet<>();
+						set.add(outerMovedClass);
+						moveTargetMap.put(outerOriginalClass, set);
+					}
+				}
+			}
+		}
+		for(UMLClassMoveDiff moveDiff : classMoveDiffListToBePostProcessed) {
+			boolean proceed = false;
+			UMLClass originalClass = moveDiff.getOriginalClass();
+			UMLClass movedClass = moveDiff.getMovedClass();
+			if(!originalClass.isTopLevel() && !movedClass.isTopLevel()) {
+				String outerOriginalClass = originalClass.getPackageName();
+				if(moveTargetMap.containsKey(outerOriginalClass) && moveTargetMap.get(outerOriginalClass).size() > 1) {
+					proceed = true;
+				}
+			}
+			if(!classMoveDiffList.contains(moveDiff) && proceed) {
+				moveDiff.process();
+				refactorings.addAll(moveDiff.getRefactorings());
+				classMoveDiffList.add(moveDiff);
+				Refactoring refactoring = new MoveClassRefactoring(moveDiff.getOriginalClass(), moveDiff.getMovedClass());
+				refactorings.add(refactoring);
+				removedClasses.remove(moveDiff.getOriginalClass());
+				addedClasses.remove(moveDiff.getMovedClass());
+				//eliminate inner classes being reported as moved
+				List<MoveClassRefactoring> toBeRemoved = new ArrayList<MoveClassRefactoring>();
+				for(Refactoring r : refactorings) {
+					if(r instanceof MoveClassRefactoring) {
+						MoveClassRefactoring moveClass = (MoveClassRefactoring)r;
+						if(moveClass.getOriginalClassName().startsWith(moveDiff.getOriginalClassName() + ".") &&
+								moveClass.getMovedClassName().startsWith(moveDiff.getNextClassName() + ".")) {
+							toBeRemoved.add(moveClass);
+						}
+					}
+				}
+				this.refactorings.removeAll(toBeRemoved);
+			}
+		}
 		//match any remaining interface methods with changes in signature
 		for(UMLClassDiff classDiff : commonClassDiffList) {
 			if(classDiff.getOriginalClass().isInterface() && classDiff.getNextClass().isInterface()) {

src/test/java/org/refactoringminer/test/TestNewDatasetRefactorings.java

@@ -52,6 +52,6 @@ public void testAllRefactorings() throws Exception {
 				.or(Refactorings.SplitClass.getValue());
 		TestBuilder test = new TestBuilder(detector, REPOS, types);
 		RefactoringPopulator.feedTSERefactoringInstances(test);
-		test.assertExpectationsWithGitHubAPI(3443, 46, 86);
+		test.assertExpectationsWithGitHubAPI(3446, 44, 85);
 	}
 }

src/test/resources/oracle/tse-dataset/javaparser.json

@@ -229,12 +229,12 @@
         {
           "type": "MOVE_CLASS",
           "description": "Move Class\tjapa.bdd.samples.JavaConcepts.JavaConcepts.X moved to japa.bdd.samples.JavaConceptsInnerClasses.JavaConceptsInnerClasses.X",
-          "validation": false
+          "validation": true
         },
         {
           "type": "MOVE_CLASS",
           "description": "Move Class\tjapa.bdd.samples.JavaConcepts.JavaConcepts.Y moved to japa.bdd.samples.JavaConceptsInnerClasses.JavaConceptsInnerClasses.Y",
-          "validation": false
+          "validation": true
         },
         {
           "type": "CHANGE_ATTRIBUTE_TYPE",