Skip to content

Commit

Permalink
Fix quarkusio#10279 Dependency parity validator is missing dependenci…
Browse files Browse the repository at this point in the history 
…es with

different versions
  • Loading branch information
@ppalaga @gsmet
ppalaga authored and gsmet committed Jun 30, 2020
1 parent 9c8cffb commit 5b3da86
Showing 1 changed file with 52 additions and 29 deletions.
81 changes: 52 additions & 29 deletions ...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,13 @@ private void validateExtensionDeps() throws MojoExecutionException {

final AppArtifactCoords deploymentCoords = AppArtifactCoords.fromString(deployment);

final Node rootDeployment = new Node(null, deploymentCoords, 2);
final Node rootRuntime = rootDeployment.newChild(toCoords(project.getArtifact()), 1);
final String rootDeploymentGact = gact(deploymentCoords);
final Node rootDeployment = new Node(null, rootDeploymentGact, 2);
final Node rootRuntime = rootDeployment.newChild(gact(project.getArtifact()), 1);

final Map<AppArtifactCoords, Node> expectedExtensionDeps = new HashMap<>();
expectedExtensionDeps.put(deploymentCoords, rootDeployment);
expectedExtensionDeps.put(rootRuntime.coords, rootRuntime);
final Map<String, Node> expectedExtensionDeps = new HashMap<>();
expectedExtensionDeps.put(rootDeploymentGact, rootDeployment);
expectedExtensionDeps.put(rootRuntime.gact, rootRuntime);
// collect transitive extension deps
final DependencyResult resolvedDeps;

Expand Down Expand Up @@ -314,8 +315,9 @@ public boolean visitEnter(DependencyNode node) {
+ BootstrapConstants.PROP_DEPLOYMENT_ARTIFACT + " property in its "
+ BootstrapConstants.DESCRIPTOR_PATH);
}
currentNode = currentNode.newChild(AppArtifactCoords.fromString(deploymentStr), currentNodeId);
expectedExtensionDeps.put(currentNode.coords, currentNode);
currentNode = currentNode.newChild(gact(AppArtifactCoords.fromString(deploymentStr)),
currentNodeId);
expectedExtensionDeps.put(currentNode.gact, currentNode);
extDepsTotal.incrementAndGet();
}
} catch (IOException e) {
Expand Down Expand Up @@ -351,9 +353,7 @@ public boolean visitEnter(DependencyNode dep) {
if (artifact == null) {
return true;
}
final AppArtifactCoords coords = new AppArtifactCoords(artifact.getGroupId(), artifact.getArtifactId(),
artifact.getClassifier(), artifact.getExtension(), artifact.getVersion());
final Node node = expectedExtensionDeps.get(coords);
final Node node = expectedExtensionDeps.get(gact(artifact));
if (node != null && !node.included) {
node.included = true;
extDepsTotal.decrementAndGet();
Expand All @@ -372,12 +372,12 @@ public boolean visitLeave(DependencyNode node) {
log.error("Quarkus Extension Dependency Verification Error");
log.error("Deployment artifact " + deploymentCoords +
" was found to be missing dependencies on Quarkus extension artifacts marked with '-' below:");
final List<AppArtifactCoords> missing = rootDeployment.collectMissing(log);
final List<String> missing = rootDeployment.collectMissing(log);
final StringBuilder buf = new StringBuilder();
buf.append("Deployment artifact ");
buf.append(deploymentCoords);
buf.append(" is missing the following dependencies from its configuration: ");
final Iterator<AppArtifactCoords> i = missing.iterator();
final Iterator<String> i = missing.iterator();
buf.append(i.next());
while (i.hasNext()) {
buf.append(", ").append(i.next());
Expand Down Expand Up @@ -415,11 +415,6 @@ private boolean isAnalyzable(final File f) {
return f != null && f.getName().endsWith(".jar") && f.exists() && !f.isDirectory();
}

private AppArtifactCoords toCoords(Artifact a) {
return new AppArtifactCoords(a.getGroupId(), a.getArtifactId(), a.getClassifier(),
a.getArtifactHandler().getExtension(), a.getVersion());
}

private void transformLegacyToNew(final Path output, ObjectNode extObject, ObjectMapper mapper)
throws MojoExecutionException {
ObjectNode metadata = null;
Expand Down Expand Up @@ -461,8 +456,6 @@ private void transformLegacyToNew(final Path output, ObjectNode extObject, Objec

extObject.set("metadata", metadata);

// updateSourceFiles(output, extObject, mapper);

}

/**
Expand Down Expand Up @@ -491,44 +484,74 @@ private ObjectMapper getMapper(boolean yaml) {
}
}

static String gact(AppArtifactCoords artifact) {
StringBuilder buf = new StringBuilder();
buf.append(artifact.getGroupId()).append(':').append(artifact.getArtifactId()).append(':');
final String classifier = artifact.getClassifier();
if (classifier != null && !classifier.isEmpty()) {
buf.append(classifier);
}
return buf.append(':').append(artifact.getType()).append(':').toString();
}

static String gact(Artifact artifact) {
StringBuilder buf = new StringBuilder();
buf.append(artifact.getGroupId()).append(':').append(artifact.getArtifactId()).append(':');
final String classifier = artifact.getClassifier();
if (classifier != null && !classifier.isEmpty()) {
buf.append(classifier);
}
return buf.append(':').append(artifact.getType()).append(':').toString();
}

static String gact(org.eclipse.aether.artifact.Artifact artifact) {
StringBuilder buf = new StringBuilder();
buf.append(artifact.getGroupId()).append(':').append(artifact.getArtifactId()).append(':');
final String classifier = artifact.getClassifier();
if (classifier != null && !classifier.isEmpty()) {
buf.append(classifier);
}
return buf.append(':').append(artifact.getExtension()).append(':').toString();
}

private static class Node {
final Node parent;
final AppArtifactCoords coords;
final String gact;
final int id;
boolean included;
List<Node> children = new ArrayList<>(0);

Node(Node parent, AppArtifactCoords artifact, int id) {
Node(Node parent, String gact, int id) {
this.parent = parent;
this.coords = artifact;
this.gact = gact;
this.id = id;
}

Node newChild(AppArtifactCoords artifact, int id) {
final Node child = new Node(this, artifact, id);
Node newChild(String gact, int id) {
final Node child = new Node(this, gact, id);
children.add(child);
return child;
}

List<AppArtifactCoords> collectMissing(Log log) {
final List<AppArtifactCoords> missing = new ArrayList<>();
List<String> collectMissing(Log log) {
final List<String> missing = new ArrayList<>();
collectMissing(log, 0, missing);
return missing;
}

private void collectMissing(Log log, int depth, List<AppArtifactCoords> missing) {
private void collectMissing(Log log, int depth, List<String> missing) {
final StringBuilder buf = new StringBuilder();
if (included) {
buf.append('+');
} else {
buf.append('-');
missing.add(coords);
missing.add(gact);
}
buf.append(' ');
for (int i = 0; i < depth; ++i) {
buf.append(" ");
}
buf.append(coords);
buf.append(gact);
log.error(buf.toString());
for (Node child : children) {
child.collectMissing(log, depth + 1, missing);
Expand Down

0 comments on commit 5b3da86

Please sign in to comment.