Merge 0fa6901 into 1154443

lightblue-platform · Sep 6, 2017 · fb0a578 · fb0a578
2 parents 1154443 + 0fa6901
commit fb0a578
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/LdapCRUDController.java b/lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/LdapCRUDController.java
@@ -18,6 +18,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -535,21 +536,17 @@ private abstract class ExecutionHandler {
     public CRUDHealth checkHealth() {
         boolean isHealthy = true;
         Map<String, Object> ldapConnnectionsStatus = dbResolver.getLDAPConnectionsStatus();
-        List<String> details = new ArrayList<>(ldapConnnectionsStatus.size());
+        Map<String, Object> details = new LinkedHashMap<>();
 
         for (Map.Entry<String, Object> connectionStatus : ldapConnnectionsStatus.entrySet()) {
-
             if (connectionStatus.getValue() instanceof LDAPException) {
                 isHealthy = false;
-                details.add(new StringBuilder("LDAPConnection [DatabaseName: ").append(connectionStatus.getKey())
-                        .append(", Status: ").append(connectionStatus.getValue()).toString());
+                details.put(connectionStatus.getKey(), connectionStatus.getValue());
             } else {
                 isHealthy = (Boolean) connectionStatus.getValue();
-
-                details.add(new StringBuilder("LDAPConnection [DatabaseName: ").append(connectionStatus.getKey())
-                        .append(", Status: ").append(connectionStatus.getValue()).toString());
+                details.put(connectionStatus.getKey(), connectionStatus.getValue());
             }
         }
-        return new CRUDHealth(isHealthy, details.toString());
+        return new CRUDHealth(isHealthy, details);
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
         <rpm.name>lightblue-ldap</rpm.name>
         <rpm.install.basedir>/usr/share/java/lightblue/lightblue-ldap</rpm.install.basedir>
 
-        <lightblue.core.version>2.10.0-SNAPSHOT</lightblue.core.version>
+        <lightblue.core.version>2.12.0-SNAPSHOT</lightblue.core.version>
         <lightblue.mongo.version>1.29.0-SNAPSHOT</lightblue.mongo.version>
     </properties>