Author: fanningpj
Date: Wed Jun 1 16:31:14 2022
New Revision: 1901527
URL: http://svn.apache.org/viewvc?rev=1901527&view=rev
Log:
[XMLBEANS-609] Parameterised return types not handled correctly in interface
extensions
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java?rev=1901527&r1=1901526&r2=1901527&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
Wed Jun 1 16:31:14 2022
@@ -31,6 +31,7 @@ import org.apache.xmlbeans.impl.xb.xmlco
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
public class InterfaceExtensionImpl implements InterfaceExtension {
@@ -314,7 +315,9 @@ public class InterfaceExtensionImpl impl
_signature = null;
_name = method.getName().asString();
- _return = replaceInner(method.getType().resolve().describe());
+ String typeParams =
method.getTypeParameters().stream().map(TypeParameter::toString).collect(Collectors.joining(",
"));
+ _return = ( typeParams.length() == 0 ? "" : ( " <" + typeParams +
"> ") ) +
+ replaceInner(method.getType().resolve().describe());
_params = method.getParameters().stream().map(p ->
p.getType().resolve().describe())
.map(MethodSignatureImpl::replaceInner).toArray(String[]::new);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
