Skip to content

Commit ecd577b

Browse files
authored
[MNG-8177] Add contextual info for model warnings (#1633)
As they really can come from anywhere. In case of this issue even from some eliminated POM that was read while collecting dirty tree, and was later eliminated. So confusing for users. --- https://issues.apache.org/jira/browse/MNG-8177
1 parent 42fc90e commit ecd577b

File tree

2 files changed

+100
-8
lines changed

2 files changed

+100
-8
lines changed

maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.apache.maven.model.building.ModelProblem;
4343
import org.apache.maven.model.building.ModelProblemUtils;
4444
import org.apache.maven.model.resolution.UnresolvableModelException;
45+
import org.codehaus.plexus.util.StringUtils;
4546
import org.eclipse.aether.RepositoryEvent;
4647
import org.eclipse.aether.RepositoryEvent.EventType;
4748
import org.eclipse.aether.RepositoryException;
@@ -195,6 +196,7 @@ public ArtifactDescriptorResult readArtifactDescriptor(
195196
return result;
196197
}
197198

199+
@SuppressWarnings("MethodLength")
198200
private Model loadPom(
199201
RepositorySystemSession session, ArtifactDescriptorRequest request, ArtifactDescriptorResult result)
200202
throws ArtifactDescriptorException {
@@ -293,16 +295,29 @@ private Model loadPom(
293295
// that may lead to unexpected build failure, log them
294296
if (!modelResult.getProblems().isEmpty()) {
295297
List<ModelProblem> problems = modelResult.getProblems();
296-
logger.warn(
297-
"{} {} encountered while building the effective model for {}",
298-
problems.size(),
299-
(problems.size() == 1) ? "problem was" : "problems were",
300-
request.getArtifact());
301298
if (logger.isDebugEnabled()) {
302-
for (ModelProblem problem : problems) {
303-
logger.warn(
304-
"{} @ {}", problem.getMessage(), ModelProblemUtils.formatLocation(problem, null));
299+
String problem = (problems.size() == 1) ? "problem" : "problems";
300+
String problemPredicate = problem + ((problems.size() == 1) ? " was" : " were");
301+
String message = String.format(
302+
"%s %s encountered while building the effective model for %s during %s\n",
303+
problems.size(),
304+
problemPredicate,
305+
request.getArtifact(),
306+
RequestTraceHelper.interpretTrace(true, request.getTrace()));
307+
message += StringUtils.capitalizeFirstLetter(problem);
308+
for (ModelProblem modelProblem : problems) {
309+
message += String.format(
310+
"\n* %s @ %s",
311+
modelProblem.getMessage(), ModelProblemUtils.formatLocation(modelProblem, null));
305312
}
313+
logger.warn(message);
314+
} else {
315+
logger.warn(
316+
"{} {} encountered while building the effective model for {} during {} (use -X to see details)",
317+
problems.size(),
318+
(problems.size() == 1) ? "problem was" : "problems were",
319+
request.getArtifact(),
320+
RequestTraceHelper.interpretTrace(false, request.getTrace()));
306321
}
307322
}
308323
model = modelResult.getEffectiveModel();
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.apache.maven.repository.internal;
20+
21+
import java.util.stream.Collectors;
22+
23+
import org.apache.maven.model.Plugin;
24+
import org.eclipse.aether.RequestTrace;
25+
import org.eclipse.aether.collection.CollectRequest;
26+
import org.eclipse.aether.collection.CollectStepData;
27+
import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
28+
import org.eclipse.aether.resolution.ArtifactRequest;
29+
import org.eclipse.aether.resolution.DependencyRequest;
30+
31+
/**
32+
* Helper class to manage {@link RequestTrace} for better error logging.
33+
*
34+
* @since 3.9.9
35+
*/
36+
public final class RequestTraceHelper {
37+
38+
/**
39+
* Method that creates some informational string based on passed in {@link RequestTrace}. The contents of request
40+
* trace can literally be anything, but this class tries to cover "most common" cases that are happening in Maven.
41+
*/
42+
public static String interpretTrace(boolean detailed, RequestTrace requestTrace) {
43+
while (requestTrace != null) {
44+
Object data = requestTrace.getData();
45+
if (data instanceof DependencyRequest) {
46+
DependencyRequest request = (DependencyRequest) data;
47+
return "dependency resolution for " + request;
48+
} else if (data instanceof CollectRequest) {
49+
CollectRequest request = (CollectRequest) data;
50+
return "dependency collection for " + request;
51+
} else if (data instanceof CollectStepData) {
52+
CollectStepData stepData = (CollectStepData) data;
53+
String msg = "dependency collection step for " + stepData.getContext();
54+
if (detailed) {
55+
msg += ". Path to offending node from root:\n";
56+
msg += stepData.getPath().stream()
57+
.map(n -> " -> " + n.toString())
58+
.collect(Collectors.joining("\n"));
59+
msg += "\n => " + stepData.getNode();
60+
}
61+
return msg;
62+
} else if (data instanceof ArtifactDescriptorRequest) {
63+
ArtifactDescriptorRequest request = (ArtifactDescriptorRequest) data;
64+
return "artifact descriptor request for " + request.getArtifact();
65+
} else if (data instanceof ArtifactRequest) {
66+
ArtifactRequest request = (ArtifactRequest) data;
67+
return "artifact request for " + request.getArtifact();
68+
} else if (data instanceof Plugin) {
69+
Plugin plugin = (Plugin) data;
70+
return "plugin request " + plugin.getId();
71+
}
72+
requestTrace = requestTrace.getParent();
73+
}
74+
75+
return "n/a";
76+
}
77+
}

0 commit comments

Comments
 (0)