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 2018/04/05 18:25:01 UTC
[1/3] groovy git commit: Refine "GROOVY-8531: Fail to resolve type
defined in super class written in Java"
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 877fa823a -> 85ef68ec7
Refine "GROOVY-8531: Fail to resolve type defined in super class written in Java"
Check visibility of inner type
(cherry picked from commit 4181626)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/85ef68ec
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/85ef68ec
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/85ef68ec
Branch: refs/heads/GROOVY_2_4_X
Commit: 85ef68ec75deed599922305d4fb6fe538c58a234
Parents: 9c2a788
Author: danielsun1106 <re...@hotmail.com>
Authored: Fri Apr 6 01:38:33 2018 +0800
Committer: danielsun1106 <re...@hotmail.com>
Committed: Fri Apr 6 02:24:56 2018 +0800
----------------------------------------------------------------------
.../codehaus/groovy/control/ResolveVisitor.java | 17 ++++++++++++++++-
.../groovy/bugs/groovy8531/Groovy8531Bug.groovy | 16 ++++++++++++++--
src/test/groovy/bugs/groovy8531/Reducer.java | 4 +++-
3 files changed, 33 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/85ef68ec/src/main/org/codehaus/groovy/control/ResolveVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/org/codehaus/groovy/control/ResolveVisitor.java
index deb38d1..1114684 100644
--- a/src/main/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/org/codehaus/groovy/control/ResolveVisitor.java
@@ -274,7 +274,6 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
if (resolve(type)) return true;
}
- // GROOVY-8531: Fail to resolve type defined in super class written in Java
if (resolveToNestedOfCurrentClassAndSuperClasses(type)) return true;
type.setName(saved);
@@ -282,6 +281,7 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
}
private boolean resolveToNestedOfCurrentClassAndSuperClasses(ClassNode type) {
+ // GROOVY-8531: Fail to resolve type defined in super class written in Java
for (ClassNode enclosingClassNode = currentClass; ClassHelper.OBJECT_TYPE != enclosingClassNode; enclosingClassNode = enclosingClassNode.getSuperClass()) {
if(resolveToNested(enclosingClassNode, type)) return true;
}
@@ -297,6 +297,8 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
if (enclosingType != type && !name.contains(".") && type.getClass().equals(ClassNode.class)) {
ClassNode tmp = new ConstructedNestedClass(enclosingType,name);
if (resolve(tmp)) {
+ if (!checkInnerTypeVisibility(enclosingType, tmp)) return false;
+
type.setRedirect(tmp);
return true;
}
@@ -305,6 +307,19 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
}
+ private boolean checkInnerTypeVisibility(ClassNode enclosingType, ClassNode innerClassNode) {
+ if (currentClass == enclosingType) {
+ return true;
+ }
+
+ int modifiers = innerClassNode.getModifiers();
+ if (Modifier.isPublic(modifiers) || Modifier.isProtected(modifiers)) {
+ return true;
+ }
+
+ return false;
+ }
+
private void resolveOrFail(ClassNode type, String msg, ASTNode node) {
if (resolve(type)) return;
if (resolveToInner(type)) return;
http://git-wip-us.apache.org/repos/asf/groovy/blob/85ef68ec/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy b/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
index b7ee0d2..72dd08b 100644
--- a/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
+++ b/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
@@ -19,18 +19,30 @@
package groovy.bugs.groovy8531
class Groovy8531Bug extends GroovyTestCase {
- void test() {
+ void testPublicAndProtectedInnerType() {
assertScript '''
package groovy.bugs.groovy8531
class Example extends Reducer {
- public void reduce(Context context) {}
+ public void reduce(PublicContext context) {}
+ public void reduce2(ProtectedContext context) {}
public boolean isDynamic(Type type) {
return Type.DYNAMIC == type
}
}
new Example().reduce(null)
+ new Example().reduce2(null)
assert new Example().isDynamic(Reducer.Type.DYNAMIC)
'''
}
+
+ void testPrivateInnerType() {
+ def errMsg = shouldFail '''
+ package groovy.bugs.groovy8531
+ class Example extends Reducer {
+ public void reduce3(PrivateContext context) {}
+ }
+ '''
+ assert errMsg.contains('unable to resolve class')
+ }
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/85ef68ec/src/test/groovy/bugs/groovy8531/Reducer.java
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/groovy8531/Reducer.java b/src/test/groovy/bugs/groovy8531/Reducer.java
index c9b78bf..95b5b24 100644
--- a/src/test/groovy/bugs/groovy8531/Reducer.java
+++ b/src/test/groovy/bugs/groovy8531/Reducer.java
@@ -19,7 +19,9 @@
package groovy.bugs.groovy8531;
public class Reducer {
- public abstract class Context {}
+ public abstract class PublicContext {}
+ protected abstract class ProtectedContext {}
+ private abstract class PrivateContext {}
public enum Type {
DYNAMIC, STATIC
[2/3] groovy git commit: Refine "GROOVY-8531: Fail to resolve type
defined in super class written in Java"
Posted by su...@apache.org.
Refine "GROOVY-8531: Fail to resolve type defined in super class written in Java"
(cherry picked from commit fdaef20)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9c2a788c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9c2a788c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9c2a788c
Branch: refs/heads/GROOVY_2_4_X
Commit: 9c2a788c641656d1294e096519a0f1f900cffa75
Parents: 67bdf0a
Author: danielsun1106 <re...@hotmail.com>
Authored: Fri Apr 6 00:51:29 2018 +0800
Committer: danielsun1106 <re...@hotmail.com>
Committed: Fri Apr 6 02:24:56 2018 +0800
----------------------------------------------------------------------
.../org/codehaus/groovy/control/ResolveVisitor.java | 16 ++++++++++------
.../groovy/bugs/groovy8531/Groovy8531Bug.groovy | 4 ++++
src/test/groovy/bugs/groovy8531/Reducer.java | 4 ++++
3 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/9c2a788c/src/main/org/codehaus/groovy/control/ResolveVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/org/codehaus/groovy/control/ResolveVisitor.java
index 891e138..deb38d1 100644
--- a/src/main/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/org/codehaus/groovy/control/ResolveVisitor.java
@@ -275,16 +275,18 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
}
// GROOVY-8531: Fail to resolve type defined in super class written in Java
- for (ClassNode enclosingClassNode = currentClass; ClassHelper.OBJECT_TYPE != enclosingClassNode; enclosingClassNode = enclosingClassNode.getSuperClass()) {
- if(resolveToNested(enclosingClassNode, type)) return true;
- }
+ if (resolveToNestedOfCurrentClassAndSuperClasses(type)) return true;
type.setName(saved);
return false;
}
- private boolean resolveToNestedOfCurrent(ClassNode type) {
- return resolveToNested(currentClass, type);
+ private boolean resolveToNestedOfCurrentClassAndSuperClasses(ClassNode type) {
+ for (ClassNode enclosingClassNode = currentClass; ClassHelper.OBJECT_TYPE != enclosingClassNode; enclosingClassNode = enclosingClassNode.getSuperClass()) {
+ if(resolveToNested(enclosingClassNode, type)) return true;
+ }
+
+ return false;
}
private boolean resolveToNested(ClassNode enclosingType, ClassNode type) {
@@ -988,7 +990,9 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
t = new LowerCaseClass(name);
}
isClass = resolve(t);
- if(!isClass) isClass = resolveToNestedOfCurrent(t);
+ if(!isClass) {
+ isClass = resolveToNestedOfCurrentClassAndSuperClasses(t);
+ }
}
if (isClass) {
// the name is a type so remove it from the scoping
http://git-wip-us.apache.org/repos/asf/groovy/blob/9c2a788c/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy b/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
index a8a21bc..b7ee0d2 100644
--- a/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
+++ b/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
@@ -24,9 +24,13 @@ class Groovy8531Bug extends GroovyTestCase {
package groovy.bugs.groovy8531
class Example extends Reducer {
public void reduce(Context context) {}
+ public boolean isDynamic(Type type) {
+ return Type.DYNAMIC == type
+ }
}
new Example().reduce(null)
+ assert new Example().isDynamic(Reducer.Type.DYNAMIC)
'''
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/9c2a788c/src/test/groovy/bugs/groovy8531/Reducer.java
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/groovy8531/Reducer.java b/src/test/groovy/bugs/groovy8531/Reducer.java
index 7fde131..c9b78bf 100644
--- a/src/test/groovy/bugs/groovy8531/Reducer.java
+++ b/src/test/groovy/bugs/groovy8531/Reducer.java
@@ -20,4 +20,8 @@ package groovy.bugs.groovy8531;
public class Reducer {
public abstract class Context {}
+
+ public enum Type {
+ DYNAMIC, STATIC
+ }
}
[3/3] groovy git commit: GROOVY-8531: Fail to resolve type defined in
super class written in Java
Posted by su...@apache.org.
GROOVY-8531: Fail to resolve type defined in super class written in Java
(cherry picked from commit 1032854)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/67bdf0a7
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/67bdf0a7
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/67bdf0a7
Branch: refs/heads/GROOVY_2_4_X
Commit: 67bdf0a7acc4a7aa8d6c9cdccb621e090a4da220
Parents: 877fa82
Author: danielsun1106 <re...@hotmail.com>
Authored: Fri Apr 6 00:00:50 2018 +0800
Committer: danielsun1106 <re...@hotmail.com>
Committed: Fri Apr 6 02:24:56 2018 +0800
----------------------------------------------------------------------
.../codehaus/groovy/control/ResolveVisitor.java | 17 ++++++++---
.../groovy/bugs/groovy8531/Groovy8531Bug.groovy | 32 ++++++++++++++++++++
src/test/groovy/bugs/groovy8531/Reducer.java | 23 ++++++++++++++
3 files changed, 68 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/67bdf0a7/src/main/org/codehaus/groovy/control/ResolveVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/org/codehaus/groovy/control/ResolveVisitor.java
index 300416b..891e138 100644
--- a/src/main/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/org/codehaus/groovy/control/ResolveVisitor.java
@@ -273,25 +273,34 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
type.setName(name);
if (resolve(type)) return true;
}
- if(resolveToNestedOfCurrent(type)) return true;
-
+
+ // GROOVY-8531: Fail to resolve type defined in super class written in Java
+ for (ClassNode enclosingClassNode = currentClass; ClassHelper.OBJECT_TYPE != enclosingClassNode; enclosingClassNode = enclosingClassNode.getSuperClass()) {
+ if(resolveToNested(enclosingClassNode, type)) return true;
+ }
+
type.setName(saved);
return false;
}
private boolean resolveToNestedOfCurrent(ClassNode type) {
+ return resolveToNested(currentClass, type);
+ }
+
+ private boolean resolveToNested(ClassNode enclosingType, ClassNode type) {
if (type instanceof ConstructedNestedClass) return false;
// GROOVY-3110: It may be an inner enum defined by this class itself, in which case it does not need to be
// explicitly qualified by the currentClass name
String name = type.getName();
- if (currentClass != type && !name.contains(".") && type.getClass().equals(ClassNode.class)) {
- ClassNode tmp = new ConstructedNestedClass(currentClass,name);
+ if (enclosingType != type && !name.contains(".") && type.getClass().equals(ClassNode.class)) {
+ ClassNode tmp = new ConstructedNestedClass(enclosingType,name);
if (resolve(tmp)) {
type.setRedirect(tmp);
return true;
}
}
return false;
+
}
private void resolveOrFail(ClassNode type, String msg, ASTNode node) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/67bdf0a7/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy b/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
new file mode 100644
index 0000000..a8a21bc
--- /dev/null
+++ b/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package groovy.bugs.groovy8531
+
+class Groovy8531Bug extends GroovyTestCase {
+ void test() {
+ assertScript '''
+ package groovy.bugs.groovy8531
+ class Example extends Reducer {
+ public void reduce(Context context) {}
+ }
+
+ new Example().reduce(null)
+ '''
+ }
+}
http://git-wip-us.apache.org/repos/asf/groovy/blob/67bdf0a7/src/test/groovy/bugs/groovy8531/Reducer.java
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/groovy8531/Reducer.java b/src/test/groovy/bugs/groovy8531/Reducer.java
new file mode 100644
index 0000000..7fde131
--- /dev/null
+++ b/src/test/groovy/bugs/groovy8531/Reducer.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package groovy.bugs.groovy8531;
+
+public class Reducer {
+ public abstract class Context {}
+}