#438 hasSameParameter() uses template parameter

Author: siom79

japicmp/src/main/java/japicmp/model/JApiBehavior.java

@@ -267,15 +267,20 @@ protected JApiAttribute<SyntheticAttribute> extractSyntheticAttribute(Optional<?
 
 	public boolean hasSameParameter(JApiMethod method) {
 		boolean hasSameParameter = true;
-		List<JApiParameter> parameters1 = getParameters();
-		List<JApiParameter> parameters2 = method.getParameters();
-		if (parameters1.size() != parameters2.size()) {
+		List<JApiParameter> thisParams = getParameters();
+		List<JApiParameter> otherParams = method.getParameters();
+		if (thisParams.size() != otherParams.size()) {
 			hasSameParameter = false;
 		}
 		if (hasSameParameter) {
-			for (int i = 0; i < parameters1.size(); i++) {
-				if (!parameters1.get(i).getType().equals(parameters2.get(i).getType())) {
+			for (int i = 0; i < thisParams.size(); i++) {
+				JApiParameter thisParam = thisParams.get(i);
+				JApiParameter otherParam = otherParams.get(i);
+				if (!thisParam.getTemplateNameOptional().isPresent() && // template parameter means java.lang.Object (that matches anyway)
+					!otherParam.getTemplateNameOptional().isPresent() &&
+					!thisParam.getType().equals(otherParam.getType())) {
 					hasSameParameter = false;
+					break;
 				}
 			}
 		}

japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java

@@ -2546,6 +2546,38 @@ public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
 		assertThat(jApiMethod.getCompatibilityChanges(), hasItem(new JApiCompatibilityChange(JApiCompatibilityChangeType.CLASS_GENERIC_TEMPLATE_CHANGED)));
 	}
 
+	@Test
+	void testNewMethodWithGenericsImplemented() throws Exception {
+		JarArchiveComparatorOptions jarArchiveComparatorOptions = new JarArchiveComparatorOptions();
+		jarArchiveComparatorOptions.setAccessModifier(AccessModifier.PRIVATE);
+		List<JApiClass> jApiClasses = ClassesHelper.compareClasses(jarArchiveComparatorOptions, new ClassesHelper.ClassesGenerator() {
+			@Override
+			public List<CtClass> createOldClasses(ClassPool classPool) {
+				CtClass ctClassC = CtClassBuilder.create().name("C").addToClassPool(classPool);
+				return Collections.singletonList(ctClassC);
+			}
+
+			@Override
+			public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
+				CtClass ctInterface = CtInterfaceBuilder.create().name("I").addToClassPool(classPool);
+				CtMethodBuilder.create()
+					.abstractMethod()
+					.returnType(CtClass.voidType)
+					.name("newMethod")
+					.parameter(classPool.get("java.lang.Object"))
+					.signature("<T:Ljava/lang/Object;>(TT;)TT;")
+					.addToClass(ctInterface);
+				CtClass ctClassC = CtClassBuilder.create().name("C").implementsInterface(ctInterface).addToClassPool(classPool);
+				CtMethodBuilder.create().publicAccess().returnType(CtClass.voidType).name("newMethod")
+					.parameter(classPool.get("java.lang.String")).addToClass(ctClassC);
+				return Collections.singletonList(ctClassC);
+			}
+		});
+		JApiClass jApiClass = getJApiClass(jApiClasses, "C");
+		assertThat(jApiClass.getChangeStatus(), is(JApiChangeStatus.MODIFIED));
+		assertThat(jApiClass.getCompatibilityChanges().size(), is(1));
+	}
+
 	@Test
 	void testMethodWithByteArrayAndArrayOfByteArrays() throws Exception {
 		JarArchiveComparatorOptions jarArchiveComparatorOptions = new JarArchiveComparatorOptions();