This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
new 373e2db94c GROOVY-10583: do not print generics of type parameter
373e2db94c is described below
commit 373e2db94c70fdf62220b114b7bcd605713f5975
Author: Eric Milles <[email protected]>
AuthorDate: Sat Apr 16 11:16:11 2022 -0500
GROOVY-10583: do not print generics of type parameter
---
.../java/org/codehaus/groovy/ast/GenericsType.java | 6 +--
.../groovy/tools/stubgenerator/Groovy10583.groovy | 48 ++++++++++++++++++++++
2 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/GenericsType.java
b/src/main/java/org/codehaus/groovy/ast/GenericsType.java
index cd5414ad11..0f5e6e0942 100644
--- a/src/main/java/org/codehaus/groovy/ast/GenericsType.java
+++ b/src/main/java/org/codehaus/groovy/ast/GenericsType.java
@@ -98,12 +98,12 @@ public class GenericsType extends ASTNode {
StringBuilder ret = appendName(theType, new StringBuilder());
GenericsType[] genericsTypes = theType.getGenericsTypes();
- if (genericsTypes == null || genericsTypes.length == 0) {
+ if (genericsTypes == null || genericsTypes.length == 0 ||
theType.isGenericsPlaceHolder()) { // GROOVY-10583
return ret.toString();
}
- // TODO: instead of catching Object<T> here stop it from being placed
into type in first place
- if (genericsTypes.length == 1 && genericsTypes[0].isPlaceholder() &&
theType.getName().equals("java.lang.Object")) {
+ // TODO: instead of catching Object<T> here, stop it from being placed
into type in the first place
+ if (genericsTypes.length == 1 && genericsTypes[0].isPlaceholder() &&
ret.toString().equals(ClassHelper.OBJECT)) {
return genericsTypes[0].getName();
}
diff --git
a/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy10583.groovy
b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy10583.groovy
new file mode 100644
index 0000000000..f701a724d6
--- /dev/null
+++ b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy10583.groovy
@@ -0,0 +1,48 @@
+/*
+ * 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 org.codehaus.groovy.tools.stubgenerator
+
+final class Groovy10583 extends StringSourcesStubTestCase {
+
+ @Override
+ Map<String, String> provideSources() {
+ [
+ 'C.groovy': '''
+ class C {
+ def <S extends CharSequence, N extends Number> List<N>
+ m(Collection<? extends S> input, Class<N> outputType =
Integer) {
+ }
+ }
+ ''',
+ 'Main.java': '''
+ public class Main {
+ public static void main(String[] args) {
+ new C();
+ }
+ }
+ ''',
+ ]
+ }
+
+ @Override
+ void verifyStubs() {
+ String stub = stubJavaSourceFor('C')
+ assert stub.contains('Collection<? extends S> input') // not S<S
extends java.lang.CharSequence>>
+ }
+}
