Improve the matching of inner classes in commit

apache/lucene-solr@f43fe76
tsantalis · Jan 3, 2025 · 6f6a767 · 6f6a767
1 parent 6309cb1
commit 6f6a767
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/diff/ClassMoveComparator.java b/src/main/java/gr/uom/java/xmi/diff/ClassMoveComparator.java
@@ -1,6 +1,7 @@
 package gr.uom.java.xmi.diff;
 
 import java.util.Comparator;
+import java.util.Set;
 
 public class ClassMoveComparator implements Comparator<UMLClassMoveDiff> {
 
@@ -12,6 +13,11 @@ public int compare(UMLClassMoveDiff o1, UMLClassMoveDiff o2) {
 			return -Integer.compare(matchedMembers1, matchedMembers2);
 		}
 		else {
+			Set<String> set1 = o1.commonPackagesInQualifiedName();
+			Set<String> set2 = o2.commonPackagesInQualifiedName();
+			if(set1.size() != set2.size()) {
+				return -Integer.compare(set1.size(), set2.size());
+			}
 			double sourceFolderDistance1 = o1.getMovedClass().normalizedSourceFolderDistance(o1.getOriginalClass());
 			double sourceFolderDistance2 = o2.getMovedClass().normalizedSourceFolderDistance(o2.getOriginalClass());
 			if(sourceFolderDistance1 != sourceFolderDistance2) {

diff --git a/src/main/java/gr/uom/java/xmi/diff/UMLAbstractClassDiff.java b/src/main/java/gr/uom/java/xmi/diff/UMLAbstractClassDiff.java
@@ -3,6 +3,7 @@
 import static gr.uom.java.xmi.Constants.JAVA;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -188,6 +189,14 @@ public UMLModelDiff getModelDiff() {
 		return modelDiff;
 	}
 
+	public Set<String> commonPackagesInQualifiedName() {
+		List<String> packages1 = Arrays.asList(originalClass.getName().split("\\."));
+		List<String> packages2 = Arrays.asList(nextClass.getName().split("\\."));
+		Set<String> intersection = new LinkedHashSet<>(packages1);
+		intersection.retainAll(packages2);
+		return intersection;
+	}
+
 	protected void processAnnotations() {
 		this.annotationListDiff = new UMLAnnotationListDiff(originalClass.getAnnotations(), nextClass.getAnnotations());
 		for(UMLAnnotation annotation : annotationListDiff.getAddedAnnotations()) {