Fix matching of method pairs in annotation type declarations

junit-team/junit5@eb35aa9 Rename Method public parameters() : String renamed to public parameterTypeNames() : String in class org.junit.platform.suite.api.SelectMethod
tsantalis · Jan 2, 2025 · 6309cb1 · 6309cb1
1 parent 97f45f7
commit 6309cb1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java b/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
@@ -9764,6 +9764,21 @@ else if(!thisEqualSignature && otherEqualSignature) {
 							return 1;
 						}
 					}
+					if(this.getContainer1().getJavadoc() != null && this.getContainer2().getJavadoc() != null &&
+							operationBodyMapper.getContainer1().getJavadoc() != null && operationBodyMapper.getContainer2().getJavadoc() != null) {
+						boolean thisCommonJavadoc = 
+								this.getContainer1().getJavadoc().getText().contains(this.getContainer2().getJavadoc().getText()) ||
+								this.getContainer2().getJavadoc().getText().contains(this.getContainer1().getJavadoc().getText());
+						boolean otherCommonJavadoc = 
+								operationBodyMapper.getContainer1().getJavadoc().getText().contains(operationBodyMapper.getContainer2().getJavadoc().getText()) ||
+								operationBodyMapper.getContainer2().getJavadoc().getText().contains(operationBodyMapper.getContainer1().getJavadoc().getText());
+						if(thisCommonJavadoc && !otherCommonJavadoc) {
+							return -1;
+						}
+						else if(!thisCommonJavadoc && otherCommonJavadoc) {
+							return 1;
+						}
+					}
 					int thisEditDistance = this.editDistance();
 					int otherEditDistance = operationBodyMapper.editDistance();
 					if(thisEditDistance != otherEditDistance) {

diff --git a/src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java b/src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java
@@ -2031,7 +2031,8 @@ private boolean delegatesToAnotherRemovedOperation(UMLOperation removedOperation
 	private void updateMapperSet(TreeSet<UMLOperationBodyMapper> mapperSet, UMLOperation removedOperation, UMLOperation addedOperation, int differenceInPosition) throws RefactoringMinerTimedOutException {
 		boolean mapperWithZeroNonMappedStatementsOrIdenticalMethodName = false;
 		for(UMLOperationBodyMapper mapper : mapperSet) {
-			if(mapper.getContainer1().getBodyHashCode() == mapper.getContainer2().getBodyHashCode()) {
+			if(mapper.getContainer1().getBody() != null && mapper.getContainer2().getBody() != null &&
+					mapper.getContainer1().getBodyHashCode() == mapper.getContainer2().getBodyHashCode()) {
 				return;
 			}
 			if(mapper.getContainer1().getName().equals(mapper.getContainer2().getName())) {