KeyMapping rework

[bgpcep.git] / pcep / topology-provider / src / main / java / org / opendaylight / bgpcep / pcep / topology / provider / config / PCEPTopologyProviderUtil.java

diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java
index f8b705e93161a9e28393f10cb069e0fa8317d5d2..456333f9ff957e536a8b96ebc19f0e32c79985b8 100644 (file)
--- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java
+++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java
@@ -7,41 +7,30 @@
  */
 package org.opendaylight.bgpcep.pcep.topology.provider.config;
 
-import com.google.common.base.Optional;
-import com.google.common.net.InetAddresses;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import org.opendaylight.controller.config.yang.pcep.topology.provider.Client;
 import org.opendaylight.protocol.concepts.KeyMapping;
-import org.opendaylight.protocol.util.Ipv4Util;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.rfc2385.cfg.rev160324.Rfc2385Key;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public final class PCEPTopologyProviderUtil {
-    private static final Logger LOG = LoggerFactory.getLogger(PCEPTopologyProviderUtil.class);
-
     private PCEPTopologyProviderUtil() {
         throw new UnsupportedOperationException();
     }
 
-    public static Optional<KeyMapping> contructKeys(final List<Client> clients) {
-        KeyMapping ret = null;
+    public static KeyMapping contructKeys(final List<Client> clients) {
+        final KeyMapping ret = KeyMapping.getKeyMapping();
 
-        if (clients != null && !clients.isEmpty()) {
-            ret = KeyMapping.getKeyMapping();
-            for (final Client c : clients) {
-                if (c.getAddress() == null) {
-                    LOG.warn("Client {} does not have an address skipping it", c);
-                    continue;
-                }
-                final Rfc2385Key rfc2385KeyPassword = c.getPassword();
-                if (rfc2385KeyPassword != null && !rfc2385KeyPassword.getValue().isEmpty()) {
-                    final String s = Ipv4Util.toStringIP(c.getAddress());
-                    ret.put(InetAddresses.forString(s), rfc2385KeyPassword.getValue().getBytes(StandardCharsets.US_ASCII));
-                }
-            }
+        if (clients != null) {
+            clients.stream().filter(client -> client != null && client.getPassword() != null &&
+                !client.getPassword().getValue().isEmpty())
+                .forEach(mr -> {
+                    final Rfc2385Key rfc2385KeyPassword = mr.getPassword();
+                    ret.put(IetfInetUtil.INSTANCE.inetAddressFor(mr.getAddress()),
+                        rfc2385KeyPassword.getValue().getBytes(StandardCharsets.US_ASCII));
+                });
         }
-        return Optional.fromNullable(ret);
+        return ret;
     }
 }