From cddbebf090d52a234e536bef5f7e6dbd6ddcc9e0 Mon Sep 17 00:00:00 2001 From: Luji7 Date: Wed, 19 Oct 2016 17:52:42 +0800 Subject: GSO-26 Fix the wrong url sent to service gateway. Modify the codes for deleting service to be consistent with the api. Change-Id: If9242f8c956d5e93f49c4359a959343ed34cfefb Signed-off-by: Luji7 --- .../servicegateway/roa/inf/IServiceGatewayRoaModule.java | 5 ++--- .../gui/servicegateway/service/impl/ServiceGatewayImpl.java | 13 ++++--------- 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'servicegateway') diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java index 302b2bd9..0e8b03ce 100644 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java +++ b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java @@ -18,7 +18,6 @@ package org.openo.gso.gui.servicegateway.roa.inf; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; @@ -63,10 +62,10 @@ public interface IServiceGatewayRoaModule { * @throws ServiceException when operate database or parameter is wrong. * @since GSO 0.5 */ - @DELETE + @POST @Produces({"application/json"}) @Consumes({"application/json"}) - @Path("/{serviceId}") + @Path("/{serviceId}/terminate") Response deleteService(@PathParam("serviceId") String serviceId, @Context HttpServletRequest servletReq) throws ServiceException; diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java index c3dee4a3..3ff4f89b 100644 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java +++ b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java @@ -139,21 +139,16 @@ public class ServiceGatewayImpl implements IServiceGateway { // Parse request String reqContent = RestUtils.getRequestBody(httpRequest); Map requestBody = JsonUtil.unMarshal(reqContent, Map.class); - Map service = (Map)requestBody.get(Constant.SERVICE_INDENTIFY); - if(null == service) - { - service = requestBody; - } ValidateUtil.assertObjectNotNull(requestBody); // Validate data - String gatewayUri = (String)service.get(Constant.SERVICE_GATEWAY_URI); + String gatewayUri = (String)requestBody.get(Constant.SERVICE_GATEWAY_URI); ValidateUtil.assertStringNotNull(gatewayUri); - service.remove(Constant.SERVICE_GATEWAY_URI); + requestBody.remove(Constant.SERVICE_GATEWAY_URI); - String operation = (String) service.get(Constant.SERVICE_OPERATION); + String operation = (String) requestBody.get(Constant.SERVICE_OPERATION); ValidateUtil.assertStringNotNull(operation); - service.remove(Constant.SERVICE_OPERATION); + requestBody.remove(Constant.SERVICE_OPERATION); // call the restful try { -- cgit 1.2.3-korg