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/06/01 15:33:29 UTC
svn commit: r1901524 - in /xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config: ChildSolverCollectionStrategy.java InterfaceExtensionImpl.java
Author: fanningpj
Date: Wed Jun 1 15:33:29 2022
New Revision: 1901524
URL: http://svn.apache.org/viewvc?rev=1901524&view=rev
Log:
[XMLBEANS-567] resolve exception class names
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/ChildSolverCollectionStrategy.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/ChildSolverCollectionStrategy.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/ChildSolverCollectionStrategy.java?rev=1901524&r1=1901523&r2=1901524&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/ChildSolverCollectionStrategy.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/ChildSolverCollectionStrategy.java Wed Jun 1 15:33:29 2022
@@ -105,7 +105,7 @@ class ChildSolverCollectionStrategy impl
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
if (javaMatcher.matches(file)) {
- if (roots.stream().map(Path::toAbsolutePath).noneMatch(file.toAbsolutePath()::startsWith)) {
+ if (roots.stream().map(Path::toAbsolutePath).noneMatch(file.toAbsolutePath()::startsWith)) {Sc
getRoot(file).ifPresent(r -> {
getSolver().add(new JavaParserTypeSolver(r, getParserConfiguration()));
roots.add(r);
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=1901524&r1=1901523&r2=1901524&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 15:33:29 2022
@@ -316,11 +316,11 @@ public class InterfaceExtensionImpl impl
_name = method.getName().asString();
_return = replaceInner(method.getType().resolve().describe());
- _params = method.getParameters().stream().map(p -> p.getType().resolve().describe()).
- map(MethodSignatureImpl::replaceInner).toArray(String[]::new);
+ _params = method.getParameters().stream().map(p -> p.getType().resolve().describe())
+ .map(MethodSignatureImpl::replaceInner).toArray(String[]::new);
- _exceptions = method.getThrownExceptions().stream().map(ReferenceType::asString).
- map(MethodSignatureImpl::replaceInner).toArray(String[]::new);
+ _exceptions = method.getThrownExceptions().stream().map(e -> e.resolve().describe())
+ .map(MethodSignatureImpl::replaceInner).toArray(String[]::new);
_paramNames = method.getParameters().stream().map(p -> p.getNameAsString()).toArray(String[]::new);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org