Merge "change to java 8 lambda"

3 files changed, 21 insertions, 35 deletions

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java
index 9b30705..2e91993 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java
@@ -51,33 +51,24 @@ public class EngineIpList {
     }
 
     public List<String> getServiceCount()throws Exception{
-        String response;
-        CloseableHttpClient httpClient = null;
-        HttpGet httpGet = new HttpGet(url);
-        try {
-            httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT);
-            HttpResponse httpResponse = HttpsUtils
-                    .get(httpGet, new HashMap<>(), httpClient);
-            response = HttpsUtils.extractResponseEntity(httpResponse);
-        } catch (Exception e) {
-            throw e;
-        } finally {
-            httpGet.releaseConnection();
-            if (httpClient != null) {
-                try {
-                    httpClient.close();
-                } catch (IOException e) {
-                    log.warn("Failed to close http client!");
-                }
-            }
-        }
-        ServiceEntity service = GsonUtil.jsonToBean(response, ServiceEntity.class);
-        List<ServiceNode4Query> nodesList = service.getNodes();
-        List<String> ipList = new ArrayList<>();
-        for(ServiceNode4Query node : nodesList){
-            ipList.add(node.getIp());
-        }
-        return ipList;
+		String response;
+		HttpGet httpGet = new HttpGet(url);
+		try (CloseableHttpClient httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT)) {
+			HttpResponse httpResponse = HttpsUtils.get(httpGet, new HashMap<>(), httpClient);
+			response = HttpsUtils.extractResponseEntity(httpResponse);
+		} catch (Exception e) {
+			throw e;
+		} finally {
+			httpGet.releaseConnection();
+
+		}
+		ServiceEntity service = GsonUtil.jsonToBean(response, ServiceEntity.class);
+		List<ServiceNode4Query> nodesList = service.getNodes();
+		List<String> ipList = new ArrayList<>();
+		for (ServiceNode4Query node : nodesList) {
+			ipList.add(node.getIp());
+		}
+		return ipList;
 
     }
 
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/send/Ip4AddingRule.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/send/Ip4AddingRule.java
index e224bb5..4a2dba3 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/send/Ip4AddingRule.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/send/Ip4AddingRule.java
@@ -38,7 +38,7 @@ public class Ip4AddingRule {
 
     public String getEngineIp4AddRule() {
         List<CorrelationRule> ipRuleList  = new ArrayList<>();
-        LinkedHashMap<String,Integer> linkedHashMap = new LinkedHashMap();
+        LinkedHashMap<String,Integer> linkedHashMap = new LinkedHashMap<>();
 
         try{
             for(String ip : engineService){
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/send/RuleAllocation.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/send/RuleAllocation.java
index 75f0a08..9e7b5b2 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/send/RuleAllocation.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/send/RuleAllocation.java
@@ -193,13 +193,8 @@ public class RuleAllocation {
             log.error("getEngineIp4AddRule failed !", e);
         }
 
-        List<Map.Entry<String, String>> list_Data = new ArrayList<Map.Entry<String, String>>(hashMap.entrySet());
-        Collections.sort(list_Data, new Comparator<Map.Entry<String, String>>() {
-            public int compare(Map.Entry<String, String> o1, Map.Entry<String, String> o2) {
-                return o1.getValue().compareTo(o2.getValue());
-            }
-        });
-
+        List<Map.Entry<String, String>> list_Data = new ArrayList<>(hashMap.entrySet());
+        Collections.sort(list_Data,(o1,o2) -> o1.getValue().compareTo(o2.getValue()));
         List<String> needList = new ArrayList<>();
         for (Map.Entry<String, String> map : list_Data) {
             String key = map.getKey();