NETVIRT-1630 migrate to md-sal APIs

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

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java
index 999f13ddc9fb95741f180455d204f59c0580c425..b2f5186d3dc6bf0ec8cc3aa86ec3c6e63c0b35f3 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java
@@ -8,15 +8,15 @@
 
 package org.opendaylight.netvirt.neutronvpn;
 
-import com.google.common.base.Optional;
-import javax.annotation.Nonnull;
+import java.util.Optional;
 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.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.genius.mdsalutil.cache.InstanceIdDataObjectCache;
 import org.opendaylight.infrautils.caches.CacheProvider;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.hostconfig.rev150712.hostconfig.attributes.Hostconfigs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.hostconfig.rev150712.hostconfig.attributes.hostconfigs.Hostconfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.hostconfig.rev150712.hostconfig.attributes.hostconfigs.HostconfigKey;
@@ -32,7 +32,7 @@ public class HostConfigCache extends InstanceIdDataObjectCache<Hostconfig> {
               cacheProvider);
     }
 
-    public Optional<Hostconfig> get(@Nonnull String hostId) throws ReadFailedException {
+    public Optional<Hostconfig> get(@NonNull String hostId) throws ReadFailedException {
         InstanceIdentifier<Hostconfig> hostConfigPath = InstanceIdentifier.builder(Neutron.class)
                                                  .child(Hostconfigs.class)
                                                  .child(Hostconfig.class, new HostconfigKey(hostId, "ODL L2"))