You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2019/12/20 10:10:01 UTC
[groovy] branch master updated (6f0e491 -> 4b50ac2)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 6f0e491 base binary compatibility report for 4 on 3.0 and workaround for gradle plugin bug (japicmp plugin needs guava?)
new ba93a55 GROOVY-9340: return type, not type redirect
new 4b50ac2 GROOVY-9347: STC: support "I<? super T> i = lambda/closure"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../codehaus/groovy/ast/tools/GenericsUtils.java | 68 +++++++++++-----------
src/test/groovy/transform/stc/LambdaTest.groovy | 19 +++++-
2 files changed, 51 insertions(+), 36 deletions(-)
[groovy] 02/02: GROOVY-9347: STC: support "I i =
lambda/closure"
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 4b50ac20ac37960d25896d861a55d1693d3cf891
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Dec 19 13:14:37 2019 -0600
GROOVY-9347: STC: support "I<? super T> i = lambda/closure"
---
.../codehaus/groovy/ast/tools/GenericsUtils.java | 55 ++++++++++++----------
src/test/groovy/transform/stc/LambdaTest.groovy | 17 ++++++-
2 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
index 3ce6be7..19261e7 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -48,6 +48,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.function.Function;
import java.util.function.Predicate;
import static groovy.lang.Tuple.tuple;
@@ -925,7 +926,7 @@ public class GenericsUtils {
}
/**
- * Get the parameter and return types of the abstract method of SAM
+ * Gets the parameter and return types of the abstract method of SAM.
*
* If the abstract method is not parameterized, we will get generics placeholders, e.g. T, U
* For example, the abstract method of {@link java.util.function.Function} is
@@ -942,31 +943,23 @@ public class GenericsUtils {
* we can get parameter types and return type of the above abstract method,
* i.e. ClassNode {@code ClassHelper.STRING_TYPE} and {@code ClassHelper.Integer_TYPE}
*
- * @param sam the class node which contains only one abstract method
- * @return the parameter and return types
- * @since 3.0.0
+ * @param samType the class node which contains only one abstract method
*
+ * @since 3.0.0
*/
- public static Tuple2<ClassNode[], ClassNode> parameterizeSAM(ClassNode sam) {
- MethodNode methodNode = ClassHelper.findSAM(sam);
- final Map<GenericsType, GenericsType> map = makeDeclaringAndActualGenericsTypeMapOfExactType(methodNode.getDeclaringClass(), sam);
-
- ClassNode[] parameterTypes =
- Arrays.stream(methodNode.getParameters())
- .map(e -> {
- ClassNode originalParameterType = e.getType();
- return originalParameterType.isGenericsPlaceHolder()
- ? findActualTypeByGenericsPlaceholderName(originalParameterType.getUnresolvedName(), map)
- : originalParameterType;
- })
- .toArray(ClassNode[]::new);
-
- ClassNode originalReturnType = methodNode.getReturnType();
- ClassNode returnType =
- originalReturnType.isGenericsPlaceHolder()
- ? findActualTypeByGenericsPlaceholderName(originalReturnType.getUnresolvedName(), map)
- : originalReturnType;
+ public static Tuple2<ClassNode[], ClassNode> parameterizeSAM(final ClassNode samType) {
+ MethodNode abstractMethod = ClassHelper.findSAM(samType);
+
+ Map<GenericsType, GenericsType> generics = makeDeclaringAndActualGenericsTypeMapOfExactType(abstractMethod.getDeclaringClass(), samType);
+ Function<ClassNode, ClassNode> resolver = t -> {
+ if (t.isGenericsPlaceHolder()) {
+ return findActualTypeByGenericsPlaceholderName(t.getUnresolvedName(), generics);
+ }
+ return t;
+ };
+ ClassNode[] parameterTypes = Arrays.stream(abstractMethod.getParameters()).map(Parameter::getType).map(resolver).toArray(ClassNode[]::new);
+ ClassNode returnType = resolver.apply(abstractMethod.getReturnType());
return tuple(parameterTypes, returnType);
}
@@ -977,9 +970,21 @@ public class GenericsUtils {
* @param genericsPlaceholderAndTypeMap the result of {@link #makeDeclaringAndActualGenericsTypeMap(ClassNode, ClassNode)}
*/
public static ClassNode findActualTypeByGenericsPlaceholderName(final String placeholderName, final Map<GenericsType, GenericsType> genericsPlaceholderAndTypeMap) {
+ Function<GenericsType, ClassNode> resolver = gt -> {
+ if (gt.isWildcard()) {
+ if (gt.getLowerBound() != null) {
+ return gt.getLowerBound();
+ }
+ if (gt.getUpperBounds() != null) {
+ return gt.getUpperBounds()[0];
+ }
+ }
+ return gt.getType();
+ };
+
return genericsPlaceholderAndTypeMap.entrySet().stream()
- .filter(entry -> entry.getKey().getName().equals(placeholderName))
- .map(entry -> entry.getValue().getType()).findFirst().orElse(null);
+ .filter(e -> e.getKey().getName().equals(placeholderName))
+ .map(Map.Entry::getValue).map(resolver).findFirst().orElse(null);
}
private static class ParameterizedTypeCacheKey {
diff --git a/src/test/groovy/transform/stc/LambdaTest.groovy b/src/test/groovy/transform/stc/LambdaTest.groovy
index 4b2960b..0f33f84 100644
--- a/src/test/groovy/transform/stc/LambdaTest.groovy
+++ b/src/test/groovy/transform/stc/LambdaTest.groovy
@@ -741,6 +741,21 @@ final class LambdaTest {
'''
}
+ @Test // GROOVY-9347
+ void testConsumer7() {
+ assertScript '''
+ @groovy.transform.CompileStatic
+ void test() {
+ int sum = 0
+ java.util.function.Consumer<? super Integer> add = i -> sum += i
+
+ [1, 2, 3].forEach(add)
+ assert sum == 6
+ }
+ test()
+ '''
+ }
+
@Test
void testFunctionalInterface1() {
assertScript '''
@@ -1066,7 +1081,7 @@ final class LambdaTest {
'''
}
- @Test @NotYetImplemented // GROOVY-9342
+ @Test @NotYetImplemented // GROOVY-9347
void testStaticInitializeBlocks2() {
assertScript '''
@groovy.transform.CompileStatic
[groovy] 01/02: GROOVY-9340: return type, not type redirect
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit ba93a5585a6396d2d716a388dc9346f03f5974f1
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Dec 19 10:41:46 2019 -0600
GROOVY-9340: return type, not type redirect
---
.../codehaus/groovy/ast/tools/GenericsUtils.java | 21 ++++++++-------------
src/test/groovy/transform/stc/LambdaTest.groovy | 2 +-
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
index 4e65cb1..3ce6be7 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -971,22 +971,15 @@ public class GenericsUtils {
}
/**
- * Get the actual type according to the placeholder name
+ * Gets the actual type according to the placeholder name.
*
- * @param placeholderName the placeholder name, e.g. T, E
+ * @param placeholderName the placeholder name (i.e. "T", "E", etc.)
* @param genericsPlaceholderAndTypeMap the result of {@link #makeDeclaringAndActualGenericsTypeMap(ClassNode, ClassNode)}
- * @return the actual type
*/
- public static ClassNode findActualTypeByGenericsPlaceholderName(String placeholderName, Map<GenericsType, GenericsType> genericsPlaceholderAndTypeMap) {
- for (Map.Entry<GenericsType, GenericsType> entry : genericsPlaceholderAndTypeMap.entrySet()) {
- GenericsType declaringGenericsType = entry.getKey();
-
- if (placeholderName.equals(declaringGenericsType.getName())) {
- return entry.getValue().getType().redirect();
- }
- }
-
- return null;
+ public static ClassNode findActualTypeByGenericsPlaceholderName(final String placeholderName, final Map<GenericsType, GenericsType> genericsPlaceholderAndTypeMap) {
+ return genericsPlaceholderAndTypeMap.entrySet().stream()
+ .filter(entry -> entry.getKey().getName().equals(placeholderName))
+ .map(entry -> entry.getValue().getType()).findFirst().orElse(null);
}
private static class ParameterizedTypeCacheKey {
@@ -1002,6 +995,7 @@ public class GenericsUtils {
return genericsClass;
}
+ @SuppressWarnings("unused")
public void setGenericsClass(ClassNode genericsClass) {
this.genericsClass = genericsClass;
}
@@ -1010,6 +1004,7 @@ public class GenericsUtils {
return actualType;
}
+ @SuppressWarnings("unused")
public void setActualType(ClassNode actualType) {
this.actualType = actualType;
}
diff --git a/src/test/groovy/transform/stc/LambdaTest.groovy b/src/test/groovy/transform/stc/LambdaTest.groovy
index d7b9553..4b2960b 100644
--- a/src/test/groovy/transform/stc/LambdaTest.groovy
+++ b/src/test/groovy/transform/stc/LambdaTest.groovy
@@ -178,7 +178,7 @@ final class LambdaTest {
'''
}
- @Test @NotYetImplemented // GROOVY-9340
+ @Test // GROOVY-9340
void testConsumerWithSelfType() {
assertScript '''
@groovy.transform.CompileStatic