From 636f8423f4c043eb5941aa9e72e8c36cb0c49ab0 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 4 Aug 2020 21:05:46 +0200
Subject: [PATCH] Fix safety warnings

Minimize visibility of DpnInterfaceInfo fields and use proper type
generic arguments to prevent use of raw types.

Change-Id: Id12ef7a9ca44e662a5b794f1c81ad7cc541bb44b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../netvirt/ipv6service/VirtualNetwork.java         | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java
index 5ab7532863..1c804ba93f 100644
--- a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java
+++ b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java
@@ -122,18 +122,15 @@ public class VirtualNetwork implements IVirtualNetwork {
     }
 
     public static class DpnInterfaceInfo {
-        Uint64 dpId;
-        int rsPuntFlowConfigured;
-        final Set<Uuid> subnetCidrPuntFlowList = ConcurrentHashMap.newKeySet();
+        private Uint64 dpId;
+        private int rsPuntFlowConfigured = Ipv6ServiceConstants.FLOWS_NOT_CONFIGURED;
+        private final Set<Uuid> subnetCidrPuntFlowList = ConcurrentHashMap.newKeySet();
         final Set<Ipv6Address> ndTargetFlowsPunted = ConcurrentHashMap.newKeySet();
-        ConcurrentMap<Long, Uuid> ofPortMap;
-        ConcurrentMap<Uuid, Integer> ovsNaResponderFlowConfigured;
+        final ConcurrentMap<Long, Uuid> ofPortMap = new ConcurrentHashMap<>();
+        private final ConcurrentMap<Uuid, Integer> ovsNaResponderFlowConfigured = new ConcurrentHashMap<>();
 
         DpnInterfaceInfo(Uint64 dpnId) {
             dpId = dpnId;
-            ofPortMap = new ConcurrentHashMap();
-            rsPuntFlowConfigured = Ipv6ServiceConstants.FLOWS_NOT_CONFIGURED;
-            ovsNaResponderFlowConfigured = new ConcurrentHashMap();
         }
 
         public void setDpId(Uint64 dpId) {
-- 
2.36.6