Remove useless UnsupportedOperationExceptions

[bgpcep.git] / bgp / rib-spi / src / main / java / org / opendaylight / protocol / bgp / rib / spi / RouterIds.java

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RouterIds.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RouterIds.java
index b6d4fe4a79f43fb4c6814bc56e63fac144de9ff6..b73ffde67297c8946c274084637af3ecd6bbcba3 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RouterIds.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RouterIds.java
@@ -7,57 +7,24 @@
  */
 package org.opendaylight.protocol.bgp.rib.spi;
 
-import com.google.common.base.Preconditions;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.net.InetAddresses;
-import com.google.common.primitives.UnsignedInteger;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+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.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerId;
 
+@NonNullByDefault
 public final class RouterIds {
-    private static final LoadingCache<String, UnsignedInteger> ROUTER_IDS = CacheBuilder.newBuilder().weakValues().build(new CacheLoader<String, UnsignedInteger>() {
-        @Override
-        public UnsignedInteger load(final String key) {
-            return UnsignedInteger.fromIntBits(InetAddresses.coerceToInteger(InetAddresses.forString(key)));
-        }
-    });
-    private static final LoadingCache<PeerId, UnsignedInteger> BGP_ROUTER_IDS = CacheBuilder.newBuilder().weakValues().build(new CacheLoader<PeerId, UnsignedInteger>() {
-        @Override
-        public UnsignedInteger load(final PeerId key) {
-            return routerIdForAddress(key.getValue().substring(BGP_PREFIX.length()));
-        }
-    });
-    private static final String BGP_PREFIX = "bgp://";
-
     private RouterIds() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Get a router ID in unsigned integer format from an Ipv4Address. This implementation uses an internal
-     * cache, so the objects can be expected to perform quickly when compared with equals and similar.
-     *
-     * @param address Router ID as a dotted-quad
-     * @return Router ID as an {@link UnsignedInteger}
-     */
-    public static UnsignedInteger routerIdForAddress(@Nonnull final String address) {
-        return ROUTER_IDS.getUnchecked(address);
-    }
-
-    public static UnsignedInteger routerIdForPeerId(@Nonnull final PeerId peerId) {
-        Preconditions.checkArgument(peerId.getValue().startsWith(BGP_PREFIX), "Unhandled peer ID %s", peerId);
-        return BGP_ROUTER_IDS.getUnchecked(peerId);
+        // Hidden on purpose
     }
 
-    public static PeerId createPeerId(@Nonnull final Ipv4Address address) {
-        return new PeerId(BGP_PREFIX + address.getValue());
+    public static PeerId createPeerId(final IpAddress address) {
+        final Ipv4Address ipv4 = address.getIpv4Address();
+        return ipv4 != null ? createPeerId(ipv4)
+                : new PeerId(RouterId.PEER_ID_PREFIX + address.getIpv6Address().getValue());
     }
 
-    public static PeerId createPeerId(@Nonnull final UnsignedInteger intAddress) {
-        final String inet4Address = InetAddresses.fromInteger(intAddress.intValue()).getHostAddress();
-        return new PeerId(BGP_PREFIX.concat(inet4Address));
+    public static PeerId createPeerId(final Ipv4Address address) {
+        return new PeerId(RouterId.PEER_ID_PREFIX + address.getValue());
     }
 }