X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fintrospection%2FVersion.java;h=d32212b8f3f99fd1f74149cfa175a56571e78e9b;hb=f1a8fb1bc04f5d685f2b31d35db605f6fa054f60;hp=76ff939f907af89741730101782883e8a0f27a73;hpb=b1264ad4012f67664d71982a0eaad7e9bcce34f4;p=aai%2Faai-common.git

diff --git a/aai-core/src/main/java/org/onap/aai/introspection/Version.java b/aai-core/src/main/java/org/onap/aai/introspection/Version.java
index 76ff939f..d32212b8 100644
--- a/aai-core/src/main/java/org/onap/aai/introspection/Version.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/Version.java
@@ -19,6 +19,9 @@
  */
 package org.onap.aai.introspection;
 
+/**
+ * Requires the order to be in ascending order
+ */
 public enum Version {
 	v8,
 	v9,
@@ -26,12 +29,38 @@ public enum Version {
 	v11,
 	v12,
 	v13;
-	
+
+	public static final String VERSION_EXPRESSION = "v8|v9|v10|v11|v12|v13|latest";
+	public static final String VERSION_EXPRESSION_V8_PLUS = "v8|v9|v10|v11|v12|v13|latest";
+	public static final String VERSION_EXPRESSION_V9_PLUS = "v9|v10|v11|v12|v13|latest";
+
+	/**
+	 * Checks if v is the latest version
+	 * @param v
+	 * @return
+	 */
 	public static boolean isLatest(Version v) {
-		return (Version.v13.equals(v)); //TODO update when we increment the version, or find a better way of doing this
+		return Version.getLatest().equals(v);
 	}
-	
+
+	/**
+	 * Gets the latest version
+	 * @return
+	 */
 	public static Version getLatest(){
-		return Version.v13; //TODO update when we increment the version, or find a better way of doing this
+		return Version.values()[Version.values().length-1];
+	}
+
+	/**
+	 * To be used inplace of <b>Version.getVersion(String)</b> to correctly get version of "latest"
+	 * @param v
+	 * @return
+	 */
+	public static Version getVersion(String v) {
+		if ("latest".equals(v)) {
+			return Version.getLatest();
+		}
+		return Version.valueOf(v);
 	}
+
 }