diff options
| author |   liamfallon <liam.fallon@est.tech> | 2019-05-22 02:38:32 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2019-05-22 02:38:32 +0000 |
| commit | 3a228ca91c313990741ef6a537d9f9615a0e0215 (patch) | |
| tree | 77049c4ea0d2892730656bceb259d7110f8282c7 /models-base/src/main | |
| parent | d5ed712cf50bcf270fed8cd597d78ff4ff9370a0 (diff) | |
Fix name/version regexp in model keys
The regular expressions for checking names and versions
in policy key names and versions were not expressive enough
to restrict all error names and versions.
Issue-ID: POLICY-1777
Change-Id: I037eca051f6c7a9f1e7182150d40d8b8d906a75c
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'models-base/src/main')
| -rw-r--r-- | models-base/src/main/java/org/onap/policy/models/base/PfKey.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfKey.java b/models-base/src/main/java/org/onap/policy/models/base/PfKey.java index 72b8b5844..f38689a04 100644 --- a/models-base/src/main/java/org/onap/policy/models/base/PfKey.java +++ b/models-base/src/main/java/org/onap/policy/models/base/PfKey.java @@ -30,13 +30,13 @@ public abstract class PfKey extends PfConcept { private static final long serialVersionUID = 6281159885962014041L; /** Regular expression to specify the structure of key names. */ - public static final String NAME_REGEXP = "[A-Za-z0-9\\-_\\.]+"; + public static final String NAME_REGEXP = "^[A-Za-z0-9\\-_\\.]+$"; /** Regular expression to specify the structure of key versions. */ - public static final String VERSION_REGEXP = "[0-9.]+"; + public static final String VERSION_REGEXP = "^(\\d+.){2}\\d+$"; /** Regular expression to specify the structure of key IDs. */ - public static final String KEY_ID_REGEXP = "[A-Za-z0-9\\-_\\.]+:[0-9].[0-9].[0-9]"; + public static final String KEY_ID_REGEXP = "^[A-Za-z0-9\\-_\\.]+:(\\d+.){2}\\d+$"; /** Specifies the value for names in NULL keys. */ public static final String NULL_KEY_NAME = "NULL"; |