Drop unnecessary explicit types

Change-Id: Id6ea9e86b9c0a3bf9086d2efb7af89e277e2c56c
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java
index 3af8c3b2445fe91a0c4cade53bc15682b53b5a4c..93e7c38f217bd6e0abbff1b536e59b4e141f208f 100644 (file)
--- a/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java
+++ b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java
@@ -32,7 +32,7 @@ public class NvpnNbrControlPathAlarm extends NotificationBroadcasterSupport impl
 
     private AtomicInteger sequenceNumber = new AtomicInteger(0);
 
-    private ConcurrentMap<String, List<String>> raiseAlarmObjectMap = new ConcurrentHashMap<String, List<String>>();
+    private ConcurrentMap<String, List<String>> raiseAlarmObjectMap = new ConcurrentHashMap<>();
 
     @Override
     public void raiseAlarm(String alarmName, String additionalText, String source, String detailsInfo) {

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java
index 1047b05c17c7a70fb279120039c830d5831a0bea..66b1f95fc924ed04817671b284b252fd57b14887 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java
@@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory;
 public class DhcpPortCache {
 
     private static final Logger LOG = LoggerFactory.getLogger(DhcpPortCache.class);
-    private final ConcurrentHashMap<String, Port> portMap = new ConcurrentHashMap<String, Port>();
+    private final ConcurrentHashMap<String, Port> portMap = new ConcurrentHashMap<>();
 
     @PostConstruct
     public void init() {

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java
index e7e25a14e65d318e3f2ee1eab7dbae2e78acf45d..a8857adef82df4c4a075b1b27edf671eb77e3bdc 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java
@@ -78,7 +78,7 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
                     .withError(RpcError.ErrorType.APPLICATION, errMsg);
             return Futures.immediateFuture(rpcResultBuilder.build());
         }
-        List<RouterNat> natRouterList = new ArrayList<RouterNat>();
+        List<RouterNat> natRouterList = new ArrayList<>();
         for (Uuid routerUuid : routerUuidList) {
             long routerId = NatUtil.getVpnId(dataBroker, routerUuid.getValue());
             if (routerId == NatConstants.INVALID_ID) {
@@ -222,7 +222,7 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
         } else {
 
             // Capturing SNAT information
-            List<SnatIpMapping> snatIpMapping = new ArrayList<SnatIpMapping>();
+            List<SnatIpMapping> snatIpMapping = new ArrayList<>();
 
             for (IntextIpProtocolType protocolType : ipPortMapping.getIntextIpProtocolType()) {
                 for (IpPortMap ipPortMap : protocolType.getIpPortMap()) {
@@ -239,7 +239,7 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
         }
 
         // Capturing DNAT information
-        List<DnatIpMapping> dnatIpMapping = new ArrayList<DnatIpMapping>();
+        List<DnatIpMapping> dnatIpMapping = new ArrayList<>();
         List<Ports> fipPorts = NatUtil.getFloatingIpPortsForRouter(dataBroker, routerUuid);
         if (fipPorts.isEmpty()) {
             LOG.warn("constructNatInformation : No DNAT IP Mapping found for router-uuid {}", routerUuid.getValue());
@@ -255,7 +255,7 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
             natRouterBuilder.setDnatIpMapping(dnatIpMapping);
         }
 
-        List<RouterNat> natRouterList = new ArrayList<RouterNat>();
+        List<RouterNat> natRouterList = new ArrayList<>();
         natRouterList.add(natRouterBuilder.build());
         return natRouterList;
     }

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
index fe5bfb1a76d14a222add70f768b5c9fd88b5f0fc..4cb7d9da875f1da7687cd07eede88838af5d7a4e 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
@@ -699,7 +699,7 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase<P
                 final List<Uuid> updateSnMapsIds = portupdateIps.stream().map(FixedIps::getSubnetId)
                         .collect(Collectors.toList());
                 Set<Uuid> originalRouterIds = new HashSet<>();
-                Set<Uuid> oldVpnIds = new HashSet<Uuid>();
+                Set<Uuid> oldVpnIds = new HashSet<>();
                 Uuid oldRouterId = null;
                 for (Uuid snId: originalSnMapsIds) {
                     if (!updateSnMapsIds.remove(snId)) {

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java
index 04f12949f52a8cf35b2c25a6f22fd21d399c072b..3d3d614fb5cb6978b8a8315eac9f6ca8636082e4 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java
@@ -1532,7 +1532,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even
                                 vpnIface);
                         if (vpnIface == null) {
                             LOG.trace("addSubnetToVpn: create new VpnInterface for Port {}", vpnInfName);
-                            Set<Uuid> listVpn = new HashSet<Uuid>();
+                            Set<Uuid> listVpn = new HashSet<>();
                             if (vpnId != null) {
                                 listVpn.add(vpnId);
                             }

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java
index 439bcac3e84a7da7dacfa53bbc0e7efda27dedad..78f0ec2d9385a20a54ef4751b79ac94f08ddd196 100644 (file)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java
@@ -51,7 +51,7 @@ public final class VpnExtraRouteHelper {
     public static  List<Routes> getVpnExtraroutes(DataBroker broker, String vpnName, String vpnRd) {
         InstanceIdentifier<ExtraRoutes> vpnExtraRoutesId = getVpnToExtrarouteIdentifier(vpnName, vpnRd);
         Optional<ExtraRoutes> vpnOpc = MDSALUtil.read(broker, LogicalDatastoreType.OPERATIONAL, vpnExtraRoutesId);
-        return vpnOpc.isPresent() ? vpnOpc.get().getRoutes() : new ArrayList<Routes>();
+        return vpnOpc.isPresent() ? vpnOpc.get().getRoutes() : new ArrayList<>();
     }
 
     public static Optional<Routes> getVpnExtraroutes(DataBroker broker, String vpnName,