Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ public DependencyResolverResult collect(@Nonnull DependencyResolverRequest reque
session.getNode(result.getRoot(), request.getVerbose()),
0);
} catch (DependencyCollectionException e) {
throw new DependencyResolverException("Unable to collect dependencies", e);
String enhancedMessage = enhanceCollectionError(e, collectRequest);
throw new DependencyResolverException(enhancedMessage, e);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
throw new DependencyResolverException(enhancedMessage, e);
throw new DependencyResolverException(enhanceCollectionError(e, collectRequest), e);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fine as is

}
} finally {
RequestTraceHelper.exit(trace);
Expand Down Expand Up @@ -274,4 +275,59 @@ public DependencyResolverResult resolve(DependencyResolverRequest request)
private static DependencyResolverException cannotReadModuleInfo(final Path path, final IOException cause) {
return new DependencyResolverException("Cannot read module information of " + path, cause);
}

private static boolean containsUnresolvedExpression(String value) {
return value != null && value.contains("${") && value.contains("}");
}

private static String enhanceCollectionError(DependencyCollectionException e, CollectRequest request) {
if (e.getMessage() != null && e.getMessage().contains("Invalid Collect Request")) {
StringBuilder enhanced = new StringBuilder();
enhanced.append("Failed to collect dependencies");

org.eclipse.aether.graph.Dependency root = request.getRoot();
if (root != null && root.getArtifact() != null) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (root != null && root.getArtifact() != null) {
return if (root != null && root.getArtifact() != null) ? enhanceDependency() : enhanceDependencies(...);

could be extracted as dedicated branch/concern to provide cohesion over coupling.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ternary operators are harder to read

org.eclipse.aether.artifact.Artifact artifact = root.getArtifact();
String groupId = artifact.getGroupId();
String artifactId = artifact.getArtifactId();
String version = artifact.getVersion();

if (containsUnresolvedExpression(groupId) || containsUnresolvedExpression(artifactId)
|| containsUnresolvedExpression(version)) {
enhanced.append(" due to unresolved expression(s) in dependency: ")
.append(groupId)
.append(":")
.append(artifactId)
.append(":")
.append(version)
.append(".\n")
.append("Please check that all properties are defined in your POM or settings.xml.");
return enhanced.toString();
}
}

for (org.eclipse.aether.graph.Dependency dep : request.getDependencies()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be extracted as dedicated branch/concern to provide cohesion over coupling.

Suggested change
for (org.eclipse.aether.graph.Dependency dep : request.getDependencies()) {
return enhanceDependencies(...)

if (dep != null && dep.getArtifact() != null) {
org.eclipse.aether.artifact.Artifact artifact = dep.getArtifact();
String groupId = artifact.getGroupId();
String artifactId = artifact.getArtifactId();
String version = artifact.getVersion();

if (containsUnresolvedExpression(groupId) || containsUnresolvedExpression(artifactId)
|| containsUnresolvedExpression(version)) {
enhanced.append(" due to unresolved expression(s) in dependency: ")
.append(groupId)
.append(":")
.append(artifactId)
.append(":")
.append(version)
.append(".\n")
.append("Please check that all properties are defined in your POM or settings.xml.");
return enhanced.toString();
}
}
}
}
return e.getMessage();
}
}
Loading