diff options
| author |   James Forsyth <jf2512@att.com> | 2018-02-27 15:06:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-27 15:06:49 +0000 |
| commit | a8fb8d0be871210f98c60cabb12a89635065d528 (patch) | |
| tree | c3ba256ba62b64464158daecb77ab50273afd4a0 /aai-resources/src/main | |
| parent | 3275c8f62d00e714004cceee314292ee040b283f (diff) | |
| parent | 1943d512ccf6540d8e4770a547da3958e6d1a007 (diff) | |
Merge "Update the rest endpoints for v13 version"
Diffstat (limited to 'aai-resources/src/main')
5 files changed, 4 insertions, 5 deletions
diff --git a/aai-resources/src/main/java/org/onap/aai/rest/ExampleConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/ExampleConsumer.java index 497eeb9..40b1b96 100644 --- a/aai-resources/src/main/java/org/onap/aai/rest/ExampleConsumer.java +++ b/aai-resources/src/main/java/org/onap/aai/rest/ExampleConsumer.java @@ -47,7 +47,7 @@ import org.onap.aai.restcore.RESTAPI; /** * The Class ExampleConsumer. */ -@Path("/{version: v[789]|v1[012]}/examples") +@Path("/{version: v[789]|v1[0123]}/examples") public class ExampleConsumer extends RESTAPI { diff --git a/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java index 15d8296..0c2ef9c 100644 --- a/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java +++ b/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java @@ -77,7 +77,7 @@ import com.google.common.base.Joiner; /** * The Class LegacyMoxyConsumer. */ -@Path("{version: v[789]|v1[012]}") +@Path("{version: v[789]|v1[0123]}") 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/onap/aai/rest/URLFromVertexIdConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/URLFromVertexIdConsumer.java index 66677c2..df11cc6 100644 --- a/aai-resources/src/main/java/org/onap/aai/rest/URLFromVertexIdConsumer.java +++ b/aai-resources/src/main/java/org/onap/aai/rest/URLFromVertexIdConsumer.java @@ -56,7 +56,7 @@ import org.onap.aai.workarounds.LegacyURITransformer; /** * The Class URLFromVertexIdConsumer. */ -@Path("{version: v[789]|v1[012]}/generateurl") +@Path("{version: v[789]|v1[0123]}/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/onap/aai/rest/VertexIdConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/VertexIdConsumer.java index af6022c..2117299 100644 --- a/aai-resources/src/main/java/org/onap/aai/rest/VertexIdConsumer.java +++ b/aai-resources/src/main/java/org/onap/aai/rest/VertexIdConsumer.java @@ -64,7 +64,7 @@ import org.onap.aai.serialization.engines.TransactionalGraphEngine; /** * The Class VertexIdConsumer. */ -@Path("{version: v[789]|v1[012]}/resources") +@Path("{version: v[789]|v1[0123]}/resources") public class VertexIdConsumer extends RESTAPI { private ModelType introspectorFactoryType = ModelType.MOXY; diff --git a/aai-resources/src/main/resources/docker/Dockerfile b/aai-resources/src/main/resources/docker/Dockerfile index dcbae0c..bd0e320 100644 --- a/aai-resources/src/main/resources/docker/Dockerfile +++ b/aai-resources/src/main/resources/docker/Dockerfile @@ -5,7 +5,6 @@ RUN mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-RES /opt/app/aai-resourc # Add the proper files into the docker image from your build ADD ./opt/app/aai-resources /opt/app/aai-resources ADD ./commonLibs/ /opt/app/commonLibs/ -ADD init-chef.sh /opt/app/aai-resources/init-chef.sh ADD docker-entrypoint.sh /opt/app/aai-resources/docker-entrypoint.sh ADD aai.sh /etc/profile.d/aai.sh |