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/09/20 00:46:24 UTC
[groovy] branch GROOVY_3_0_X updated (71391db -> 4e62282)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 71391db GROOVY-8284: getMetaClass should be annotated as (JavaBeans) transient (closes #1365)
new 2ef5c6a GROOVY-8103: add test case
new 4e62282 GROOVY-8961, GROOVY-9734: use type(s) from call site to resolve generics (closes #1371)
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:
.../transform/stc/StaticTypeCheckingVisitor.java | 51 +++++++++-
.../groovy/transform/stc/GenericsSTCTest.groovy | 107 ++++++++++++++++++++-
2 files changed, 152 insertions(+), 6 deletions(-)
[groovy] 01/02: GROOVY-8103: add test case
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 2ef5c6a7b7448cc0864a622cfddd06c33d329679
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Sep 17 17:36:32 2020 -0500
GROOVY-8103: add test case
---
.../transform/stc/StaticTypeCheckingVisitor.java | 2 +-
.../groovy/transform/stc/GenericsSTCTest.groovy | 37 +++++++++++++++++++++-
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index f977ce1..59d0404 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3434,7 +3434,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
returnType = typeCheckingContext.getEnclosingClassNode();
}
}
- if (typeCheckMethodsWithGenericsOrFail(chosenReceiver.getType(), args, mn.get(0), call)) {
+ if (typeCheckMethodsWithGenericsOrFail(chosenReceiver.getType(), args, directMethodCallCandidate, call)) {
returnType = adjustWithTraits(directMethodCallCandidate, chosenReceiver.getType(), args, returnType);
storeType(call, returnType);
diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index e30ebb1..18f2e44 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -1163,7 +1163,7 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
}
// GROOVY-5724
- void testJunitHamcrest() {
+ void testJUnitHamcrest() {
assertScript '''
public class Matcher<T> {}
public <T> void assertThat(T obj, Matcher<T> matcher) {}
@@ -1174,6 +1174,41 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
'''
}
+ // GROOVY-8103
+ void testJUnitFestAssert() {
+ assertScript '''
+ import static Fluent.*
+ import Util.Ours
+
+ class Fluent {
+ static FluentAPI fluent(String s) { return new FluentAPI() }
+ static <T extends FluentExtension> T fluent(T t) { return t }
+ }
+
+ class FluentAPI {
+ FluentAPI isEqualTo(String s) { return this }
+ }
+
+ interface FluentExtension {
+ }
+
+ class Util {
+ static class Ours implements FluentExtension {
+ Ours isSimilarTo(String json) { return this }
+ }
+ static Ours factory(String json) { new Ours() }
+ }
+
+ void test() {
+ fluent('string').isEqualTo('x') // fine
+ fluent(new Ours()).isSimilarTo('') // fine
+ fluent(Util.factory('{}')).isSimilarTo('{"key":"val"}') // STC error
+ }
+
+ test()
+ '''
+ }
+
// GROOVY-5836
void testShouldFindMethodEvenIfUsingGenerics() {
assertScript '''
[groovy] 02/02: GROOVY-8961,
GROOVY-9734: use type(s) from call site to resolve generics (closes
#1371)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 4e622826db0eeffa4e87252a2e883fcea3bff94d
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Wed Sep 16 16:31:45 2020 -0500
GROOVY-8961, GROOVY-9734: use type(s) from call site to resolve generics (closes #1371)
"m(Collections.emptyList())" does not supply type arguments to emptyList
---
.../transform/stc/StaticTypeCheckingVisitor.java | 49 +++++++++++++++
.../groovy/transform/stc/GenericsSTCTest.groovy | 70 ++++++++++++++++++++--
2 files changed, 115 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 59d0404..6109f8f 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3434,6 +3434,8 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
returnType = typeCheckingContext.getEnclosingClassNode();
}
}
+ // GROOVY-8961, GROOVY-9734
+ resolvePlaceholdersFromImplicitTypeHints(args, argumentList, directMethodCallCandidate);
if (typeCheckMethodsWithGenericsOrFail(chosenReceiver.getType(), args, directMethodCallCandidate, call)) {
returnType = adjustWithTraits(directMethodCallCandidate, chosenReceiver.getType(), args, returnType);
@@ -5155,6 +5157,53 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
}
}
+ /**
+ * Given method call like "m(Collections.emptyList())", the type of the call
+ * argument is {@code List<T>} without explicit type arguments. Knowning the
+ * method target of "m", {@code T} could be resolved.
+ */
+ private static void resolvePlaceholdersFromImplicitTypeHints(final ClassNode[] actuals, final ArgumentListExpression argumentList, final MethodNode inferredMethod) {
+ for (int i = 0, n = actuals.length; i < n; i += 1) {
+ // check for method call with known target
+ Expression a = argumentList.getExpression(i);
+ if (!(a instanceof MethodCallExpression)) continue;
+ if (((MethodCallExpression) a).isUsingGenerics()) continue;
+ MethodNode aNode = a.getNodeMetaData(DIRECT_METHOD_CALL_TARGET);
+ if (aNode == null || aNode.getGenericsTypes() == null) continue;
+
+ // and unknown generics
+ ClassNode at = actuals[i];
+ if (!GenericsUtils.hasUnresolvedGenerics(at)) continue;
+
+ int np = inferredMethod.getParameters().length;
+ Parameter p = inferredMethod.getParameters()[Math.min(i, np - 1)];
+
+ ClassNode pt = p.getOriginType();
+ if (i >= (np - 1) && pt.isArray() && !at.isArray()) pt = pt.getComponentType();
+
+ // try to resolve placeholder(s) in argument type using parameter type
+
+ Map<GenericsTypeName, GenericsType> linked = new HashMap<>();
+ Map<GenericsTypeName, GenericsType> source = GenericsUtils.extractPlaceholders(at);
+ Map<GenericsTypeName, GenericsType> target = GenericsUtils.extractPlaceholders(pt);
+
+ // connect E:T from source to E:Type from target
+ for (GenericsType placeholder : aNode.getGenericsTypes()) {
+ for (Map.Entry<GenericsTypeName, GenericsType> e : source.entrySet()) {
+ if (e.getValue() == placeholder) {
+ Optional.ofNullable(target.get(e.getKey()))
+ // skip "f(g())" for "f(T<String>)" and "<U extends Number> U g()"
+ .filter(gt -> isAssignableTo(gt.getType(), placeholder.getType()))
+ .ifPresent(gt -> linked.put(new GenericsTypeName(placeholder.getName()), gt));
+ break;
+ }
+ }
+ }
+
+ actuals[i] = applyGenericsContext(linked, at);
+ }
+ }
+
private static void extractGenericsConnectionsForSuperClassAndInterfaces(final Map<GenericsTypeName, GenericsType> resolvedPlaceholders, final Map<GenericsTypeName, GenericsType> connections) {
for (GenericsType value : new HashSet<GenericsType>(connections.values())) {
if (!value.isPlaceholder() && !value.isWildcard()) {
diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index 18f2e44..781439e 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -195,7 +195,6 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
'''
}
-
void testLinkedListWithListArgument() {
assertScript '''
List<String> list = new LinkedList<String>(['1','2','3'])
@@ -457,7 +456,6 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
}
void testShouldComplainAboutToInteger() {
-
String code = '''
class Test {
static test2() {
@@ -530,6 +528,70 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
''', 'Cannot call <X> groovy.transform.stc.GenericsSTCTest$ClassA <Long>#bar(java.lang.Class <Long>) with arguments [java.lang.Class <? extends java.lang.Object>]'
}
+ // GROOVY-8961
+ void testShouldUseMethodGenericType3() {
+ assertScript '''
+ void setM(List<String> strings) {
+ }
+ void test() {
+ m = Collections.emptyList() // Cannot assign value of type List<T> to variable of List<String>
+ }
+ test()
+ '''
+ assertScript '''
+ void setM(Collection<String> strings) {
+ }
+ void test() {
+ m = Collections.emptyList()
+ }
+ test()
+ '''
+ assertScript '''
+ void setM(Iterable<String> strings) {
+ }
+ void test() {
+ m = Collections.emptyList()
+ }
+ test()
+ '''
+
+ shouldFailWithMessages '''
+ void setM(List<String> strings) {
+ }
+ void test() {
+ m = Collections.<Integer>emptyList()
+ }
+ ''', '[Static type checking] - Cannot assign value of type java.util.List <Integer> to variable of type java.util.List <String>'
+ }
+
+ // GROOVY-9734
+ void testShouldUseMethodGenericType4() {
+ assertScript '''
+ void m(List<String> strings) {
+ }
+ void test() {
+ m(Collections.emptyList()) // Cannot call m(List<String>) with arguments [List<T>]
+ }
+ test()
+ '''
+ assertScript '''
+ void m(Collection<String> strings) {
+ }
+ void test() {
+ m(Collections.emptyList())
+ }
+ test()
+ '''
+ assertScript '''
+ void m(Iterable<String> strings) {
+ }
+ void test() {
+ m(Collections.emptyList())
+ }
+ test()
+ '''
+ }
+
// GROOVY-5516
void testAddAllWithCollectionShouldBeAllowed() {
assertScript '''import org.codehaus.groovy.transform.stc.ExtensionMethodNode
@@ -1459,7 +1521,7 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
def cl = {1}
assert foo(cl.class, cl) == cl
'''
- //GROOVY-5885
+ // GROOVY-5885
assertScript '''
class Test {
public <X extends Test> X castToMe(Class<X> type, Object o) {
@@ -1471,7 +1533,7 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
'''
}
- // Groovy-5839
+ // GROOVY-5839
void testMethodShadowGenerics() {
shouldFailWithMessages '''
public class GoodCodeRed<T> {