diff options
Diffstat (limited to 'common-app-api/src')
| -rw-r--r-- | common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java | 2 | ||||
| -rw-r--r-- | common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java b/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java index 57cf96e068..dfecf927d8 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java @@ -99,7 +99,7 @@ public class ValidationUtils { Arrays.asList("of", "to", "for", "as", "a", "an", "the")); public static final Pattern COST_PATTERN = Pattern.compile("^[0-9]{1,5}\\.[0-9]{1,3}$"); - public static final Pattern ARTIFACT_LABEL_PATTERN = Pattern.compile("^[a-zA-Z0-9 \\-+]+$"); + public static final Pattern ARTIFACT_LABEL_PATTERN = Pattern.compile("^[a-zA-Z0-9 \\-@+]+$"); public static final Integer ARTIFACT_LABEL_LENGTH = 255; public static final Pattern ARTIFACT_DISPLAY_NAME_PATTERN = Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9 &\\.'#=:@_\\-+]+$"); public static final Pattern CATEGORY_LABEL_PATTERN = Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9 &\\.'#=:@_\\-+]+$"); diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java index 467f1cf545..2d5122a13f 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java @@ -902,6 +902,11 @@ final String testArtifactDisplayName="test=notValid=Label"; } @Test + public void checkValidateArtifactLabelReturnsTrueWithAtSymbol() { + assertTrue(ValidationUtils.validateArtifactLabel("test@label")); + } + + @Test public void checkValidateConsumerNameReturnsTrueIfLabelIsValid() { final String testConsumerName = "testConsumerName"; |