diff options
| author |   vasraz <vasyl.razinkov@est.tech> | 2023-08-15 18:01:22 +0100 |
|---|---|---|
| committer |   JEFF VAN DAM <jeff.van.dam@est.tech> | 2023-08-16 14:34:13 +0000 |
| commit | adb7f7496af6e71e1cced44ee2f7485c9917a806 (patch) | |
| tree | f5c3f2656862e4438ee0950edbc0aa99fc5a3bc8 | |
| parent | e489b852c39e45f43c7113abbfd439b29fc35348 (diff) | |
Add DOT to property's name permitted chars
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Ib17edf63731832064003430c6f33e9ec58fca696
Issue-ID: SDC-4597
3 files changed, 3 insertions, 3 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java index d75b59be85..1e2cea5c64 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java @@ -116,7 +116,7 @@ import org.yaml.snakeyaml.Yaml; @org.springframework.stereotype.Component("resourceImportManager") public class ResourceImportManager { - static final Pattern PROPERTY_NAME_PATTERN_IGNORE_LENGTH = Pattern.compile("['\\w\\s\\-\\:]+"); + static final Pattern PROPERTY_NAME_PATTERN_IGNORE_LENGTH = Pattern.compile("['\\w\\s\\-\\.\\:]+"); private static final Logger log = Logger.getLogger(ResourceImportManager.class); private final InterfaceDefinitionHandler interfaceDefinitionHandler; private final ComponentsUtils componentsUtils; diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java index 2cd2ddf978..da7b11fe3e 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java @@ -85,7 +85,7 @@ import org.springframework.web.context.WebApplicationContext; public class BeGenericServlet extends BasicServlet { private static final Logger log = Logger.getLogger(BeGenericServlet.class); - private static final String PROPERTY_NAME_REGEX = "[a-zA-Z0-9_:-@]+"; + private static final String PROPERTY_NAME_REGEX = "[a-zA-Z0-9._:-@]+"; @Context protected HttpServletRequest servletRequest; protected ComponentsUtils componentsUtils; diff --git a/catalog-ui/src/app/app.ts b/catalog-ui/src/app/app.ts index e3d202b2a1..916815e5e4 100644 --- a/catalog-ui/src/app/app.ts +++ b/catalog-ui/src/app/app.ts @@ -610,7 +610,7 @@ ng1appModule.config([ ng1appModule.value('ValidationPattern', /^[\s\w\&_.:-]{1,1024}$/); ng1appModule.value('ComponentNameValidationPattern', /^(?=.*[^. ])[\s\w\&_.:-]{1,1024}$/); // DE250513 - same as ValidationPattern above, plus requirement that name not consist of dots and/or spaces alone. -ng1appModule.value('PropertyNameValidationPattern', /^[a-zA-Z0-9_:-@]{1,100}$/); // DE210977 +ng1appModule.value('PropertyNameValidationPattern', /^[a-zA-Z0-9._:\-@]{1,100}$/); // DE210977 ng1appModule.value('TagValidationPattern', /^[\s\w_.-]{1,50}$/); ng1appModule.value('VendorReleaseValidationPattern', /^[\x20-\x21\x23-\x29\x2B-\x2E\x30-\x39\x3B\x3D\x40-\x5B\x5D-\x7B\x7D-\xFF]{1,25}$/); ng1appModule.value('VendorNameValidationPattern', /^[\x20-\x21\x23-\x29\x2B-\x2E\x30-\x39\x3B\x3D\x40-\x5B\x5D-\x7B\x7D-\xFF]{1,60}$/); |