Merge pull request #382 from guillermocalvo/extend-compatibility-inte…

…rface Refactor interface hierarchy to avoid unnecessary casting
siom79 · Feb 24, 2024 · 8821891 · 8821891
2 parents f4cf4cc + 7935cb7
commit 8821891
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/japicmp/src/main/java/japicmp/compat/CompatibilityChanges.java b/japicmp/src/main/java/japicmp/compat/CompatibilityChanges.java
@@ -77,7 +77,7 @@ private void evaluateBinaryCompatibility(JApiClass jApiClass, Map<String, JApiCl
 	private void checkIfGenericTemplatesHaveChanged(JApiHasGenericTemplates jApiHasGenericTemplates) {
 		for (JApiGenericTemplate jApiGenericTemplate : jApiHasGenericTemplates.getGenericTemplates()) {
 			if (jApiGenericTemplate.getChangeStatus() != JApiChangeStatus.UNCHANGED) {
-				((JApiCompatibility)jApiHasGenericTemplates).getCompatibilityChanges().add(JApiCompatibilityChange.CLASS_GENERIC_TEMPLATE_CHANGED);
+				jApiHasGenericTemplates.getCompatibilityChanges().add(JApiCompatibilityChange.CLASS_GENERIC_TEMPLATE_CHANGED);
 				break;
 			}
 		}
@@ -86,7 +86,7 @@ private void checkIfGenericTemplatesHaveChanged(JApiHasGenericTemplates jApiHasG
 			if (changeStatus == JApiChangeStatus.MODIFIED || changeStatus == JApiChangeStatus.UNCHANGED) {
 				if (!SignatureParser.equalGenericTypes(jApiGenericTemplate.getOldGenericTypes(), jApiGenericTemplate.getNewGenericTypes())) {
 					jApiGenericTemplate.getCompatibilityChanges().add(JApiCompatibilityChange.CLASS_GENERIC_TEMPLATE_GENERICS_CHANGED);
-					((JApiCompatibility)jApiHasGenericTemplates).getCompatibilityChanges().add(JApiCompatibilityChange.CLASS_GENERIC_TEMPLATE_GENERICS_CHANGED);
+					jApiHasGenericTemplates.getCompatibilityChanges().add(JApiCompatibilityChange.CLASS_GENERIC_TEMPLATE_GENERICS_CHANGED);
 					break;
 				}
 			}
@@ -470,7 +470,7 @@ private void checkIfAnnotationDeprecatedAdded(JApiHasAnnotations jApiHasAnnotati
 		for (JApiAnnotation annotation : jApiHasAnnotations.getAnnotations()) {
 			if (annotation.getChangeStatus() == JApiChangeStatus.NEW || annotation.getChangeStatus() == JApiChangeStatus.MODIFIED) {
 				if (annotation.getFullyQualifiedName().equals(Deprecated.class.getName())) {
-					addCompatibilityChange((JApiCompatibility) jApiHasAnnotations, JApiCompatibilityChange.ANNOTATION_DEPRECATED_ADDED);
+					addCompatibilityChange(jApiHasAnnotations, JApiCompatibilityChange.ANNOTATION_DEPRECATED_ADDED);
 				}
 			}
 		}

diff --git a/japicmp/src/main/java/japicmp/model/JApiHasAnnotations.java b/japicmp/src/main/java/japicmp/model/JApiHasAnnotations.java
@@ -5,7 +5,7 @@
 /**
  * Implemented by all elements that can have annotations.
  */
-public interface JApiHasAnnotations {
+public interface JApiHasAnnotations extends JApiCompatibility {
 	/**
 	 * Returns a list of annotations as {@link japicmp.model.JApiAnnotation}.
 	 *

diff --git a/japicmp/src/main/java/japicmp/model/JApiHasGenericTemplates.java b/japicmp/src/main/java/japicmp/model/JApiHasGenericTemplates.java
@@ -2,6 +2,6 @@
 
 import java.util.List;
 
-public interface JApiHasGenericTemplates {
+public interface JApiHasGenericTemplates extends JApiCompatibility {
 	List<JApiGenericTemplate> getGenericTemplates();
 }