MRI version bumpup for Aluminium

[netvirt.git] / cloud-servicechain / impl / src / main / java / org / opendaylight / netvirt / cloudservicechain / utils / ElanServiceChainUtils.java

diff --git a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java
index 80c491ad891750a2785b2c7ad8cbb676d61d69f5..f8936555217e9aa714e0bcd8032031c3d91eb385 100755 (executable)
--- a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java
+++ b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java
@@ -7,16 +7,14 @@
  */
 package org.opendaylight.netvirt.cloudservicechain.utils;
 
-import com.google.common.base.Optional;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.mdsalutil.MatchInfo;
@@ -27,6 +25,8 @@ import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.genius.mdsalutil.matches.MatchMetadata;
 import org.opendaylight.genius.mdsalutil.matches.MatchTunnelId;
 import org.opendaylight.genius.utils.ServiceIndex;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.netvirt.cloudservicechain.CloudServiceChainConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
@@ -52,7 +52,9 @@ public final class ElanServiceChainUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(ElanServiceChainUtils.class);
 
-    private ElanServiceChainUtils() { }
+    private ElanServiceChainUtils() {
+
+    }
 
     public static InstanceIdentifier<ElanInstance> getElanInstanceConfigDataPath(String elanInstanceName) {
         return InstanceIdentifier.builder(ElanInstances.class).child(ElanInstance.class,
@@ -265,7 +267,7 @@ public final class ElanServiceChainUtils {
 
         if (addOrRemove == NwConstants.ADD_FLOW) {
             ElanToPseudoPortData newValue =
-                    new ElanToPseudoPortDataBuilder().setKey(key).setElanLportTag(portTag)
+                    new ElanToPseudoPortDataBuilder().withKey(key).setElanLportTag(portTag)
                                                      .setScfTag(scfTag).build();
             MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION, path, newValue);
         } else {
@@ -278,7 +280,7 @@ public final class ElanServiceChainUtils {
      *
      * @param broker dataBroker service reference
      * @param elanInstanceName the name of the Elan
-     * @return the ElanToPseudoPortData object or Optional.absent() if it
+     * @return the ElanToPseudoPortData object or Optional.empty() if it
      *     cannot be found
      */
     public static Optional<ElanServiceChainState> getElanServiceChainState(final DataBroker broker,