X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fservice%2FModelLoaderInterface.java;h=679609043fd705738a8cb94722cddcd05d912506;hb=refs%2Fchanges%2F21%2F44921%2F1;hp=56ffe633d573b6e2f0dab1a290680fd96721275c;hpb=4dd316529148d07059d844197cdb676806bdc0c6;p=aai%2Fmodel-loader.git

diff --git a/src/main/java/org/onap/aai/modelloader/service/ModelLoaderInterface.java b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderInterface.java
index 56ffe63..6796090 100644
--- a/src/main/java/org/onap/aai/modelloader/service/ModelLoaderInterface.java
+++ b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderInterface.java
@@ -1,53 +1,45 @@
-/**
- * ============LICENSE_START==========================================
- * org.onap.aai
- * ===================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 Amdocs
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-package org.onap.aai.modelloader.service;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-
-public interface ModelLoaderInterface {
-
-  @GET
-  @Path("/loadModel/{modelid}")
-  public Response loadModel(@PathParam("modelid") String modelid);
-
-  @PUT
-  @Path("/saveModel/{modelid}/{modelname}")
-  public Response saveModel(@PathParam("modelid") String modelid,
-      @PathParam("modelname") String modelname);
-
-  @POST
-  @Consumes("application/xml")
-  @Produces("application/xml")
-  @Path("/ingestModel/{modelid}")
-  public Response ingestModel(@PathParam("modelid") String modelid, @Context HttpServletRequest req,
-      String payload) throws IOException;
-}
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.modelloader.service;
+
+import java.io.IOException;
+import javax.ws.rs.core.Response;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+public interface ModelLoaderInterface {
+
+    @RequestMapping(value = "/loadModel/{modelid}", //
+            method = RequestMethod.GET, produces = "application/json")
+    @ResponseBody
+    public Response loadModel(String modelid);
+
+    @RequestMapping(value = "/saveModel/{modelid}/{modelname}", //
+            method = RequestMethod.PUT, produces = "application/json")
+    @ResponseBody
+    public Response saveModel(String modelid, String modelname);
+
+    @RequestMapping(value = "/ingestModel/{modelName}/{modelVersion}", //
+            method = RequestMethod.POST, produces = "application/json")
+    @ResponseBody
+    public Response ingestModel(String modelid, String modelVersion, String payload) throws IOException;
+}