Fix the sonar detected error

Issue-ID:HOLMES-50

Change-Id: Ia43c44cf70f6a0ac99592e4e302fda5f123cfc4f
Signed-off-by: youbowu <wu.youbo@zte.com.cn>

diff --git a/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java b/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java
index da62a22..b96303a 100644 (file)
--- a/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java
+++ b/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java
@@ -72,13 +72,7 @@ public class EngineService {
             }\r
             return httpClient.execute(httpPost);\r
         } finally {\r
-            if (httpClient != null) {\r
-                try {\r
-                    httpClient.close();\r
-                } catch (IOException e) {\r
-                    e.printStackTrace();\r
-                }\r
-            }\r
+            httpClient.close();\r
         }\r
     }\r
 \r
@@ -92,13 +86,7 @@ public class EngineService {
             }\r
             return httpClient.execute(httpPut);\r
         } finally {\r
-            if (httpClient != null) {\r
-                try {\r
-                    httpClient.close();\r
-                } catch (IOException e) {\r
-                    e.printStackTrace();\r
-                }\r
-            }\r
+            httpClient.close();\r
         }\r
     }\r
 \r
@@ -109,13 +97,7 @@ public class EngineService {
             setHeader(httpDelete);\r
             return httpClient.execute(httpDelete);\r
         } finally {\r
-            if (httpClient != null) {\r
-                try {\r
-                    httpClient.close();\r
-                } catch (IOException e) {\r
-                    e.printStackTrace();\r
-                }\r
-            }\r
+            httpClient.close();\r
         }\r
     }\r
 \r

diff --git a/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineServiceTest.java b/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineServiceTest.java
index d911f9c..596a408 100644 (file)
--- a/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineServiceTest.java
+++ b/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineServiceTest.java
@@ -18,15 +18,15 @@
 package org.openo.holmes.rulemgt.bolt.enginebolt;\r
 \r
 \r
-import org.apache.http.HttpEntity;\r
 import org.apache.http.HttpResponse;\r
-import org.apache.http.client.HttpClient;\r
 import org.easymock.EasyMock;\r
 import org.junit.Before;\r
 import org.junit.Rule;\r
 import org.junit.Test;\r
 import org.junit.rules.ExpectedException;\r
 import org.openo.holmes.rulemgt.RuleAppConfig;\r
+import org.openo.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;\r
+import org.openo.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;\r
 import org.powermock.api.easymock.PowerMock;\r
 import org.powermock.modules.junit4.rule.PowerMockRule;\r
 import org.powermock.reflect.Whitebox;\r
@@ -38,18 +38,18 @@ public class EngineServiceTest {
     @Rule\r
     public PowerMockRule powerMockRule = new PowerMockRule();\r
     private EngineService engineService;\r
-    private HttpEntity httpEntityMock;\r
     private HttpResponse httpResponseMock;\r
-    private HttpClient httpClient;\r
     private RuleAppConfig ruleAppConfig = new RuleAppConfig();\r
+    private CorrelationDeployRule4Engine correlationDeployRule4Engine;\r
 \r
     @Before\r
     public void setUp() {\r
         engineService = new EngineService();\r
-        httpEntityMock = PowerMock.createMock(HttpEntity.class);\r
         httpResponseMock = PowerMock.createMock(HttpResponse.class);\r
-        httpClient = PowerMock.createMock(HttpClient.class);\r
         Whitebox.setInternalState(engineService, "ruleAppConfig", ruleAppConfig);\r
+        correlationDeployRule4Engine = new CorrelationDeployRule4Engine();\r
+        correlationDeployRule4Engine.setContent("{\"package\":\"test\"}");\r
+        correlationDeployRule4Engine.setEngineId("engine_id");\r
     }\r
 \r
     @Test\r
@@ -61,4 +61,29 @@ public class EngineServiceTest {
 \r
         PowerMock.verifyAll();\r
     }\r
+\r
+    @Test\r
+    public void delete_exception() throws Exception {\r
+        thrown.expect(Exception.class);\r
+\r
+        engineService.delete("test");\r
+\r
+    }\r
+\r
+    @Test\r
+    public void deploy_exception() throws Exception {\r
+\r
+        thrown.expect(Exception.class);\r
+\r
+        engineService.deploy(correlationDeployRule4Engine);\r
+\r
+    }\r
+\r
+    @Test\r
+    public void check_normal() throws Exception {\r
+        thrown.expect(Exception.class);\r
+\r
+        engineService.check(new CorrelationCheckRule4Engine());\r
+\r
+    }\r
 }
\ No newline at end of file