Fixed some bugs

Issue-ID: HOLMES-488
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I7f113a7f4d753c3c3e8d1f780e00c5fce9aab3de

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 6d139f0..bab5cef 100644 (file)
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -12,7 +12,7 @@
     <parent>\r
         <groupId>org.onap.holmes.common</groupId>\r
         <artifactId>holmes-common-parent</artifactId>\r
-        <version>1.3.7-SNAPSHOT</version>\r
+        <version>1.3.8-SNAPSHOT</version>\r
     </parent>\r
 \r
     <name>holmes-common-service</name>\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
index 97c7141..191d897 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
@@ -24,7 +24,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;\r
 \r
 import static org.onap.holmes.common.utils.CommonUtils.getEnv;\r
-import static org.onap.holmes.common.utils.CommonUtils.isIpAddress;\r
 \r
 public class MicroServiceConfig {\r
 \r
@@ -97,22 +96,14 @@ public class MicroServiceConfig {
     }\r
 \r
     public static String[] getMicroServiceIpAndPort() {\r
-        String[] serviceAddrInfo = null;\r
-        String info = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(HOSTNAME));\r
-        log.info("Got the service information of \"" + getEnv(HOSTNAME) + "\" from Consul. The response is " + info + ".");\r
-\r
-        if (info != null && !info.isEmpty()) {\r
-            if (!isIpAddress(info)) {\r
-                info = getEnv(POD_IP);\r
-            }\r
-            serviceAddrInfo = split(info);\r
+        String info = getEnv(POD_IP);\r
+        if (info != null) {\r
+            return split(info);\r
         } else {\r
-            serviceAddrInfo = split(getEnv(HOSTNAME));\r
+            return split(getEnv(HOSTNAME));\r
         }\r
-        return serviceAddrInfo;\r
     }\r
 \r
-\r
     private static String[] split(String addr) {\r
         String ip;\r
         String port = "80";\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationQuery.java b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationQuery.java
index 4f8a0a5..2c963d8 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationQuery.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationQuery.java
@@ -20,6 +20,7 @@ import org.onap.holmes.common.dcae.entity.DcaeConfigurations;
 import org.onap.holmes.common.dcae.utils.DcaeConfigurationParser;
 import org.onap.holmes.common.exception.CorrelationException;
 
+@Deprecated
 public class DcaeConfigurationQuery {
 
     public static DcaeConfigurations getDcaeConfigurations(String hostname)

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/FileUtils.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/FileUtils.java
index cf5de1c..a512c83 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/FileUtils.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/FileUtils.java
@@ -27,6 +27,7 @@ import java.io.IOException;
 public class FileUtils {
 
     final static private Logger LOGGER = LoggerFactory.getLogger(FileUtils.class);
+    final static private String LINE_SEPARATOR = System.getProperty ("line.separator");
 
     static public String readTextFile(String path) {
         try {
@@ -34,9 +35,9 @@ public class FileUtils {
             StringBuilder sb = new StringBuilder();
             String line;
             while ((line = br.readLine()) != null) {
-                sb.append(line);
+                sb.append(line).append(LINE_SEPARATOR);
             }
-            return sb.toString();
+            return sb.substring(0, sb.length() - 1);
         } catch (FileNotFoundException e) {
             LOGGER.warn("No file found: {}", path);
         } catch (IOException e) {

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/JerseyClient.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/JerseyClient.java
index 871ffad..cfb601a 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/JerseyClient.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/JerseyClient.java
@@ -197,12 +197,14 @@ public class JerseyClient {
     private boolean isSuccessful(Response response, String url) {
         Response.StatusType statusInfo = response.getStatusInfo();
         if (statusInfo.getFamily() != Response.Status.Family.SUCCESSFUL) {
-            throw new HttpException(statusInfo.getStatusCode(),
-                    String.format("Failed to get response from the server. " +
+            logger.error(
+                    String.format("Failed to get response from the server <%d>. " +
                                     "\nURL: %s\nCause: %s\nResponse body: %s",
+                            statusInfo.getStatusCode(),
                             url,
                             statusInfo.getReasonPhrase(),
                             response.readEntity(String.class)));
+            return false;
         }
         return true;
     }

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
index dd0c71a..3e28464 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
@@ -74,8 +74,6 @@ public class MicroServiceConfigTest {
 \r
     @Test\r
     public void getServiceIpTest() {\r
-        mockGet(null);\r
-\r
         String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
         String hostname = String.format("http://%s", ip);\r
         System.setProperty(HOSTNAME, hostname);\r
@@ -98,7 +96,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getConfigBindingServiceAddrInfoTest_consul_not_exist() throws Exception {\r
+    public void getConfigBindingServiceAddrInfoTest_consul_not_exist() {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
 \r
         mockGet(null);\r
@@ -113,7 +111,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists() throws Exception {\r
+    public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists() {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
         mockGet("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]");\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
@@ -130,7 +128,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() throws Exception {\r
+    public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
 \r
@@ -148,7 +146,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() throws Exception {\r
+    public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
 \r
@@ -178,7 +176,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists_service_not_exist() throws Exception {\r
+    public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists_service_not_exist() {\r
         mockGet("[]");\r
 \r
         PowerMock.replayAll();\r
@@ -189,7 +187,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Ignore\r
-    public void getMsbAddrInfo_msb_registered() throws Exception {\r
+    public void getMsbAddrInfo_msb_registered() {\r
         System.setProperty(MSB_IAG_SERVICE_HOST, "10.74.5.8");\r
         System.setProperty(MSB_IAG_SERVICE_PORT, "1545");\r
         System.setProperty(HOSTNAME, "rule-mgmt");\r
@@ -210,7 +208,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Ignore\r
-    public void getMsbAddrInfo_msb_not_registered() throws Exception {\r
+    public void getMsbAddrInfo_msb_not_registered() {\r
         System.setProperty(MSB_IAG_SERVICE_HOST, "10.74.5.8");\r
         System.setProperty(MSB_IAG_SERVICE_PORT, "1545");\r
         System.setProperty(HOSTNAME, "rule-mgmt");\r
@@ -231,49 +229,12 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getMicroServiceIpAndPort_service_registered_to_consul() throws Exception {\r
-        System.setProperty(HOSTNAME, "rule-mgmt");\r
-\r
-        mockGet("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]");\r
-\r
-        PowerMock.replayAll();\r
-        String[] msbInfo = getMicroServiceIpAndPort();\r
-        PowerMock.verifyAll();\r
-\r
-        assertThat(msbInfo[0], equalTo("127.0.0.3"));\r
-        assertThat(msbInfo[1], equalTo("5432"));\r
-\r
-        System.clearProperty(HOSTNAME);\r
-    }\r
-\r
-    @Test\r
-    public void getMicroServiceIpAndPort_service_not_registered_to_consul() throws Exception {\r
-        String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
-        String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
-        String hostname = String.format("http://%s:%s", ip, port);\r
-        System.setProperty(HOSTNAME, hostname);\r
-\r
-        mockGet("[]");\r
-\r
-        PowerMock.replayAll();\r
-        String[] msbInfo = getMicroServiceIpAndPort();\r
-        PowerMock.verifyAll();\r
-\r
-        assertThat(msbInfo[0], equalTo(ip));\r
-        assertThat(msbInfo[1], equalTo(port));\r
-\r
-        System.clearProperty(HOSTNAME);\r
-    }\r
-\r
-    @Test\r
-    public void getMicroServiceIpAndPort_service_not_registered_full_addr() throws Exception {\r
+    public void getMicroServiceIpAndPort_full_addr() {\r
         String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
         String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
         String hostname = String.format("http://%s:%s", ip, port);\r
         System.setProperty(HOSTNAME, hostname);\r
 \r
-        mockGet("{}");\r
-\r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r
@@ -285,13 +246,11 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getMicroServiceIpAndPort_service_not_registered_no_port() throws Exception {\r
+    public void getMicroServiceIpAndPort_no_port() {\r
         String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
         String hostname = String.format("http://%s", ip);\r
         System.setProperty(HOSTNAME, hostname);\r
 \r
-        mockGet("{}");\r
-\r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r
@@ -303,32 +262,12 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getMicroServiceIpAndPort_service_not_registered_only_ip() throws Exception {\r
-        String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
-        String hostname = String.format("http://%s", ip);\r
-        System.setProperty(HOSTNAME, hostname);\r
-\r
-        mockGet("{}");\r
-\r
-        PowerMock.replayAll();\r
-        String[] msbInfo = getMicroServiceIpAndPort();\r
-        PowerMock.verifyAll();\r
-\r
-        assertThat(msbInfo[0], equalTo(ip));\r
-        assertThat(msbInfo[1], equalTo("80"));\r
-\r
-        System.clearProperty(HOSTNAME);\r
-    }\r
-\r
-    @Test\r
-    public void getMicroServiceIpAndPort_service_not_registered_full_addr_https() throws Exception {\r
+    public void getMicroServiceIpAndPort_full_addr_https() {\r
         String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
         String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
         String hostname = String.format("http://%s:%s", ip, port);\r
         System.setProperty(HOSTNAME, hostname);\r
 \r
-        mockGet("[]");\r
-\r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java
index b0b5714..ef4b3db 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java
@@ -37,20 +37,16 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.nullValue;
 import static org.junit.Assert.assertThat;
 
 @RunWith(PowerMockRunner.class)
 @PowerMockIgnore({"javax.net.ssl.*", "javax.security.*"})
 public class JerseyClientTest {
 
-    private final String ERROR_MSG = "Failed to get response from the server. \nURL: http://www.onap.org/holmes/test" +
-            "\nCause: Not Found\nResponse body: Error";
     private JerseyClient jerseyClient = JerseyClient.newInstance();
     private String url = "http://www.onap.org/holmes/test";
 
-    @Rule
-    private ExpectedException exception = ExpectedException.none();
-
     @Test
     public void get_normal() {
         Client mockedClient = PowerMock.createMock(Client.class);
@@ -134,18 +130,14 @@ public class JerseyClientTest {
         EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
         EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
         EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse);
-        EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
         EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND);
         EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
 
         WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
 
-        exception.expect(HttpException.class);
-        exception.expectMessage(ERROR_MSG);
-
         PowerMock.replayAll();
 
-        jerseyClient.get(url);
+        assertThat(jerseyClient.get(url), nullValue());
 
         PowerMock.verifyAll();
     }
@@ -182,18 +174,14 @@ public class JerseyClientTest {
         EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
         EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
         EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse);
-        EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
         EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND);
         EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
 
         WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
 
-        exception.expect(HttpException.class);
-        exception.expectMessage(ERROR_MSG);
-
         PowerMock.replayAll();
 
-        jerseyClient.post(url);
+        assertThat(jerseyClient.post(url), nullValue());
 
         PowerMock.verifyAll();
     }
@@ -300,18 +288,14 @@ public class JerseyClientTest {
         EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
         EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
         EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse);
-        EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
         EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND);
         EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
 
         WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
 
-        exception.expect(HttpException.class);
-        exception.expectMessage(ERROR_MSG);
-
         PowerMock.replayAll();
 
-        jerseyClient.put(url, null, null);
+        assertThat(jerseyClient.put(url, null, null), nullValue());
 
         PowerMock.verifyAll();
     }
@@ -394,18 +378,14 @@ public class JerseyClientTest {
         EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
         EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
         EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse);
-        EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
         EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND);
         EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
 
         WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
 
-        exception.expect(HttpException.class);
-        exception.expectMessage(ERROR_MSG);
-
         PowerMock.replayAll();
 
-        jerseyClient.delete(url);
+        assertThat(jerseyClient.delete(url), nullValue());
 
         PowerMock.verifyAll();
     }

diff --git a/pom.xml b/pom.xml
index 49abd54..fc15021 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <artifactId>holmes-common-parent</artifactId>\r
     <packaging>pom</packaging>\r
 \r
-    <version>1.3.7-SNAPSHOT</version>\r
+    <version>1.3.8-SNAPSHOT</version>\r
     <name>holmes-common</name>\r
     <modules>\r
         <module>holmes-actions</module>\r

diff --git a/version.properties b/version.properties
index a3cf818..012c041 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 \r
 major=1\r
 minor=3\r
-patch=7\r
+patch=8\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r