Fix Rename Class detection in commit

checkstyle/checkstyle@7ddc532

Author: tsantalis

README.md

@@ -508,9 +508,9 @@ As of **November 11, 2025** the precision and recall of RefactoringMiner on this
 
 | Refactoring Type | TP | FP | FN | Precision | Recall |
 |:-----------------------|-----------:|--------:|--------:|--------:|--------:|
-|**Total**|3431  | 49  | 95  | 0.986  | 0.973|
+|**Total**|3432  | 48  | 92  | 0.986  | 0.974|
 |Extract Method|371  |  1  |  4  | 0.997  | 0.989|
-|Rename Class|232  |  1  |  2  | 0.996  | 0.991|
+|Rename Class|233  |  0  |  1  | 1.000  | 0.996|
 |Move Attribute|72  |  0  |  7  | 1.000  | 0.911|
 |Move And Rename Attribute| 7  |  0  |  1  | 1.000  | 0.875|
 |Rename Method|299  |  7  |  6  | 0.977  | 0.980|
@@ -530,11 +530,11 @@ As of **November 11, 2025** the precision and recall of RefactoringMiner on this
 |Extract And Move Method|123  |  2  |  5  | 0.984  | 0.961|
 |Move And Inline Method|29  |  1  |  6  | 0.967  | 0.829|
 |Replace Anonymous With Class| 5  |  0  |  0  | 1.000  | 1.000|
-|Extract Variable|290  |  1  | 10  | 0.997  | 0.967|
+|Extract Variable|290  |  1  |  9  | 0.997  | 0.970|
 |Extract Attribute| 3  |  0  |  0  | 1.000  | 1.000|
 |Inline Variable|127  |  0  | 12  | 1.000  | 0.914|
 |Rename Variable|304  |  6  |  8  | 0.981  | 0.974|
-|Rename Attribute|107  |  4  |  9  | 0.964  | 0.922|
+|Rename Attribute|107  |  4  |  8  | 0.964  | 0.930|
 |Replace Variable With Attribute|11  |  0  |  0  | 1.000  | 1.000|
 |Replace Attribute With Variable|30  |  0  |  0  | 1.000  | 1.000|
 |Change Return Type|166  |  2  |  7  | 0.988  | 0.960|

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

@@ -1590,6 +1590,12 @@ public void inferClassRenameBasedOnReferencesInStringLiterals() throws Refactori
 		for(UMLClass addedClass : addedClasses) {
 			addedClassNameMap.put(addedClass.getNonQualifiedName(), addedClass);
 		}
+		Map<String, UMLClass> renamedRemovedClassMap = new LinkedHashMap<>();
+		Map<String, UMLClass> renamedAddedClassMap = new LinkedHashMap<>();
+		for(UMLClassRenameDiff classRenameDiff : classRenameDiffList) {
+			renamedRemovedClassMap.put(classRenameDiff.getOriginalClass().getNonQualifiedName(), classRenameDiff.getOriginalClass());
+			renamedAddedClassMap.put(classRenameDiff.getNextClass().getNonQualifiedName(), classRenameDiff.getNextClass());
+		}
 		Set<String> removedClassNames = removedClassNameMap.keySet();
 		Set<String> addedClassNames = addedClassNameMap.keySet();
 		Map<Pair<String, String>, Integer> countMap = new LinkedHashMap<>();
@@ -1599,6 +1605,9 @@ public void inferClassRenameBasedOnReferencesInStringLiterals() throws Refactori
 					for(Replacement r : mapping.getReplacements()) {
 						if(!r.getBefore().contains("{\n") && !r.getAfter().contains("{\n")) {
 							String matchingClassNameBefore = matches(r.getBefore(), removedClassNames, mapping.getFragment1());
+							if(matchingClassNameBefore == null) {
+								matchingClassNameBefore = matches(r.getBefore(), renamedRemovedClassMap.keySet(), mapping.getFragment1());
+							}
 							String matchingClassNameAfter = matches(r.getAfter(), addedClassNames, mapping.getFragment2());
 							if(condition(matchingClassNameBefore, matchingClassNameAfter, r)) {
 								Pair<String, String> pair = Pair.of(matchingClassNameBefore, matchingClassNameAfter);
@@ -1633,12 +1642,18 @@ public void inferClassRenameBasedOnReferencesInStringLiterals() throws Refactori
 			}
 		}
 		Set<UMLClassRenameDiff> diffsToBeAdded = new LinkedHashSet<UMLClassRenameDiff>();
+		Set<UMLClassRenameDiff> diffsToBeRemoved = new LinkedHashSet<UMLClassRenameDiff>();
 		Set<UMLClass> addedClassesToBeRemoved = new LinkedHashSet<UMLClass>();
 		Set<UMLClass> removedClassesToBeRemoved = new LinkedHashSet<UMLClass>();
 		UMLClassMatcher matcher = new UMLClassMatcher.RelaxedRename();
 		for(Pair<String, String> pair : countMap.keySet()) {
 			if(!conflictingPair(pair, countMap.keySet())) {
 				UMLClass removedClass = removedClassNameMap.get(pair.getLeft());
+				UMLClassRenameDiff oldClassRenameDiff = null;
+				if(removedClass == null) {
+					removedClass = renamedRemovedClassMap.get(pair.getLeft());
+					oldClassRenameDiff = (UMLClassRenameDiff) getUMLClassDiff(removedClass.getName());
+				}
 				UMLClass addedClass = addedClassNameMap.get(pair.getRight());
 				MatchResult matchResult = matcher.match(removedClass, addedClass);
 				int removedClassConstants = 0;
@@ -1654,15 +1669,27 @@ public void inferClassRenameBasedOnReferencesInStringLiterals() throws Refactori
 					}
 				}
 				boolean skip = removedClass.getAttributes().size() - removedClassConstants > 0 && addedClass.getAttributes().size() - addedClassConstants > 0 && matchResult.getMatchedAttributes() == 0;
+				if(oldClassRenameDiff != null) {
+					MatchResult oldMatchResult = matcher.match(oldClassRenameDiff.getOriginalClass(), oldClassRenameDiff.getNextClass());
+					if(oldMatchResult.isMatch() && !matchResult.isMatch()) {
+						skip = true;
+					}
+					else if(oldMatchResult.isMatch() && matchResult.isMatch() && oldMatchResult.getMatchedOperations() + oldMatchResult.getMatchedAttributes() > matchResult.getMatchedOperations() + matchResult.getMatchedAttributes()) {
+						skip = true;
+					}
+				}
 				if(!skip) {
 					UMLClassRenameDiff newClassRenameDiff = new UMLClassRenameDiff(removedClass, addedClass, this, matchResult);
 					newClassRenameDiff.process();
 					diffsToBeAdded.add(newClassRenameDiff);
 					addedClassesToBeRemoved.add(addedClass);
 					removedClassesToBeRemoved.add(removedClass);
+					if(oldClassRenameDiff != null)
+						diffsToBeRemoved.add(oldClassRenameDiff);
 				}
 			}
 		}
+		classRenameDiffList.removeAll(diffsToBeRemoved);
 		classRenameDiffList.addAll(diffsToBeAdded);
 		removedClasses.removeAll(removedClassesToBeRemoved);
 		addedClasses.removeAll(addedClassesToBeRemoved);

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

@@ -51,6 +51,6 @@ public void testAllRefactorings() throws Exception {
 				.or(Refactorings.MoveCode.getValue());
 		TestBuilder test = new TestBuilder(detector, REPOS, types);
 		RefactoringPopulator.feedTSERefactoringInstances(test);
-		test.assertExpectationsWithGitHubAPI(3431, 49, 95);
+		test.assertExpectationsWithGitHubAPI(3432, 48, 92);
 	}
 }

src/test/resources/oracle/tse-dataset/hibernate-search.json

@@ -2859,7 +2859,7 @@
         {
           "type": "RENAME_ATTRIBUTE",
           "description": "Rename Attribute\tallByNonInterfaceSuperType : Map<PojoRawTypeIdentifier<?>,Set<AbstractPojoTypeManager<?,?>>> to bySuperType : Map<PojoRawTypeIdentifier<?>,Set<AbstractPojoTypeManager<?,?>>> in class org.hibernate.search.mapper.pojo.mapping.impl.PojoTypeManagerContainer.Builder",
-          "validation": true
+          "validation": false
         },
         {
           "type": "MOVE_AND_RENAME_OPERATION",
@@ -2929,7 +2929,7 @@
         {
           "type": "EXTRACT_VARIABLE",
           "description": "Extract Variable\tindexedBySuperTypeContent : Map<PojoRawTypeIdentifier<?>,Set<PojoIndexedTypeManager<?,?>>> in method private PojoTypeManagerContainer(builder Builder) from class org.hibernate.search.mapper.pojo.mapping.impl.PojoTypeManagerContainer",
-          "validation": true
+          "validation": false
         },
         {
           "type": "EXTRACT_VARIABLE",