diff options
| author |   Maharajh, Robby (rx2202) <rx2202@us.att.com> | 2017-07-14 17:54:23 -0400 |
|---|---|---|
| committer | Maharajh, Robby (rx2202) <rx2202@us.att.com> | 2017-07-14 17:55:33 -0400 |
| commit | 18f815070b0a0f4b69b83f2d666b3505816fcfbe (patch) | |
| tree | a99f06ecac064c5f285d9083837131b7c88d4e58 /aai-traversal/src | |
| parent | 5cebb70cce7a3371b21006369569998902e3adde (diff) | |
[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) <rx2202@att.com>
Diffstat (limited to 'aai-traversal/src')
4 files changed, 6 insertions, 6 deletions
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")); } diff --git a/aai-traversal/src/test/resources/test_aaiconfig.properties b/aai-traversal/src/test/resources/test_aaiconfig.properties index 0af948a..926d3f8 100644 --- a/aai-traversal/src/test/resources/test_aaiconfig.properties +++ b/aai-traversal/src/test/resources/test_aaiconfig.properties @@ -41,7 +41,7 @@ aai.auth.cspcookies_on=false aai.dbmodel.filename=ex5.json aai.server.url.base=https://localhost:8446/aai/ -aai.server.url=https://localhost:8446/aai/v10/ +aai.server.url=https://localhost:8446/aai/v11/ aai.truststore.filename=aai_keystore aai.truststore.passwd.x= @@ -81,7 +81,7 @@ aai.rsync.options.list=-v|-t aai.rsync.remote.user=aaiadmin aai.rsync.enabled=y -aai.notification.current.version=v10 +aai.notification.current.version=v11 aai.notificationEvent.default.status=UNPROCESSED aai.notificationEvent.default.eventType=AAI-EVENT aai.notificationEvent.default.domain=devINT1 @@ -92,6 +92,6 @@ aai.notificationEvent.default.version=v9 # This one lets us enable/disable resource-version checking on updates/deletes aai.resourceversion.enableflag=true aai.logging.maxStackTraceEntries=10 -aai.default.api.version=v10 +aai.default.api.version=v11 |