Skip to content

Commit fefc06c

Browse files
committed
Disable checkstyle:FileLength
1 parent 7172f5e commit fefc06c

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

maven-api-impl/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ under the License.
2929
<name>Maven API Implementation</name>
3030
<description>Provides the implementation classes for the Maven API</description>
3131

32+
<properties>
33+
<!-- in: DefaultModelValidator, DefaultModelBuilder -->
34+
<checkstyle.violation.ignore>FileLength</checkstyle.violation.ignore>
35+
</properties>
36+
3237
<dependencies>
3338
<dependency>
3439
<groupId>org.apache.maven</groupId>

maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import java.io.File;
2222
import java.util.Arrays;
23-
import java.util.Collections;
2423
import java.util.Deque;
2524
import java.util.HashMap;
2625
import java.util.HashSet;
@@ -134,7 +133,6 @@ protected Activation.Builder transformActivation_ActiveByDefault(
134133
protected Activation.Builder transformActivation_File(
135134
Supplier<? extends Activation.Builder> creator, Activation.Builder builder, Activation target) {
136135
stk.push(nextFrame("file", Activation::getFile));
137-
Optional.ofNullable(target.getFile());
138136
try {
139137
return super.transformActivation_File(creator, builder, target);
140138
} finally {
@@ -333,7 +331,7 @@ public void validateFileModel(Model m, ModelBuilderRequest request, ModelProblem
333331
if (request.getValidationLevel() == ModelBuilderRequest.VALIDATION_LEVEL_MINIMAL) {
334332
// profiles: they are essential for proper model building (may contribute profiles, dependencies...)
335333
HashSet<String> minProfileIds = new HashSet<>();
336-
for (org.apache.maven.api.model.Profile profile : m.getProfiles()) {
334+
for (Profile profile : m.getProfiles()) {
337335
if (!minProfileIds.add(profile.getId())) {
338336
addViolation(
339337
problems,
@@ -409,7 +407,6 @@ public void validateFileModel(Model m, ModelBuilderRequest request, ModelProblem
409407
}
410408
}
411409

412-
413410
Severity errOn30 = getSeverity(request, ModelBuilderRequest.VALIDATION_LEVEL_MAVEN_3_0);
414411

415412
// The file pom may not contain the modelVersion yet, as it may be set later by the
@@ -693,10 +690,6 @@ public void validateEffectiveModel(Model m, ModelBuilderRequest request, ModelPr
693690

694691
validateStringNotEmpty("packaging", problems, Severity.ERROR, Version.BASE, m.getPackaging(), m);
695692

696-
// TODO: if the model is a 4.1.0:
697-
// * modules should be empty, else issue a warning
698-
// * validate subprojects
699-
700693
if (!m.getModules().isEmpty()) {
701694
if (!"pom".equals(m.getPackaging())) {
702695
addViolation(
@@ -963,7 +956,7 @@ private void validate20RawDependencies(
963956

964957
private void validate20RawDependenciesSelfReferencing(
965958
ModelProblemCollector problems,
966-
org.apache.maven.api.model.Model m,
959+
Model m,
967960
List<Dependency> dependencies,
968961
String prefix,
969962
ModelBuilderRequest request) {
@@ -994,7 +987,7 @@ private void validate20RawDependenciesSelfReferencing(
994987

995988
private void validateEffectiveDependencies(
996989
ModelProblemCollector problems,
997-
org.apache.maven.api.model.Model m,
990+
Model m,
998991
List<Dependency> dependencies,
999992
boolean management,
1000993
ModelBuilderRequest request) {
@@ -1057,7 +1050,7 @@ private void validateEffectiveDependencies(
10571050
private void validateEffectiveModelAgainstDependency(
10581051
String prefix,
10591052
ModelProblemCollector problems,
1060-
org.apache.maven.api.model.Model m,
1053+
Model m,
10611054
Dependency d,
10621055
ModelBuilderRequest request) {
10631056
String key = d.getGroupId() + ":" + d.getArtifactId() + ":" + d.getVersion()

0 commit comments

Comments
 (0)