NETVIRT-1630 migrate to md-sal APIs

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

diff --git a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java
index be8208e84698f3a8c53f20b92841621197de8ed3..2ce54f907436dcc87d941c42a192b2f917ab7bad 100755 (executable)
--- a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java
+++ b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java
@@ -10,13 +10,13 @@ package org.opendaylight.netvirt.cloudservicechain.utils;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.cloud.servicechain.state.rev160711.vpn.to.pseudo.port.list.VpnToPseudoPortData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,23 +44,23 @@ public class VpnPseudoPortCache {
             for (VpnToPseudoPortData vpnToPseudoPort : allVpnToPseudoPortData) {
                 add(vpnToPseudoPort.getVrfId(), vpnToPseudoPort.getVpnLportTag());
             }
-        } catch (ReadFailedException e) {
+        } catch (InterruptedException | ExecutionException e) {
             LOG.error("Error reading VPN to pseudo-port map", e);
         }
     }
 
-    public void add(@Nonnull String vrfId, long vpnPseudoLportTag) {
+    public void add(@NonNull String vrfId, long vpnPseudoLportTag) {
         LOG.debug("Adding vpn {} and vpnPseudoLportTag {} to VpnPseudoPortCache", vrfId, vpnPseudoLportTag);
         cache.put(vrfId, Long.valueOf(vpnPseudoLportTag));
     }
 
     @Nullable
-    public Long get(@Nonnull String vrfId) {
+    public Long get(@NonNull String vrfId) {
         return cache.get(vrfId);
     }
 
     @Nullable
-    public Long remove(@Nonnull String vrfId) {
+    public Long remove(@NonNull String vrfId) {
         LOG.debug("Removing vpn {} from VpnPseudoPortCache", vrfId);
         return cache.remove(vrfId);
     }