Bump upstreams for Silicon

[netvirt.git] / neutronvpn / impl / src / main / java / org / opendaylight / netvirt / neutronvpn / NeutronTrunkChangeListener.java

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java
index f41d8ad3ece0618ab5e6ec0880256eb97ec30e09..3e2795ed7208b6ea6a1841aeb76b5651e4466e52 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java
@@ -108,11 +108,11 @@ public class NeutronTrunkChangeListener extends AbstractAsyncDataTreeChangeListe
         if (Objects.equals(original, update)) {
             return;
         }
-        List<SubPorts> updatedSubPorts = new ArrayList<SubPorts>(update.nonnullSubPorts().values());
+        List<SubPorts> updatedSubPorts = new ArrayList<>(update.nonnullSubPorts().values());
         if (updatedSubPorts == null) {
             updatedSubPorts = Collections.emptyList();
         }
-        List<SubPorts> originalSubPorts = new ArrayList<SubPorts>(original.nonnullSubPorts().values());
+        List<SubPorts> originalSubPorts = new ArrayList<>(original.nonnullSubPorts().values());
         if (originalSubPorts == null) {
             originalSubPorts = Collections.emptyList();
         }
@@ -169,8 +169,8 @@ public class NeutronTrunkChangeListener extends AbstractAsyncDataTreeChangeListe
                 .setVlanId(new VlanId(subPort.getSegmentationId().intValue())).build();
             ParentRefs parentRefs = new ParentRefsBuilder().setParentInterface(parentName).build();
             SplitHorizon splitHorizon = new SplitHorizonBuilder().setOverrideSplitHorizonProtection(true).build();
-            interfaceBuilder.setName(portName).setType(L2vlan.class).addAugmentation(IfL2vlan.class, ifL2vlan)
-                .addAugmentation(ParentRefs.class, parentRefs).addAugmentation(SplitHorizon.class, splitHorizon);
+            interfaceBuilder.setName(portName).setType(L2vlan.class).addAugmentation(ifL2vlan)
+                .addAugmentation(parentRefs).addAugmentation(splitHorizon);
             Interface newIface = interfaceBuilder.build();
             /*
              * Interface is already created for parent NeutronPort. We're updating parent refs
@@ -204,7 +204,7 @@ public class NeutronTrunkChangeListener extends AbstractAsyncDataTreeChangeListe
             interfaceBuilder.removeAugmentation(IfL2vlan.class).removeAugmentation(ParentRefs.class)
                 .removeAugmentation(SplitHorizon.class);
             IfL2vlan ifL2vlan = new IfL2vlanBuilder().setL2vlanMode(IfL2vlan.L2vlanMode.Trunk).build();
-            interfaceBuilder.addAugmentation(IfL2vlan.class, ifL2vlan);
+            interfaceBuilder.addAugmentation(ifL2vlan);
             Interface newIface = interfaceBuilder.build();
             /*
              * There is no means to do an update to remove elements from a node.