Mass-convert all compontents to use -no-zone addresses

[bgpcep.git] / bmp / bmp-impl / src / main / java / org / opendaylight / protocol / bmp / impl / app / KeyConstructorUtil.java

diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/KeyConstructorUtil.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/KeyConstructorUtil.java
index c88f71ecf32ebd6f9d17821d5816a7ca776df647..72972bb60c7da2b1629ba7d5eed0828bacf2137e 100644 (file)
--- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/KeyConstructorUtil.java
+++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/KeyConstructorUtil.java
@@ -12,13 +12,12 @@ import java.util.List;
 import java.util.Objects;
 import org.opendaylight.protocol.concepts.KeyMapping;
 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.bmp.monitor.config.rev170517.odl.bmp.monitors.bmp.monitor.config.MonitoredRouter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.monitor.config.rev180329.odl.bmp.monitors.bmp.monitor.config.MonitoredRouter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.rfc2385.cfg.rev160324.Rfc2385Key;
 
 public final class KeyConstructorUtil {
-
     private KeyConstructorUtil() {
-        throw new UnsupportedOperationException();
+        // Hidden on purpose
     }
 
     public static KeyMapping constructKeys(final List<MonitoredRouter> mrs) {
@@ -27,7 +26,7 @@ public final class KeyConstructorUtil {
             mrs.stream().filter(Objects::nonNull).filter(KeyConstructorUtil::isNotNullorEmpty)
                 .forEach(mr -> {
                     final Rfc2385Key rfc2385KeyPassword = mr.getPassword();
-                    ret.put(IetfInetUtil.INSTANCE.inetAddressFor(mr.getAddress()),
+                    ret.put(IetfInetUtil.INSTANCE.inetAddressForNoZone(mr.getAddress()),
                         rfc2385KeyPassword.getValue().getBytes(StandardCharsets.US_ASCII));
                 });
         }