aboutsummaryrefslogtreecommitdiffstats
path: root/models-base/src/main/java/org/onap
diff options
context:
space:
mode:
authorFrancescoFioraEst <francesco.fiora@est.tech>2023-11-22 15:40:44 +0000
committerFrancesco Fiora <francesco.fiora@est.tech>2023-11-24 15:58:51 +0000
commitbae811c71a0bd4484c6b69ad0db9afdbeca373bd (patch)
tree99c1128cd5761cf145f0a59a66cb145819db9559 /models-base/src/main/java/org/onap
parent1d98ddb9b2b2bb853458f73df7412afea7d621bd (diff)
Allow semantic versioning in all templates in models
Issue-ID: POLICY-4885 Change-Id: I036c4ddc41bb817dc28a4b28a842d3139991bd10 Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
Diffstat (limited to 'models-base/src/main/java/org/onap')
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfKey.java4
1 files changed, 3 insertions, 1 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 8ff171ee3..1ce5102b8 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
@@ -39,7 +39,9 @@ public abstract class PfKey extends PfConcept {
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 = "^(\\d+.){2}\\d+$";
+ public static final String VERSION_REGEXP
+ = "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)"
+ + "(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$";
/** Regular expression to specify the structure of key IDs. */
public static final String KEY_ID_REGEXP = "^[A-Za-z0-9\\-_\\.]+:(\\d+.){2}\\d+$";