Adjust to odlparent 3 Checkstyle settings

[genius.git] / resourcemanager / resourcemanager-impl / src / main / java / org / opendaylight / genius / resourcemanager / ResourceManagerUtils.java

diff --git a/resourcemanager/resourcemanager-impl/src/main/java/org/opendaylight/genius/resourcemanager/ResourceManagerUtils.java b/resourcemanager/resourcemanager-impl/src/main/java/org/opendaylight/genius/resourcemanager/ResourceManagerUtils.java
index 0e45a5a1ef8afcbbe53aa94c17831ce1c00eaa63..3faf3c92fae56237f7970c5eccb41b70299f815e 100644 (file)
--- a/resourcemanager/resourcemanager-impl/src/main/java/org/opendaylight/genius/resourcemanager/ResourceManagerUtils.java
+++ b/resourcemanager/resourcemanager-impl/src/main/java/org/opendaylight/genius/resourcemanager/ResourceManagerUtils.java
@@ -10,7 +10,6 @@ package org.opendaylight.genius.resourcemanager;
 import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdPools;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.id.pools.IdPool;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.id.pools.IdPoolKey;
@@ -18,29 +17,28 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class ResourceManagerUtils {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ResourceManagerUtils.class);
+final class ResourceManagerUtils {
+    private static final Logger LOG = LoggerFactory.getLogger(ResourceManagerUtils.class);
 
-    private static int BLADE_ID;
+    private static Integer localHostAddress;
 
-    static {
-        try {
-            BLADE_ID = InetAddresses.coerceToInteger(InetAddress.getLocalHost());
-        } catch (UnknownHostException e) {
-            LOGGER.error("ResourceManager - Exception - {}", e.getMessage());
-        }
+    private ResourceManagerUtils() {
     }
 
     protected static InstanceIdentifier<IdPool> getIdPoolInstance(String poolName) {
-        InstanceIdentifier.InstanceIdentifierBuilder<IdPool> idPoolBuilder = InstanceIdentifier
-                .builder(IdPools.class).child(IdPool.class,
-                        new IdPoolKey(poolName));
-        InstanceIdentifier<IdPool> id = idPoolBuilder.build();
-        return id;
+        InstanceIdentifier.InstanceIdentifierBuilder<IdPool> idPoolBuilder = InstanceIdentifier.builder(IdPools.class)
+                .child(IdPool.class, new IdPoolKey(poolName));
+        return idPoolBuilder.build();
     }
 
     protected static String getLocalPoolName(String poolName) {
-        return (poolName + "." + BLADE_ID);
+        if (localHostAddress == null) {
+            try {
+                localHostAddress = InetAddresses.coerceToInteger(InetAddress.getLocalHost());
+            } catch (UnknownHostException e) {
+                LOG.error("Cannot build the local pool name: ", e);
+            }
+        }
+        return poolName + "." + localHostAddress;
     }
-
 }