Code Review
/
policy
/
models.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Allow semantic versioning in all templates in models
[policy/models.git]
/
models-base
/
src
/
main
/
java
/
org
/
onap
/
policy
/
models
/
base
/
PfKey.java
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
8ff171e
..
1ce5102
100644
(file)
--- 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 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+$";
/** Regular expression to specify the structure of key IDs. */
public static final String KEY_ID_REGEXP = "^[A-Za-z0-9\\-_\\.]+:(\\d+.){2}\\d+$";