From 0423274ca0c213f801d64e5ae9923fd5f90c7c78 Mon Sep 17 00:00:00 2001 From: "Maharajh, Robby (rx2202)" Date: Fri, 14 Jul 2017 17:35:06 -0400 Subject: [AAI-50 Amsterdam] Add support for v11 version API Update rest controller paths to include v11 update version in app props to v11 Update default api version for dmaap to v11 Update oxms in the test dir to v11 Update version of schema and core for resources Change-Id: Ic1604f75a00fdafbda3de30ce5421efecdc128d9 Signed-off-by: Maharajh, Robby (rx2202) --- aai-resources/src/main/java/org/openecomp/aai/rest/BulkAddConsumer.java | 2 +- .../src/main/java/org/openecomp/aai/rest/BulkProcessConsumer.java | 2 +- aai-resources/src/main/java/org/openecomp/aai/rest/ExampleConsumer.java | 2 +- .../src/main/java/org/openecomp/aai/rest/LegacyMoxyConsumer.java | 2 +- .../src/main/java/org/openecomp/aai/rest/URLFromVertexIdConsumer.java | 2 +- .../src/main/java/org/openecomp/aai/rest/VertexIdConsumer.java | 2 +- .../src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'aai-resources/src/main/java') diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/BulkAddConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/BulkAddConsumer.java index f8c34c2..7f93b91 100644 --- a/aai-resources/src/main/java/org/openecomp/aai/rest/BulkAddConsumer.java +++ b/aai-resources/src/main/java/org/openecomp/aai/rest/BulkAddConsumer.java @@ -24,7 +24,7 @@ import javax.ws.rs.Path; import org.openecomp.aai.restcore.HttpMethod; -@Path("{version: v[8-9]|v1[0]}/bulkadd") +@Path("{version: v[8-9]|v1[01]}/bulkadd") public class BulkAddConsumer extends BulkConsumer { @Override diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/BulkProcessConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/BulkProcessConsumer.java index 91867ef..f48b463 100644 --- a/aai-resources/src/main/java/org/openecomp/aai/rest/BulkProcessConsumer.java +++ b/aai-resources/src/main/java/org/openecomp/aai/rest/BulkProcessConsumer.java @@ -24,7 +24,7 @@ import javax.ws.rs.Path; import org.openecomp.aai.restcore.HttpMethod; -@Path("{version: v[2789]|v1[0]}/bulkprocess") +@Path("{version: v[2789]|v1[01]}/bulkprocess") public class BulkProcessConsumer extends BulkConsumer { @Override diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/ExampleConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/ExampleConsumer.java index de59955..3084abc 100644 --- a/aai-resources/src/main/java/org/openecomp/aai/rest/ExampleConsumer.java +++ b/aai-resources/src/main/java/org/openecomp/aai/rest/ExampleConsumer.java @@ -46,7 +46,7 @@ import org.openecomp.aai.restcore.RESTAPI; /** * The Class ExampleConsumer. */ -@Path("/{version: v[2789]|v1[0]}/examples") +@Path("/{version: v[2789]|v1[01]}/examples") public class ExampleConsumer extends RESTAPI { diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/LegacyMoxyConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/LegacyMoxyConsumer.java index 27a082e..70b8c92 100644 --- a/aai-resources/src/main/java/org/openecomp/aai/rest/LegacyMoxyConsumer.java +++ b/aai-resources/src/main/java/org/openecomp/aai/rest/LegacyMoxyConsumer.java @@ -74,7 +74,7 @@ import com.thinkaurelius.titan.core.TitanTransaction; /** * The Class LegacyMoxyConsumer. */ -@Path("{version: v[2789]|v1[0]}") +@Path("{version: v[2789]|v1[01]}") public class LegacyMoxyConsumer extends RESTAPI { private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(LegacyMoxyConsumer.class.getName()); diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/URLFromVertexIdConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/URLFromVertexIdConsumer.java index d67a008..c3183d7 100644 --- a/aai-resources/src/main/java/org/openecomp/aai/rest/URLFromVertexIdConsumer.java +++ b/aai-resources/src/main/java/org/openecomp/aai/rest/URLFromVertexIdConsumer.java @@ -54,7 +54,7 @@ import org.openecomp.aai.workarounds.LegacyURITransformer; /** * The Class URLFromVertexIdConsumer. */ -@Path("{version: v[2789]|v1[0]}/generateurl") +@Path("{version: v[2789]|v1[01]}/generateurl") public class URLFromVertexIdConsumer extends RESTAPI { private ModelType introspectorFactoryType = ModelType.MOXY; private QueryStyle queryStyle = QueryStyle.TRAVERSAL; diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/VertexIdConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/VertexIdConsumer.java index 9e1dcfc..f0de3f0 100644 --- a/aai-resources/src/main/java/org/openecomp/aai/rest/VertexIdConsumer.java +++ b/aai-resources/src/main/java/org/openecomp/aai/rest/VertexIdConsumer.java @@ -63,7 +63,7 @@ import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; /** * The Class VertexIdConsumer. */ -@Path("{version: v[2789]|v1[0]}/resources") +@Path("{version: v[2789]|v1[01]}/resources") public class VertexIdConsumer extends RESTAPI { private ModelType introspectorFactoryType = ModelType.MOXY; diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java b/aai-resources/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java index 8cb16e1..fdba308 100644 --- a/aai-resources/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java +++ b/aai-resources/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