From 9d8309b0f53eeb4bda09d60dc070ff308ebe5264 Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Thu, 19 Jul 2018 16:52:30 -0400 Subject: Update traversal to use v14 Issue-ID: AAI-1395 Change-Id: Ib3db83ca3730b9a37f480faf366cc195d1ce7a52 Signed-off-by: Kajur, Harish (vk250x) --- aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java | 2 +- .../src/main/java/org/onap/aai/rest/search/SearchProvider.java | 2 +- .../src/main/resources/etc/appprops/aaiconfig.properties | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java b/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java index 4139907..6f6abd1 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java @@ -77,7 +77,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.onap.aai.util.AAIConstants; -@Path("{version: v9|v1[0123]}/query") +@Path("{version: v9|v1[01234]}/query") public class QueryConsumer extends RESTAPI { private static final String DEPTH = "depth"; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java index e1d4400..4973060 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java @@ -68,7 +68,7 @@ import com.att.eelf.configuration.EELFManager; * */ -@Path("/{version: v[789]|v1[0123]|latest}/search") +@Path("/{version: v[789]|v1[01234]|latest}/search") public class SearchProvider extends RESTAPI { protected static String authPolicyFunctionName = "search"; diff --git a/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties b/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties index 27ddd76..776ee4b 100644 --- a/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties +++ b/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties @@ -48,7 +48,7 @@ aai.tools.username=AAI aai.tools.password=AAI aai.server.url.base=https://localhost:8443/aai/ -aai.server.url=https://localhost:8443/aai/v12/ +aai.server.url=https://localhost:8443/aai/v14/ aai.global.callback.url=https://localhost:8443/aai/ aai.auth.cspcookies_on=false @@ -79,18 +79,18 @@ aai.rsync.options.list=-v|-t aai.rsync.remote.user=aaiadmin aai.rsync.enabled=y -aai.notification.current.version=v12 +aai.notification.current.version=v14 aai.notificationEvent.default.status=UNPROCESSED aai.notificationEvent.default.eventType=AAI-EVENT aai.notificationEvent.default.domain=devINT1 aai.notificationEvent.default.sourceName=aai aai.notificationEvent.default.sequenceNumber=0 aai.notificationEvent.default.severity=NORMAL -aai.notificationEvent.default.version=v12 +aai.notificationEvent.default.version=v14 # This one lets us enable/disable resource-version checking on updates/deletes aai.resourceversion.enableflag=true aai.logging.maxStackTraceEntries=10 -aai.default.api.version=v12 +aai.default.api.version=v14 # Used by Model-processing code aai.model.delete.sleep.per.vtx.msec=500 -- cgit 1.2.3-korg