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

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

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java
index b3198f253c4e38d97ce9e0b21be3ee433344125b..8d1368e2bffd3bf1ec551dd554783be4e1b7d435 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java
@@ -12,46 +12,40 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.protocol.pcep.SpeakerIdMapping;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.rfc2385.cfg.rev160324.Rfc2385Key;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.config.rev171025.PcepNodeConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.TopologyTypes1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.sync.optimizations.config.rev171025.PcepNodeSyncConfig;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.config.rev181109.PcepNodeConfig;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.TopologyTypes1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.sync.optimizations.config.rev181109.PcepNodeSyncConfig;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypes;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 final class PCEPTopologyProviderUtil {
-
-    private static final Logger LOG = LoggerFactory.getLogger(PCEPTopologyProviderUtil.class);
-
-    private static final long TIMEOUT_NS = TimeUnit.SECONDS.toNanos(5);
-
     private PCEPTopologyProviderUtil() {
-        throw new UnsupportedOperationException();
+        // Hidden on purpose
     }
 
-    static KeyMapping contructKeys(@Nonnull final Topology topology) {
+    static KeyMapping contructKeys(final @NonNull Topology topology) {
         final KeyMapping ret = KeyMapping.getKeyMapping();
+        if (topology.getNode() == null) {
+            return ret;
+        }
         topology.getNode().stream()
                 .filter(Objects::nonNull)
-                .filter(node -> node.getAugmentation(PcepNodeConfig.class) != null)
-                .filter(node -> node.getAugmentation(PcepNodeConfig.class).getSessionConfig() != null)
-                .filter(node -> node.getAugmentation(PcepNodeConfig.class)
+                .filter(node -> node.augmentation(PcepNodeConfig.class) != null)
+                .filter(node -> node.augmentation(PcepNodeConfig.class).getSessionConfig() != null)
+                .filter(node -> node.augmentation(PcepNodeConfig.class)
                         .getSessionConfig().getPassword() != null)
-                .filter(node -> !node.getAugmentation(PcepNodeConfig.class)
+                .filter(node -> !node.augmentation(PcepNodeConfig.class)
                         .getSessionConfig().getPassword().getValue().isEmpty())
                 .forEach(node -> {
-                    final PcepNodeConfig config = node.getAugmentation(PcepNodeConfig.class);
+                    final PcepNodeConfig config = node.augmentation(PcepNodeConfig.class);
                     final Rfc2385Key rfc2385KeyPassword = config.getSessionConfig().getPassword();
                     final InetAddress address = InetAddresses.forString(node.getNodeId().getValue());
                     ret.put(address, rfc2385KeyPassword.getValue().getBytes(StandardCharsets.US_ASCII));
@@ -60,45 +54,36 @@ final class PCEPTopologyProviderUtil {
         return ret;
     }
 
-    static InetSocketAddress getInetSocketAddress(@Nonnull final IpAddress address, @Nonnull final PortNumber port) {
-        return new InetSocketAddress(IetfInetUtil.INSTANCE.inetAddressFor(address), port.getValue());
+    static InetSocketAddress getInetSocketAddress(final @NonNull IpAddressNoZone address,
+            final @NonNull PortNumber port) {
+        return new InetSocketAddress(IetfInetUtil.INSTANCE.inetAddressForNoZone(address), port.getValue().toJava());
     }
 
-    static boolean filterPcepTopologies(@Nullable final TopologyTypes topologyTypes) {
+    static boolean filterPcepTopologies(final @Nullable TopologyTypes topologyTypes) {
         if (topologyTypes == null) {
             return false;
         }
-        final TopologyTypes1 aug = topologyTypes.getAugmentation(TopologyTypes1.class);
+        final TopologyTypes1 aug = topologyTypes.augmentation(TopologyTypes1.class);
 
         return aug != null && aug.getTopologyPcep() != null;
     }
 
-    @SuppressWarnings("checkstyle:IllegalCatch")
-    static void closeTopology(@Nullable final PCEPTopologyProviderBean topology, @Nonnull final TopologyId topologyId) {
-        if (topology == null) {
-            return;
-        }
-        LOG.info("Removing Topology {}", topologyId);
-        try {
-            topology.closeServiceInstance().get(TIMEOUT_NS, TimeUnit.NANOSECONDS);
-            topology.close();
-        } catch (final Exception e) {
-            LOG.error("Topology {} instance failed to close service instance", topologyId, e);
-        }
-    }
 
     static SpeakerIdMapping contructSpeakersId(final Topology topology) {
         final SpeakerIdMapping ret = SpeakerIdMapping.getSpeakerIdMap();
+        if (topology.getNode() == null) {
+            return ret;
+        }
         topology.getNode().stream()
                 .filter(Objects::nonNull)
-                .filter(node -> node.getAugmentation(PcepNodeConfig.class) != null)
-                .filter(node -> node.getAugmentation(PcepNodeConfig.class).getSessionConfig() != null)
-                .filter(node -> node.getAugmentation(PcepNodeConfig.class).getSessionConfig()
-                        .getAugmentation(PcepNodeSyncConfig.class) != null)
+                .filter(node -> node.augmentation(PcepNodeConfig.class) != null)
+                .filter(node -> node.augmentation(PcepNodeConfig.class).getSessionConfig() != null)
+                .filter(node -> node.augmentation(PcepNodeConfig.class).getSessionConfig()
+                        .augmentation(PcepNodeSyncConfig.class) != null)
                 .forEach(node -> {
-                    final PcepNodeConfig config = node.getAugmentation(PcepNodeConfig.class);
+                    final PcepNodeConfig config = node.augmentation(PcepNodeConfig.class);
                     final PcepNodeSyncConfig nodeSyncConfig = config.getSessionConfig()
-                            .getAugmentation(PcepNodeSyncConfig.class);
+                            .augmentation(PcepNodeSyncConfig.class);
                     final InetAddress address = InetAddresses.forString(node.getNodeId().getValue());
                     ret.put(address, nodeSyncConfig.getSpeakerEntityIdValue());
                 });