Bump upstreams for Silicon

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / internal / ElanBridgeManager.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
index 9b9413c52f953a2fb8e9afc1daaa27834f489913..1111137de661c2197ad9d1a01914b902e9501838 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
@@ -9,7 +9,6 @@ package org.opendaylight.netvirt.elan.internal;
 
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -352,7 +351,7 @@ public class ElanBridgeManager {
             if (dpId != null) {
                 otherConfigs = new ArrayList<>(bridgeAug.nonnullBridgeOtherConfigs().values());
                 if (otherConfigs == null) {
-                    otherConfigs = Lists.newArrayList();
+                    otherConfigs = new ArrayList<>();
                 }
 
                 if (otherConfigs.stream().noneMatch(otherConfig ->
@@ -363,10 +362,10 @@ public class ElanBridgeManager {
                                     .setBridgeOtherConfigValue(dpIdVal).build());
                 }
             } else {
-                otherConfigs = Lists.newArrayList();
+                otherConfigs = new ArrayList<>();
             }
         } else  {
-            otherConfigs = Lists.newArrayList();
+            otherConfigs = new ArrayList<>();
             if (mac != null) {
                 otherConfigs.add(new BridgeOtherConfigsBuilder()
                                 .setBridgeOtherConfigKey(OTHER_CONFIG_HWADDR)