From 7a8f6c251214670b5bdfba3ac94bf8c866af1933 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Wed, 2 Oct 2013 11:32:00 +0200 Subject: Move project key validation to core --- .../java/org/sonar/batch/scan/ProjectReactorValidator.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'sonar-batch/src') diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java index 927976cf0f1..df55d881387 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java @@ -19,6 +19,8 @@ */ package org.sonar.batch.scan; +import org.sonar.core.component.ComponentKeys; + import com.google.common.base.Joiner; import org.codehaus.plexus.util.StringUtils; import org.sonar.api.CoreProperties; @@ -37,11 +39,6 @@ import java.util.List; */ public class ProjectReactorValidator { - /* - * Allowed characters are alphanumeric, dash '-', underscore '_', period '.' and colon ':', - * with at least one non-digit - */ - private static final String VALID_MODULE_KEY_REGEXP = "[\\p{Alnum}\\-_.:]*[\\p{Alpha}\\-_.:]+[\\p{Alnum}\\-_.:]*"; private final Settings settings; private final ResourceDao resourceDao; @@ -75,14 +72,14 @@ public class ProjectReactorValidator { } private void validateKey(ProjectDefinition def, List validationMessages) { - if (!def.getKey().matches(VALID_MODULE_KEY_REGEXP)) { + if (!ComponentKeys.isValidModuleKey(def.getKey())) { validationMessages.add(String.format("%s is not a valid project or module key", def.getKey())); } } private void validateBranch(List validationMessages) { String branch = settings.getString(CoreProperties.PROJECT_BRANCH_PROPERTY); - if (StringUtils.isNotEmpty(branch) && !branch.matches(VALID_MODULE_KEY_REGEXP)) { + if (StringUtils.isNotEmpty(branch) && !ComponentKeys.isValidModuleKey(branch)) { validationMessages.add(String.format("%s is not a valid branch name", branch)); } } -- cgit v1.2.3