You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/11/16 03:07:20 UTC

[groovy] 01/02: GROOVY-8270: apply updated generics to parameters (closes #1418)

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit c4a07af376f1ffa86432c7e195a616e86c90e4df
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sun Nov 15 13:02:28 2020 -0600

    GROOVY-8270: apply updated generics to parameters (closes #1418)
---
 .../groovy/transform/AutoImplementASTTransformation.java  | 15 ++++++++-------
 .../groovy/transform/AutoImplementTransformTest.groovy    |  8 +++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
index 1ff8b39..a5cc35b 100644
--- a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
@@ -36,7 +36,7 @@ import org.codehaus.groovy.control.CompilePhase;
 import org.codehaus.groovy.control.SourceUnit;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -119,9 +119,9 @@ public class AutoImplementASTTransformation extends AbstractASTTransformation {
         ClassNode next = cNode;
         while (true) {
             Map<String, ClassNode> genericsSpec = createGenericsSpec(next);
-            for (MethodNode mn : next.getMethods()) {
-                MethodNode correctedMethod = correctToGenericsSpec(genericsSpec, mn);
-                if (next != cNode) {
+            if (next != cNode) {
+                for (MethodNode mn : next.getMethods()) {
+                    MethodNode correctedMethod = correctToGenericsSpec(genericsSpec, mn);
                     ClassNode correctedClass = correctToGenericsSpecRecurse(genericsSpec, next);
                     MethodNode found = getDeclaredMethodCorrected(genericsSpec, correctedMethod, correctedClass);
                     if (found != null) {
@@ -133,7 +133,8 @@ public class AutoImplementASTTransformation extends AbstractASTTransformation {
                     }
                 }
             }
-            List<ClassNode> interfaces = new ArrayList<>(Arrays.asList(next.getInterfaces()));
+            List<ClassNode> interfaces = new ArrayList<>();
+            Collections.addAll(interfaces, next.getInterfaces());
             Map<String, ClassNode> updatedGenericsSpec = new HashMap<>(genericsSpec);
             while (!interfaces.isEmpty()) {
                 ClassNode origInterface = interfaces.remove(0);
@@ -142,7 +143,7 @@ public class AutoImplementASTTransformation extends AbstractASTTransformation {
                     updatedGenericsSpec = createGenericsSpec(origInterface, updatedGenericsSpec);
                     ClassNode correctedInterface = correctToGenericsSpecRecurse(updatedGenericsSpec, origInterface);
                     for (MethodNode nextMethod : correctedInterface.getMethods()) {
-                        MethodNode correctedMethod = correctToGenericsSpec(genericsSpec, nextMethod);
+                        MethodNode correctedMethod = correctToGenericsSpec(updatedGenericsSpec, nextMethod);
                         MethodNode found = getDeclaredMethodCorrected(updatedGenericsSpec, correctedMethod, correctedInterface);
                         if (found != null) {
                             String td = methodDescriptorWithoutReturnType(found);
@@ -152,7 +153,7 @@ public class AutoImplementASTTransformation extends AbstractASTTransformation {
                             result.put(td, found);
                         }
                     }
-                    interfaces.addAll(Arrays.asList(correctedInterface.getInterfaces()));
+                    Collections.addAll(interfaces, correctedInterface.getInterfaces());
                 }
             }
             ClassNode superClass = next.getUnresolvedSuperClass();
diff --git a/src/test/org/codehaus/groovy/transform/AutoImplementTransformTest.groovy b/src/test/org/codehaus/groovy/transform/AutoImplementTransformTest.groovy
index abc002a..6496f0a 100644
--- a/src/test/org/codehaus/groovy/transform/AutoImplementTransformTest.groovy
+++ b/src/test/org/codehaus/groovy/transform/AutoImplementTransformTest.groovy
@@ -126,17 +126,15 @@ final class AutoImplementTransformTest {
             '''
     }
 
-    @NotYetImplemented @Test // GROOVY-8270
-    void testCovariantMethodImpl() {
+    @Test // GROOVY-8270
+    void testGenericsParameterTypes() {
         assertScript '''
             @groovy.transform.AutoImplement
             class Foo implements Comparator<String> { }
             // Can't have an abstract method in a non-abstract class. The class 'Foo' must be declared
             // abstract or the method 'int compare(java.lang.Object, java.lang.Object)' must be implemented.
 
-            def foo = new Foo()
-            assert (foo <=> 'foo') == 0
-            assert (foo.compareTo('foo')) == 0
+            assert new Foo().compare('bar', 'baz') == 0
             '''
     }
 }