From 18f815070b0a0f4b69b83f2d666b3505816fcfbe Mon Sep 17 00:00:00 2001 From: "Maharajh, Robby (rx2202)" Date: Fri, 14 Jul 2017 17:54:23 -0400 Subject: [AAI-50 Amsterdam] Add support for v11 version API Update rest controller paths to include v11 remove unneeded test resources from traversal Update default api version for dmaap msgs Update version of aai core and schema for traversal update version in app props to v11 Change-Id: I8c96310de42679f95646dd456535404bd78290c7 Signed-off-by: Maharajh, Robby (rx2202) --- aai-traversal/src/main/java/org/openecomp/aai/rest/QueryConsumer.java | 2 +- .../src/main/java/org/openecomp/aai/rest/search/SearchProvider.java | 2 +- .../src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'aai-traversal/src/main') diff --git a/aai-traversal/src/main/java/org/openecomp/aai/rest/QueryConsumer.java b/aai-traversal/src/main/java/org/openecomp/aai/rest/QueryConsumer.java index af1d350..e5f7aad 100644 --- a/aai-traversal/src/main/java/org/openecomp/aai/rest/QueryConsumer.java +++ b/aai-traversal/src/main/java/org/openecomp/aai/rest/QueryConsumer.java @@ -66,7 +66,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -@Path("{version: v9|v1[0]}/query") +@Path("{version: v9|v1[01]}/query") public class QueryConsumer extends RESTAPI { /** The introspector factory type. */ diff --git a/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java b/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java index 99339b9..ee6b1ab 100644 --- a/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java +++ b/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java @@ -59,7 +59,7 @@ import org.openecomp.aai.serialization.queryformats.utils.UrlBuilder; * */ -@Path("/{version: v2|v[789]|v1[0]|latest}/search") +@Path("/{version: v2|v[789]|v1[01]|latest}/search") public class SearchProvider extends RESTAPI { protected static String authPolicyFunctionName = "search"; diff --git a/aai-traversal/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java b/aai-traversal/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java index c50dbab..1c73987 100644 --- a/aai-traversal/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java +++ b/aai-traversal/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java @@ -60,7 +60,7 @@ public class UEBNotification { public UEBNotification(Loader loader) { events = new ArrayList<>(); currentVersionLoader = LoaderFactory.createLoaderForVersion(loader.getModelType(), AAIProperties.LATEST); - notificationVersion = Version.valueOf(AAIConfig.get("aai.notification.current.version","v10")); + notificationVersion = Version.valueOf(AAIConfig.get("aai.notification.current.version","v11")); } -- cgit 1.2.3-korg