You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2021/01/11 15:59:30 UTC
[sling-slingfeature-maven-plugin] branch master updated: Provide
better error reporting for package-list url
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 7b8e594 Provide better error reporting for package-list url
7b8e594 is described below
commit 7b8e5941d3e8831a857baf51b18cdf29a3a1952c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jan 11 16:58:55 2021 +0100
Provide better error reporting for package-list url
---
.../apache/sling/feature/maven/mojos/apis/ApisUtil.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisUtil.java b/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisUtil.java
index 1616818..cb3012e 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisUtil.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisUtil.java
@@ -134,18 +134,18 @@ public class ApisUtil {
return null;
}
- public static void getPackageList(final String javadocUrl, final Set<String> linkedPackages,
+ public static void getPackageList(String javadocUrl, final Set<String> linkedPackages,
final Map<String, Set<String>> linkedPackagesMap) throws MojoExecutionException {
+ if ( javadocUrl.endsWith("/") ) {
+ javadocUrl = javadocUrl.substring(0, javadocUrl.length() - 1);
+ }
Set<String> result = linkedPackagesMap.get(javadocUrl);
if ( result == null ) {
result = new HashSet<>();
linkedPackagesMap.put(javadocUrl, result);
+ final String urlString = javadocUrl.concat("/package-list");
try {
- String prefix = javadocUrl;
- if ( prefix.endsWith("/") ) {
- prefix = prefix.substring(0, prefix.length() - 1);
- }
- final URL url = new URL(prefix.concat("/package-list"));
+ final URL url = new URL(urlString);
try (final LineNumberReader reader = new LineNumberReader(new InputStreamReader(url.openConnection().getInputStream(), StandardCharsets.UTF_8))) {
String line = null;
while ( (line = reader.readLine()) != null ) {
@@ -153,7 +153,7 @@ public class ApisUtil {
}
}
} catch (final IOException e) {
- throw new MojoExecutionException("Unable to find/read package-list at ".concat(javadocUrl), e);
+ throw new MojoExecutionException("Unable to find/read package-list at ".concat(urlString), e);
}
}
result.stream().forEach(v -> linkedPackages.add(v));