X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fresource%2FEmsManager.java;h=11fba23c9062cdddd9fb96b1d4e0c977e1aca894;hp=368a0c35ec5042cd7c4b07c924770f5973d29e4c;hb=d62f39bb2ee31d0e5c9fd0f26934223d9c2a6539;hpb=fa6dd60a45a093205ae55065f6de044c91493e60

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java
index 368a0c3..11fba23 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java
@@ -21,19 +21,15 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
 
 import org.eclipse.jetty.http.HttpStatus;
-import org.onap.aai.esr.entity.aai.EmsData;
-import org.onap.aai.esr.entity.rest.EmsRestData;
-import org.onap.aai.esr.exception.ExtsysException;
+import org.onap.aai.esr.entity.rest.EmsRegisterInfo;
 import org.onap.aai.esr.util.ExtsysUtil;
-import org.onap.aai.esr.util.RestResponseUtil;
 import org.onap.aai.esr.wrapper.EmsManagerWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;  
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -45,16 +41,18 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+@SwaggerDefinition
 @Path("/emses")
 @Api(tags = {" ems Management "})
 public class EmsManager {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(EmsManager.class);
 
+  private static ExtsysUtil extsysUtil = new ExtsysUtil();
+  
   /**
    * query all ems.
    */
-  @Path("")
   @GET
   @ApiOperation(value = "get  all ems ")
   @Produces(MediaType.APPLICATION_JSON)
@@ -126,17 +124,16 @@ public class EmsManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response updateEms(@ApiParam(value = "ems", required = true) EmsRestData ems,
+  public Response updateEms(@ApiParam(value = "ems", required = true) EmsRegisterInfo ems,
       @ApiParam(value = "ems id", required = true) @PathParam("emsId") String emsId) {
-    LOGGER.info("start update ems .id:" + emsId + " info:" + ExtsysUtil.objectToString(ems));
-    return RestResponseUtil.getSuccessResponse(new EmsRestData());
+    LOGGER.info("start update ems .id:" + emsId + " info:" + extsysUtil.objectToString(ems));
+    return EmsManagerWrapper.getInstance().updateEms(ems, emsId);
   }
   
   /**
    * register ems.
    */
   @POST
-  @Path("")
   @Consumes(MediaType.APPLICATION_JSON)
   @Produces({MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON})
   @ApiOperation(value = "create a ems")
@@ -148,8 +145,8 @@ public class EmsManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response registerEms(@ApiParam(value = "ems", required = true) EmsRestData ems) {
-    LOGGER.info("start add ems" + " info:" + ExtsysUtil.objectToString(ems));
+  public Response registerEms(@ApiParam(value = "ems", required = true) EmsRegisterInfo ems) {
+    LOGGER.info("start add ems" + " info:" + extsysUtil.objectToString(ems));
     return EmsManagerWrapper.getInstance().registerEms(ems);
   }
 }