bugfix - IndexOutOfBoundsException in MicroServiceConfig

Change-Id: Id37eaee21a164f26c89a3ef890054e7b5f2718f8
Issue-ID: HOLMES-442
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

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 7cbbb3e..7566fa1 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
@@ -1,5 +1,5 @@
 /**\r
- * Copyright  2017-2020 ZTE Corporation.\r
+ * Copyright  2017-2021 ZTE Corporation.\r
  * <p>\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -15,6 +15,7 @@
  */\r
 package org.onap.holmes.common.config;\r
 \r
+import com.google.gson.JsonArray;\r
 import com.google.gson.JsonObject;\r
 import com.google.gson.JsonParser;\r
 import org.onap.holmes.common.constant.AlarmConst;\r
@@ -59,14 +60,16 @@ public class MicroServiceConfig {
         String queryString = getConsulAddrInfo() + hostname;\r
         log.info("Query the " + hostname + " address using the URL: " + queryString);\r
         try {\r
-            JsonObject addrJson = JsonParser.parseString(execQuery(queryString))\r
-                    .getAsJsonArray()\r
-                    .get(0)\r
-                    .getAsJsonObject();\r
-            if (addrJson != null && addrJson.get("ServiceAddress") != null\r
-                    && addrJson.get("ServicePort") != null) {\r
-                ret = "http://" + addrJson.get("ServiceAddress").getAsString() + ":" + addrJson\r
-                        .get("ServicePort").getAsString();\r
+            JsonArray addrArray = JsonParser.parseString(execQuery(queryString)).getAsJsonArray();\r
+            if (addrArray.size() > 0) {\r
+                JsonObject addrJson = addrArray.get(0).getAsJsonObject();\r
+                if (addrJson != null && addrJson.get("ServiceAddress") != null\r
+                        && addrJson.get("ServicePort") != null) {\r
+                    ret = "http://" + addrJson.get("ServiceAddress").getAsString() + ":" + addrJson\r
+                            .get("ServicePort").getAsString();\r
+                }\r
+            } else {\r
+                log.info("No service info is returned from DCAE Consul. Hostname: {}", hostname);\r
             }\r
         } catch (Exception e) {\r
             log.warn(e.getMessage(), e);\r
@@ -107,7 +110,7 @@ public class MicroServiceConfig {
     }\r
 \r
     public static String[] getMsbIpAndPort() {\r
-        return new String[] {getEnv(MSB_IAG_SERVICE_HOST), getEnv(MSB_IAG_SERVICE_PORT)};\r
+        return new String[]{getEnv(MSB_IAG_SERVICE_HOST), getEnv(MSB_IAG_SERVICE_PORT)};\r
     }\r
 \r
     public static String[] getMicroServiceIpAndPort() {\r

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 fbc22e5..316f09f 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
@@ -119,7 +119,26 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getConfigBindingServiceAddrInfoTest_consul_exists_propertie_not_exist() throws Exception {\r
+    public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() throws Exception {\r
+        System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
+        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
+        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
+                .andReturn("[]");\r
+        System.setProperty(CONSUL_HOST, "127.0.0.1");\r
+\r
+        PowerMock.replayAll();\r
+\r
+        assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)),\r
+                is(nullValue()));\r
+\r
+        PowerMock.verifyAll();\r
+\r
+        System.clearProperty(CONSUL_HOST);\r
+        System.clearProperty(CONFIG_BINDING_SERVICE);\r
+    }\r
+\r
+    @Test\r
+    public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() throws Exception {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
         PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
         PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r