#395: checkIfAnnotationsChanged() no longer tracks changes of the ann…

…otation class but only of the values
siom79 · Apr 23, 2024 · 599da82 · 599da82
1 parent 278d5a9
commit 599da82
Show file tree

Hide file tree

Showing 8 changed files with 215 additions and 236 deletions.
diff --git a/japicmp-testbase/japicmp-test-v1/src/main/java/japicmp/test/annotation/TestAnnotation.java b/japicmp-testbase/japicmp-test-v1/src/main/java/japicmp/test/annotation/TestAnnotation.java
@@ -15,6 +15,7 @@
 		String label();
 	}
 
+	@TestAnnotation(name = "recursion", list = {"r", "r2"}, type = @TestAnnotation.Type(label = "test-recursion"))
 	String name() default "default-name";
 	String[] list();
 	Type type();

diff --git a/japicmp-testbase/japicmp-test-v2/src/main/java/japicmp/test/annotation/TestAnnotation.java b/japicmp-testbase/japicmp-test-v2/src/main/java/japicmp/test/annotation/TestAnnotation.java
@@ -16,6 +16,7 @@
 	}
 
 	String name() default "default-name";
+	@TestAnnotation(name = "recursion", list = {"r", "r2"}, type = @TestAnnotation.Type(label = "test-recursion"))
 	String[] list();
 	Type type();
 }
diff --git a/japicmp/src/main/java/japicmp/compat/CompatibilityChanges.java b/japicmp/src/main/java/japicmp/compat/CompatibilityChanges.java
diff --git a/japicmp/src/main/java/japicmp/model/JApiAnnotationElement.java b/japicmp/src/main/java/japicmp/model/JApiAnnotationElement.java
@@ -39,9 +39,6 @@ public String toString()
 			+ "]";
 	}
 
-
-
-
 	private JApiChangeStatus evaluateChangeStatus(JApiChangeStatus changeStatus) {
 		if (changeStatus == JApiChangeStatus.UNCHANGED) {
 			if (oldValue.isPresent() && newValue.isPresent()) {

diff --git a/japicmp/src/main/java/japicmp/model/JApiCompatibilityChange.java b/japicmp/src/main/java/japicmp/model/JApiCompatibilityChange.java
@@ -53,4 +53,12 @@ public boolean equals(Object o) {
 	public int hashCode() {
 		return Objects.hash(type);
 	}
+
+	@Override
+	public String toString() {
+		final StringBuffer sb = new StringBuffer("JApiCompatibilityChange{");
+		sb.append("type=").append(type);
+		sb.append('}');
+		return sb.toString();
+	}
 }
diff --git a/japicmp/src/main/java/japicmp/model/JApiCompatibilityChangeType.java b/japicmp/src/main/java/japicmp/model/JApiCompatibilityChangeType.java
@@ -8,7 +8,6 @@ public enum JApiCompatibilityChangeType {
 	ANNOTATION_ADDED(true, true, JApiSemanticVersionLevel.PATCH),
 	ANNOTATION_DEPRECATED_ADDED(true, true, JApiSemanticVersionLevel.MINOR),
 	ANNOTATION_MODIFIED(true, true, JApiSemanticVersionLevel.PATCH),
-	ANNOTATION_MODIFIED_INCOMPATIBLE(true, true, JApiSemanticVersionLevel.PATCH),
 	ANNOTATION_REMOVED(true, true, JApiSemanticVersionLevel.PATCH),
 	CLASS_REMOVED(false, false, JApiSemanticVersionLevel.MAJOR),
 	CLASS_NOW_ABSTRACT(false, false, JApiSemanticVersionLevel.MAJOR),

diff --git a/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java b/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java
@@ -2615,19 +2615,18 @@ public void testAnnotationOnClassModified() throws Exception {
 			public List<CtClass> createOldClasses(ClassPool classPool) throws Exception {
 				CtClass anAnnotation = CtAnnotationBuilder.create().name("japicmp.MyAnnotation").addToClassPool(classPool);
 				CtMethodBuilder.create().name("foo").returnType(CtClass.intType).publicAccess().addToClass(anAnnotation);
-				CtClass aClass = CtClassBuilder.create().name("japicmp.Test").withAnnotation("japicmp.MyAnnotation").addToClassPool(classPool);
-				return Arrays.asList(aClass, anAnnotation);
+				return Collections.singletonList(anAnnotation);
 			}
 
 			@Override
 			public List<CtClass> createNewClasses(ClassPool classPool) {
 				CtClass anAnnotation = CtAnnotationBuilder.create().name("japicmp.MyAnnotation").addToClassPool(classPool);
-				CtClass aClass = CtClassBuilder.create().name("japicmp.Test").withAnnotation("japicmp.MyAnnotation").addToClassPool(classPool);
-				return Arrays.asList(aClass, anAnnotation);
+				return Arrays.asList(anAnnotation);
 			}
 		});
-		JApiClass jApiClass = getJApiClass(jApiClasses, "japicmp.Test");
-		assertThat(jApiClass.getCompatibilityChanges(), hasItem(new JApiCompatibilityChange(JApiCompatibilityChangeType.ANNOTATION_MODIFIED_INCOMPATIBLE)));
+		JApiClass jApiClass = getJApiClass(jApiClasses, "japicmp.MyAnnotation");
+		JApiMethod jApiMethod = getJApiMethod(jApiClass.getMethods(), "foo");
+		assertThat(jApiMethod.getCompatibilityChanges(), hasItem(new JApiCompatibilityChange(JApiCompatibilityChangeType.METHOD_REMOVED)));
 	}
 
 	@Test
@@ -2677,30 +2676,4 @@ public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
 		JApiMethod jApiMethod = getJApiMethod(jApiClass.getMethods(), "method");
 		assertThat(jApiMethod.getCompatibilityChanges(), hasItem(new JApiCompatibilityChange(JApiCompatibilityChangeType.ANNOTATION_REMOVED)));
 	}
-
-	@Test
-	public void testAnnotationOnMethodModified() throws Exception {
-		JarArchiveComparatorOptions options = new JarArchiveComparatorOptions();
-		List<JApiClass> jApiClasses = ClassesHelper.compareClasses(options, new ClassesHelper.ClassesGenerator() {
-			@Override
-			public List<CtClass> createOldClasses(ClassPool classPool) throws Exception {
-				CtClass anAnnotation = CtAnnotationBuilder.create().name("japicmp.MyAnnotation").addToClassPool(classPool);
-				CtMethodBuilder.create().name("foo").returnType(CtClass.intType).publicAccess().addToClass(anAnnotation);
-				CtClass aClass = CtClassBuilder.create().name("japicmp.Test").addToClassPool(classPool);
-				CtMethodBuilder.create().publicAccess().name("method").withAnnotation("japicmp.MyAnnotation").addToClass(aClass);
-				return Arrays.asList(aClass, anAnnotation);
-			}
-
-			@Override
-			public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
-				CtClass anAnnotation = CtAnnotationBuilder.create().name("japicmp.MyAnnotation").addToClassPool(classPool);
-				CtClass aClass = CtClassBuilder.create().name("japicmp.Test").addToClassPool(classPool);
-				CtMethodBuilder.create().publicAccess().name("method").withAnnotation("japicmp.MyAnnotation").addToClass(aClass);
-				return Arrays.asList(aClass, anAnnotation);
-			}
-		});
-		JApiClass jApiClass = getJApiClass(jApiClasses, "japicmp.Test");
-		JApiMethod jApiMethod = getJApiMethod(jApiClass.getMethods(), "method");
-		assertThat(jApiMethod.getCompatibilityChanges(), hasItem(new JApiCompatibilityChange(JApiCompatibilityChangeType.ANNOTATION_MODIFIED_INCOMPATIBLE)));
-	}
 }
diff --git a/src/site/markdown/MavenPlugin.md b/src/site/markdown/MavenPlugin.md
@@ -265,7 +265,6 @@ for each check. This allows you to customize the following verifications:
 | ANNOTATION_ADDED | true | true | PATCH |
 | ANNOTATION_DEPRECATED_ADDED | true | true | MINOR |
 | ANNOTATION_MODIFIED | true | true | PATCH |
-| ANNOTATION_MODIFIED_INCOMPATIBLE | true | true | PATCH |
 | ANNOTATION_REMOVED | true | true | PATCH |
 | CLASS_REMOVED | false | false | MAJOR |
 | CLASS_NOW_ABSTRACT | false | false | MAJOR |