You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/12/30 14:44:57 UTC
[3/3] maven git commit: Refactored a little bit.
Refactored a little bit.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ec65d84d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ec65d84d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ec65d84d
Branch: refs/heads/MNG-6305-validation-of-ci-friendly
Commit: ec65d84d6aff884cc0e3c87d64fac266f3e424fb
Parents: c2ece59
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Sat Dec 30 15:14:15 2017 +0100
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Sat Dec 30 15:44:42 2017 +0100
----------------------------------------------------------------------
.../model/validation/DefaultModelValidator.java | 27 +++++++++++++-------
1 file changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ec65d84d/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
----------------------------------------------------------------------
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 51bf27e..30c0043 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
@@ -65,6 +65,15 @@ public class DefaultModelValidator
implements ModelValidator
{
+ private static final Pattern PATTERN_SHA1_PROPERTY =
+ Pattern.compile( AbstractStringBasedModelInterpolator.SHA1_PROPERTY_EXPRESSION, Pattern.LITERAL );
+
+ private static final Pattern PATTERN_CHANGELIST_PROPERTY =
+ Pattern.compile( AbstractStringBasedModelInterpolator.CHANGELIST_PROPERTY_EXPRESSION, Pattern.LITERAL );
+
+ private static final Pattern PATTERN_REVISION_PROPERTY =
+ Pattern.compile( AbstractStringBasedModelInterpolator.REVISION_PROPERTY_EXPRESSION, Pattern.LITERAL );
+
private static final Pattern ID_REGEX = Pattern.compile( "[A-Za-z0-9_\\-.]+" );
private static final Pattern ID_WITH_WILDCARDS_REGEX = Pattern.compile( "[A-Za-z0-9_\\-.?*]+" );
@@ -874,21 +883,21 @@ public class DefaultModelValidator
|| string.contains( AbstractStringBasedModelInterpolator.SHA1_PROPERTY_EXPRESSION ) )
{
//@formatter:off
- String revision =
- Pattern.compile( AbstractStringBasedModelInterpolator.REVISION_PROPERTY_EXPRESSION, Pattern.LITERAL )
+ string =
+ PATTERN_REVISION_PROPERTY
.matcher( string )
.replaceAll( AbstractStringBasedModelInterpolator.REVISION_PROPERTY );
- revision =
- Pattern.compile( AbstractStringBasedModelInterpolator.CHANGELIST_PROPERTY_EXPRESSION, Pattern.LITERAL )
- .matcher( revision )
+ string =
+ PATTERN_CHANGELIST_PROPERTY
+ .matcher( string )
.replaceAll( AbstractStringBasedModelInterpolator.CHANGELIST_PROPERTY );
- revision =
- Pattern.compile( AbstractStringBasedModelInterpolator.SHA1_PROPERTY_EXPRESSION, Pattern.LITERAL )
- .matcher( revision )
+ string =
+ PATTERN_SHA1_PROPERTY
+ .matcher( string )
.replaceAll( AbstractStringBasedModelInterpolator.SHA1_PROPERTY );
//@formatter:on
- if ( !hasExpression( revision ) )
+ if ( !hasExpression( string ) )
{
return true;
}