From d90fd12db5151b07e380de03410c6b639b8397c5 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 29 Sep 2020 13:11:11 +0200
Subject: [PATCH] Fix IInterfaceManager.getBridgeRefEntryMap() return type

Do not use raw Map, as that loses type information.

Change-Id: I43126e2303bff7389d8a3f0a5243817562f420db
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../genius/interfacemanager/interfaces/IInterfaceManager.java  | 3 ++-
 .../genius/interfacemanager/InterfacemgrProvider.java          | 3 ++-
 .../genius/interfacemanager/commons/InterfaceMetaUtils.java    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/interfacemanager/interfacemanager-api/src/main/java/org/opendaylight/genius/interfacemanager/interfaces/IInterfaceManager.java b/interfacemanager/interfacemanager-api/src/main/java/org/opendaylight/genius/interfacemanager/interfaces/IInterfaceManager.java
index 7f405094e..9171c9fc7 100644
--- a/interfacemanager/interfacemanager-api/src/main/java/org/opendaylight/genius/interfacemanager/interfaces/IInterfaceManager.java
+++ b/interfacemanager/interfacemanager-api/src/main/java/org/opendaylight/genius/interfacemanager/interfaces/IInterfaceManager.java
@@ -19,6 +19,7 @@ import org.opendaylight.mdsal.binding.util.Datastore.Configuration;
 import org.opendaylight.mdsal.binding.util.TypedWriteTransaction;
 import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.bridge.ref.info.BridgeRefEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceModeBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServices;
@@ -192,7 +193,7 @@ public interface IInterfaceManager {
 
     boolean isItmDirectTunnelsEnabled();
 
-    Map getBridgeRefEntryMap();
+    Map<Uint64, BridgeRefEntry> getBridgeRefEntryMap();
 
     boolean isItmOfTunnelsEnabled();
 
diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
index fbdbd6983..bc48c0473 100644
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
@@ -68,6 +68,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.con
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._interface.child.info.InterfaceParentEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._interface.child.info._interface.parent.entry.InterfaceChildEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._interface.child.info._interface.parent.entry.InterfaceChildEntryKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.bridge.ref.info.BridgeRefEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfExternal;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfExternalBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan;
@@ -895,7 +896,7 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
     }
 
     @Override
-    public Map getBridgeRefEntryMap() {
+    public Map<Uint64, BridgeRefEntry> getBridgeRefEntryMap() {
         return interfaceMetaUtils.getBridgeRefEntryMap();
     }
 
diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java
index fe88d27f4..9ae8b183e 100644
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java
@@ -448,7 +448,7 @@ public final class InterfaceMetaUtils {
         return bridgeRefEntryMap.get(dpnId);
     }
 
-    public Map getBridgeRefEntryMap() {
+    public Map<Uint64, BridgeRefEntry> getBridgeRefEntryMap() {
         return Collections.unmodifiableMap(bridgeRefEntryMap);
     }
 }
-- 
2.36.6