Repository: maven Updated Branches: refs/heads/MNG-6305-validation-of-ci-friendly a44b03581 -> 14b86566e
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/14b86566 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/14b86566 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/14b86566 Branch: refs/heads/MNG-6305-validation-of-ci-friendly Commit: 14b86566e3cae0f83a57bbbfcac0abd4902555f3 Parents: a44b035 Author: Karl Heinz Marbaise <khmarba...@apache.org> Authored: Sat Dec 30 15:14:15 2017 +0100 Committer: Karl Heinz Marbaise <khmarba...@apache.org> Committed: Sat Dec 30 15:14:15 2017 +0100 ---------------------------------------------------------------------- .../model/validation/DefaultModelValidator.java | 27 +++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/14b86566/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; }
