Skip to content

Commit

Permalink
Use Version and Severity directly (#1756)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gnodet
gnodet authored Oct 1, 2024
1 parent 0cff3ea commit 3fdc54c
Showing 1 changed file with 27 additions and 44 deletions.
71 changes: 27 additions & 44 deletions maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
import org.apache.maven.api.services.ModelBuilderRequest;
import org.apache.maven.api.services.ModelBuilderResult;
import org.apache.maven.api.services.ModelProblem;
import org.apache.maven.api.services.ModelProblem.Version;
import org.apache.maven.api.services.ModelProblemCollector;
import org.apache.maven.api.services.ModelSource;
import org.apache.maven.api.services.RepositoryFactory;
Expand Down Expand Up @@ -387,12 +388,7 @@ private boolean addEdge(Path from, Path p) {
dag.addEdge(from.toString(), p.toString());
return false;
} catch (Graph.CycleDetectedException e) {
add(
Severity.FATAL,
ModelProblem.Version.BASE,
"Cycle detected between models at " + from + " and " + p,
null,
e);
add(Severity.FATAL, Version.BASE, "Cycle detected between models at " + from + " and " + p, null, e);
return true;
}
}
Expand Down Expand Up @@ -422,13 +418,12 @@ public void putSource(String groupId, String artifactId, ModelSource source) {
}

public boolean hasFatalErrors() {
return result.getProblems().stream().anyMatch(p -> p.getSeverity() == ModelProblem.Severity.FATAL);
return result.getProblems().stream().anyMatch(p -> p.getSeverity() == Severity.FATAL);
}

public boolean hasErrors() {
return result.getProblems().stream()
.anyMatch(p -> p.getSeverity() == ModelProblem.Severity.FATAL
|| p.getSeverity() == ModelProblem.Severity.ERROR);
.anyMatch(p -> p.getSeverity() == Severity.FATAL || p.getSeverity() == Severity.ERROR);
}

@Override
Expand Down Expand Up @@ -782,7 +777,7 @@ private void loadFilePom(
ModelProblem problem = new DefaultModelProblem(
"Child subproject " + subproject + " of " + pomDirectory + " does not exist",
Severity.ERROR,
ModelProblem.Version.BASE,
Version.BASE,
model,
-1,
-1,
Expand All @@ -804,7 +799,7 @@ private void loadFilePom(
"Child subproject " + subprojectFile + " of " + pom + " forms aggregation cycle "
+ buffer,
Severity.ERROR,
ModelProblem.Version.BASE,
Version.BASE,
model,
-1,
-1,
Expand All @@ -823,7 +818,7 @@ private void loadFilePom(
}
} catch (ModelBuilderException e) {
// gathered with problem collector
add(Severity.ERROR, ModelProblem.Version.V40, "Failed to load project " + pom, e);
add(Severity.ERROR, Version.V40, "Failed to load project " + pom, e);
}
if (r != result) {
r.getProblems().forEach(result::addProblem);
Expand Down Expand Up @@ -903,7 +898,7 @@ Model readParent(Model childModel) throws ModelBuilderException {
if (!"pom".equals(parentModel.getPackaging())) {
add(
Severity.ERROR,
ModelProblem.Version.BASE,
Version.BASE,
"Invalid packaging for parent POM " + ModelProblemUtils.toSourceHint(parentModel)
+ ", must be \"pom\" but is \"" + parentModel.getPackaging() + "\"",
parentModel.getLocation("packaging"));
Expand Down Expand Up @@ -955,7 +950,7 @@ private Model readParentLocally(Model childModel) throws ModelBuilderException {
buffer.append(parent.getArtifactId()).append(", please verify your project structure");

setSource(childModel);
add(Severity.WARNING, ModelProblem.Version.BASE, buffer.toString(), parent.getLocation(""));
add(Severity.WARNING, Version.BASE, buffer.toString(), parent.getLocation(""));
return null;
}

Expand All @@ -973,18 +968,14 @@ private Model readParentLocally(Model childModel) throws ModelBuilderException {

if (rawChildModelVersion == null) {
// Message below is checked for in the MNG-2199 core IT.
add(
Severity.FATAL,
ModelProblem.Version.V31,
"Version must be a constant",
childModel.getLocation(""));
add(Severity.FATAL, Version.V31, "Version must be a constant", childModel.getLocation(""));

} else {
if (rawChildVersionReferencesParent(rawChildModelVersion)) {
// Message below is checked for in the MNG-2199 core IT.
add(
Severity.FATAL,
ModelProblem.Version.V31,
Version.V31,
"Version must be a constant",
childModel.getLocation("version"));
}
Expand Down Expand Up @@ -1059,7 +1050,7 @@ Model resolveAndReadParentExternally(Model childModel) throws ModelBuilderExcept
}
}

add(Severity.FATAL, ModelProblem.Version.BASE, buffer.toString(), parent.getLocation(""), e);
add(Severity.FATAL, Version.BASE, buffer.toString(), parent.getLocation(""), e);
throw newModelBuilderException();
}

Expand All @@ -1075,17 +1066,13 @@ Model resolveAndReadParentExternally(Model childModel) throws ModelBuilderExcept

if (rawChildModelVersion == null) {
// Message below is checked for in the MNG-2199 core IT.
add(
Severity.FATAL,
ModelProblem.Version.V31,
"Version must be a constant",
childModel.getLocation(""));
add(Severity.FATAL, Version.V31, "Version must be a constant", childModel.getLocation(""));
} else {
if (rawChildVersionReferencesParent(rawChildModelVersion)) {
// Message below is checked for in the MNG-2199 core IT.
add(
Severity.FATAL,
ModelProblem.Version.V31,
Version.V31,
"Version must be a constant",
childModel.getLocation("version"));
}
Expand Down Expand Up @@ -1263,7 +1250,7 @@ Model doReadFileModel() throws ModelBuilderException {

add(
Severity.ERROR,
ModelProblem.Version.V20,
Version.V20,
"Malformed POM " + modelSource.getLocation() + ": " + e.getMessage(),
e);
}
Expand All @@ -1283,7 +1270,7 @@ Model doReadFileModel() throws ModelBuilderException {
} catch (XmlReaderException e) {
add(
Severity.FATAL,
ModelProblem.Version.BASE,
Version.BASE,
"Non-parseable POM " + modelSource.getLocation() + ": " + e.getMessage(),
e);
throw newModelBuilderException();
Expand All @@ -1297,11 +1284,7 @@ Model doReadFileModel() throws ModelBuilderException {
msg = e.getClass().getSimpleName();
}
}
add(
Severity.FATAL,
ModelProblem.Version.BASE,
"Non-readable POM " + modelSource.getLocation() + ": " + msg,
e);
add(Severity.FATAL, Version.BASE, "Non-readable POM " + modelSource.getLocation() + ": " + msg, e);
throw newModelBuilderException();
}

Expand Down Expand Up @@ -1369,7 +1352,7 @@ Model doReadFileModel() throws ModelBuilderException {
model = model.withSubprojects(subprojects);
}
} catch (IOException e) {
add(Severity.FATAL, ModelProblem.Version.V41, "Error discovering subprojects", e);
add(Severity.FATAL, Version.V41, "Error discovering subprojects", e);
}
}
}
Expand Down Expand Up @@ -1526,7 +1509,7 @@ private DependencyManagement loadDependencyManagement(Dependency dependency, Col
if (groupId == null || groupId.isEmpty()) {
add(
Severity.ERROR,
ModelProblem.Version.BASE,
Version.BASE,
"'dependencyManagement.dependencies.dependency.groupId' for " + dependency.getManagementKey()
+ " is missing.",
dependency.getLocation(""));
Expand All @@ -1535,7 +1518,7 @@ private DependencyManagement loadDependencyManagement(Dependency dependency, Col
if (artifactId == null || artifactId.isEmpty()) {
add(
Severity.ERROR,
ModelProblem.Version.BASE,
Version.BASE,
"'dependencyManagement.dependencies.dependency.artifactId' for " + dependency.getManagementKey()
+ " is missing.",
dependency.getLocation(""));
Expand All @@ -1544,7 +1527,7 @@ private DependencyManagement loadDependencyManagement(Dependency dependency, Col
if (version == null || version.isEmpty()) {
add(
Severity.ERROR,
ModelProblem.Version.BASE,
Version.BASE,
"'dependencyManagement.dependencies.dependency.version' for " + dependency.getManagementKey()
+ " is missing.",
dependency.getLocation(""));
Expand All @@ -1560,7 +1543,7 @@ private DependencyManagement loadDependencyManagement(Dependency dependency, Col
message.append(modelId).append(" -> ");
}
message.append(imported);
add(Severity.ERROR, ModelProblem.Version.BASE, message.toString());
add(Severity.ERROR, Version.BASE, message.toString());
return null;
}

Expand Down Expand Up @@ -1612,7 +1595,7 @@ private Model doLoadDependencyManagement(
}
buffer.append(": ").append(e.getMessage());

add(Severity.ERROR, ModelProblem.Version.BASE, buffer.toString(), dependency.getLocation(""), e);
add(Severity.ERROR, Version.BASE, buffer.toString(), dependency.getLocation(""), e);
return null;
}

Expand All @@ -1627,7 +1610,7 @@ private Model doLoadDependencyManagement(
if (sourcePath != null && sourcePath.startsWith(rootDirectory)) {
add(
Severity.WARNING,
ModelProblem.Version.BASE,
Version.BASE,
"BOM imports from within reactor should be avoided",
dependency.getLocation(""));
}
Expand Down Expand Up @@ -1711,7 +1694,7 @@ class ProfileInterpolator extends MavenTransformer implements UnaryOperator<Prof
try {
return xform.interpolate(s);
} catch (InterpolationException e) {
problems.add(Severity.ERROR, ModelProblem.Version.BASE, e.getMessage(), e);
problems.add(Severity.ERROR, Version.BASE, e.getMessage(), e);
}
}
return s;
Expand Down Expand Up @@ -1752,7 +1735,7 @@ private String transformPath(String path, ActivationFile target, String location
} catch (InterpolationException e) {
problems.add(
Severity.ERROR,
ModelProblem.Version.BASE,
Version.BASE,
"Failed to interpolate file location " + path + ": " + e.getMessage(),
target.getLocation(locationKey),
e);
Expand Down Expand Up @@ -1847,7 +1830,7 @@ private Model interpolateModel(Model model, ModelBuilderRequest request, ModelPr
} catch (Exception e) {
problems.add(
Severity.ERROR,
ModelProblem.Version.BASE,
Version.BASE,
"Failed to interpolate field: "
+ interpolatedModel.getParent().getVersion()
+ " on class: ",
Expand Down

0 comments on commit 3fdc54c

Please sign in to comment.