You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/07/10 13:52:01 UTC
[maven] branch MNG-6702 updated: Fix test and checkstyle errors
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6702
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-6702 by this push:
new 9a7752c Fix test and checkstyle errors
9a7752c is described below
commit 9a7752cea3f4b32d08d4032fee48612bb2eb4ba1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Jul 10 15:51:54 2019 +0200
Fix test and checkstyle errors
---
.../model/validation/DefaultModelValidator.java | 23 +++++++++++-----------
.../validation/DefaultModelValidatorTest.java | 6 +++---
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index c5a6974..cfa6e20 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -406,8 +406,8 @@ public class DefaultModelValidator
validate20PluginVersion( "build.plugins.plugin.version", problems, p.getVersion(), p.getKey(), p,
request );
- validateBoolean( "build.plugins.plugin.inherited", EMPTY, problems, errOn30, Version.V20, p.getInherited(),
- p.getKey(), p );
+ validateBoolean( "build.plugins.plugin.inherited", EMPTY, problems, errOn30, Version.V20,
+ p.getInherited(), p.getKey(), p );
validateBoolean( "build.plugins.plugin.extensions", EMPTY, problems, errOn30, Version.V20,
p.getExtensions(), p.getKey(), p );
@@ -535,8 +535,8 @@ public class DefaultModelValidator
+ StringUtils.defaultString( dependency.getVersion(), "(?)" );
}
- addViolation( problems, errOn31, Version.V20, prefix + prefix2 + "(groupId:artifactId:type:classifier)", null,
- "must be unique: " + key + " -> " + msg, dependency );
+ addViolation( problems, errOn31, Version.V20, prefix + prefix2 + "(groupId:artifactId:type:classifier)",
+ null, "must be unique: " + key + " -> " + msg, dependency );
}
else
{
@@ -752,8 +752,8 @@ public class DefaultModelValidator
validateStringNotEmpty( prefix, prefix2, "id", problems, Severity.ERROR, Version.V20, repository.getId(),
null, repository );
- validateStringNotEmpty( prefix, prefix2, "[" + repository.getId() + "].url", problems, Severity.ERROR, Version.V20,
- repository.getUrl(), null, repository );
+ validateStringNotEmpty( prefix, prefix2, "[" + repository.getId() + "].url", problems, Severity.ERROR,
+ Version.V20, repository.getUrl(), null, repository );
String key = repository.getId();
@@ -976,9 +976,9 @@ public class DefaultModelValidator
* </ul>
*/
@SuppressWarnings( "checkstyle:parameternumber" )
- private boolean validateStringNotEmpty( String prefix, String prefix2, String fieldName, ModelProblemCollector problems,
- Severity severity, Version version, String string, String sourceHint,
- InputLocationTracker tracker )
+ private boolean validateStringNotEmpty( String prefix, String prefix2, String fieldName,
+ ModelProblemCollector problems, Severity severity, Version version,
+ String string, String sourceHint, InputLocationTracker tracker )
{
if ( !validateNotNull( prefix, prefix2, fieldName, problems, severity, version, string, sourceHint, tracker ) )
{
@@ -1052,8 +1052,9 @@ public class DefaultModelValidator
* </ul>
*/
@SuppressWarnings( "checkstyle:parameternumber" )
- private boolean validateNotNull( String prefix, String prefix2, String fieldName, ModelProblemCollector problems,
- Severity severity, Version version, Object object, String sourceHint, InputLocationTracker tracker )
+ private boolean validateNotNull( String prefix, String prefix2, String fieldName,
+ ModelProblemCollector problems, Severity severity, Version version,
+ Object object, String sourceHint, InputLocationTracker tracker )
{
if ( object != null )
{
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
index 99ddd30..3e07c57 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
@@ -295,11 +295,11 @@ public class DefaultModelValidatorTest
assertEquals( "'repositories.repository.id' is missing.", result.getErrors().get( 0 ) );
- assertEquals( "'repositories.repository[null].url' is missing.", result.getErrors().get( 1 ) );
+ assertEquals( "'repositories.repository.[null].url' is missing.", result.getErrors().get( 1 ) );
assertEquals( "'pluginRepositories.pluginRepository.id' is missing.", result.getErrors().get( 2 ) );
- assertEquals( "'pluginRepositories.pluginRepository[null].url' is missing.", result.getErrors().get( 3 ) );
+ assertEquals( "'pluginRepositories.pluginRepository.[null].url' is missing.", result.getErrors().get( 3 ) );
}
public void testMissingResourceDirectory()
@@ -735,7 +735,7 @@ public class DefaultModelValidatorTest
assertViolations( result, 1, 0, 0 );
- assertEquals( "'dependencies.dependency com.example.group:testinvalidpom:0.0.1-SNAPSHOT' for com.example.group:testinvalidpom:0.0.1-SNAPSHOT is referencing itself.",
+ assertEquals( "'dependencies.dependency[com.example.group:testinvalidpom:0.0.1-SNAPSHOT]' for com.example.group:testinvalidpom:0.0.1-SNAPSHOT is referencing itself.",
result.getFatals().get( 0 ) );
}