diff options
Diffstat (limited to 'aai-core/src/main/java/org')
4 files changed, 8 insertions, 7 deletions
diff --git a/aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java b/aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java index e26d930e..0acb2285 100644 --- a/aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java +++ b/aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java @@ -32,7 +32,7 @@ public class AAIProperties { public static final String CREATED_TS = "aai-created-ts"; public static final String RESOURCE_VERSION = "resource-version"; public static final String AAI_URI = "aai-uri"; - public static final Version LATEST = Version.v12; + public static final Version LATEST = Version.v13; public static final Integer MAXIMUM_DEPTH = 10000; public static final String LINKED = "linked"; public static final String DB_ALIAS_SUFFIX = "-local"; 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 c1e913e2..a3ff9d02 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 @@ -26,13 +26,14 @@ public enum Version { v9, v10, v11, - v12; + v12, + v13; public static boolean isLatest(Version v) { - return (Version.v12.equals(v)); //TODO update when we increment the version, or find a better way of doing this + return (Version.v13.equals(v)); //TODO update when we increment the version, or find a better way of doing this } public static Version getLatest(){ - return Version.v12; //TODO update when we increment the version, or find a better way of doing this + return Version.v13; //TODO update when we increment the version, or find a better way of doing this } } diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java index 1c5b71f4..8387285d 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java @@ -58,7 +58,7 @@ public class UrlBuilder { final StringBuilder result = new StringBuilder(); final URI uri = this.serializer.getURIForVertex(v); - if (this.version.compareTo(Version.v11) >= 0 || this.version.compareTo(Version.v12) >= 0) { + if (this.version.compareTo(Version.v11) >= 0) { result.append(AAIConstants.AAI_APP_ROOT); } else { result.append(this.serverBase); @@ -77,7 +77,7 @@ public class UrlBuilder { result.append("/resources/id/" + v.id()); result.insert(0, this.version); - if (this.version.compareTo(Version.v11) >= 0 || this.version.compareTo(Version.v12) >= 0) { + if (this.version.compareTo(Version.v11) >= 0) { result.insert(0, AAIConstants.AAI_APP_ROOT); } else { result.insert(0, this.serverBase); diff --git a/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java b/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java index af9171dd..b39bc3b9 100644 --- a/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java +++ b/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java @@ -1163,7 +1163,7 @@ public class GenerateXsd { logger.trace("processing starts"); sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"); String namespace = "org.onap"; - if (v.compareTo(Version.v11) < 0 || v.compareTo(Version.v12) < 0) { + if (v.compareTo(Version.v11) < 0) { namespace = "org.openecomp"; } if ( useAnnotationsInXsd ) { |