You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/05/20 12:47:08 UTC
svn commit: r1901084 - in /xmlbeans/trunk/src/main: java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java java9/module-info.class java9/org/apache/xmlbeans/impl/tool/MavenPluginResolver.class
Author: fanningpj
Date: Fri May 20 12:47:08 2022
New Revision: 1901084
URL: http://svn.apache.org/viewvc?rev=1901084&view=rev
Log:
[XMLBEANS-567] modify reflection code in InterfaceExtensionImpl
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
xmlbeans/trunk/src/main/java9/module-info.class
xmlbeans/trunk/src/main/java9/org/apache/xmlbeans/impl/tool/MavenPluginResolver.class
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=1901084&r1=1901083&r2=1901084&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 Fri May 20 12:47:08 2022
@@ -23,7 +23,6 @@ import com.github.javaparser.ast.type.Re
import com.github.javaparser.ast.type.Type;
import com.github.javaparser.ast.type.TypeParameter;
import com.github.javaparser.resolution.MethodUsage;
-import com.github.javaparser.resolution.declarations.ResolvedTypeParameterDeclaration;
import com.github.javaparser.resolution.types.ResolvedType;
import org.apache.xmlbeans.InterfaceExtension;
import org.apache.xmlbeans.XmlObject;
@@ -207,15 +206,10 @@ public class InterfaceExtensionImpl impl
.findFirst().orElse(null);
}
-
- private static String[] paramStrings(List<ResolvedTypeParameterDeclaration> params) {
- return params.stream().map(ResolvedTypeParameterDeclaration::getClassName).toArray(String[]::new);
- }
-
private static String[] paramStrings(NodeList<?> params) {
return params.stream().map(p -> {
if (p instanceof Parameter) {
- return ((Parameter)p).getTypeAsString();
+ return ((Parameter)p).getType().resolve().describe();
} else if (p instanceof TypeParameter) {
return ((TypeParameter)p).getNameAsString();
} else {
@@ -224,10 +218,6 @@ public class InterfaceExtensionImpl impl
}).toArray(String[]::new);
}
- private static String[] exceptionStrings(MethodDeclaration method) {
- return method.getThrownExceptions().stream().map(ReferenceType::asString).toArray(String[]::new);
- }
-
private static boolean matchParams(MethodUsage mIf, MethodDeclaration mDel) {
// the delegate needs to have the XmlObject as first parameter
List<ResolvedType> pIf = mIf.getParamTypes();
@@ -324,7 +314,7 @@ public class InterfaceExtensionImpl impl
_signature = null;
_name = method.getName().asString();
- _return = replaceInner(method.getTypeAsString());
+ _return = replaceInner(method.getType().resolve().describe());
_params = method.getParameters().stream().map(p -> p.getType().resolve().describe()).
map(MethodSignatureImpl::replaceInner).toArray(String[]::new);
Modified: xmlbeans/trunk/src/main/java9/module-info.class
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java9/module-info.class?rev=1901084&r1=1901083&r2=1901084&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlbeans/trunk/src/main/java9/org/apache/xmlbeans/impl/tool/MavenPluginResolver.class
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java9/org/apache/xmlbeans/impl/tool/MavenPluginResolver.class?rev=1901084&r1=1901083&r2=1901084&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org