Make BGPPeer.addPathTableMaps immutable

This is field is always immutable, make that contract explicit.

Change-Id: I5388b25297c7a45894d53d119e7aab44198d9d65
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
index 6c009d4da6f4b039115755a05ddfb08c12466eff..6a84134ea323276ebf30026710fe6e6b2353b31c 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
@@ -144,7 +144,7 @@ public class BGPPeer extends AbstractPeer implements BGPSessionListener {
     @GuardedBy("this")
     private EffectiveRibInWriter effRibInWriter;
     private ObjectRegistration<BgpPeerRpcService> rpcRegistration;
-    private Map<TablesKey, SendReceive> addPathTableMaps = Collections.emptyMap();
+    private ImmutableMap<TablesKey, SendReceive> addPathTableMaps = ImmutableMap.of();
     // FIXME: This should be a constant co-located with ApplicationPeer.peerId
     private YangInstanceIdentifier peerPath;
     // FIXME: This is for supportsTable() -- a trivial behavior thing, where 'peer-down' type states always return false
@@ -236,7 +236,8 @@ public class BGPPeer extends AbstractPeer implements BGPSessionListener {
                             new DestinationIpv4Builder().setIpv4Prefixes(prefixes).build()).build()).build()).build();
     }
 
-    private static Map<TablesKey, SendReceive> mapTableTypesFamilies(final List<AddressFamilies> addPathTablesType) {
+    private static ImmutableMap<TablesKey, SendReceive> mapTableTypesFamilies(
+            final List<AddressFamilies> addPathTablesType) {
         return addPathTablesType.stream().collect(ImmutableMap.toImmutableMap(
             af -> new TablesKey(af.getAfi(), af.getSafi()), BgpAddPathTableType::getSendReceive));
     }
@@ -618,7 +619,7 @@ public class BGPPeer extends AbstractPeer implements BGPSessionListener {
             effRibInWriter.close();
         }
         tables = ImmutableSet.of();
-        addPathTableMaps = Collections.emptyMap();
+        addPathTableMaps = ImmutableMap.of();
         future = removePeer(peerPath);
         resetState();