Merge "Resolve the Bug GSO-9"
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 113693c..0a70850 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
@@ -64,7 +64,7 @@
if(StringUtils.isEmpty(reqContent))
{
LOGGER.error("ServiceGatewayImpl createService reqContent is null.");
- return null;
+ throw new ServiceException("ServiceGatewayImpl createService reqContent is null.");
}
// Parse request
@@ -128,6 +128,11 @@
*/
@Override
public void deleteService(String serviceId, HttpServletRequest httpRequest) throws ServiceException {
+ if(httpRequest == null)
+ {
+ LOGGER.error("ServiceGatewayImpl.deleteService httpRequest is null");
+ throw new ServiceException("ServiceGatewayImpl.deleteService httpRequest is null");
+ }
// Parse request
String reqContent = RestUtils.getRequestBody(httpRequest);
Map<String, Object> requestBody = JsonUtil.unMarshal(reqContent, Map.class);
diff --git a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImplTest.java b/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImplTest.java
index adbcd75..4fd620c 100644
--- a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImplTest.java
+++ b/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImplTest.java
@@ -122,6 +122,8 @@
*/
@Test
public void testDeleteService() throws ServiceException {
+ mockGetRequestBody(FILE_PATH + "createServiceInstance.json");
+ mockPost(responseSuccess);
serviceRoa.deleteService("1", httpRequest);
}
diff --git a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImplTest.java b/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImplTest.java
index fddebe0..d1cb391 100644
--- a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImplTest.java
+++ b/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImplTest.java
@@ -65,7 +65,7 @@
* @since GSO 0.5
*/
@Test(expected = ServiceException.class)
- public void testDeleteServiceFail() throws ServiceException {
+ public void testDeleteServiceFail() throws ServiceException {
serviceManager.deleteService(null, httpRequest);
}