diff options
Diffstat (limited to 'infra/translate-api')
6 files changed, 7 insertions, 8 deletions
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/MappingContext.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/MappingContext.java index 5a5ba980c..9699d1aea 100644 --- a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/MappingContext.java +++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/MappingContext.java @@ -16,7 +16,7 @@ package io.fd.honeycomb.translate; -import com.google.common.base.Optional; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java index e26ab55bc..ae5164bf5 100644 --- a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java +++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.translate.read; import com.google.common.annotations.Beta; import javax.annotation.Nonnull; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Reader.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Reader.java index 252d79e84..ba64b6b3c 100644 --- a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Reader.java +++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Reader.java @@ -17,8 +17,8 @@ package io.fd.honeycomb.translate.read; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import io.fd.honeycomb.translate.SubtreeManager; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataObject; diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/InitRegistry.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/InitRegistry.java index 8a97a7141..2b35827f7 100644 --- a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/InitRegistry.java +++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/InitRegistry.java @@ -20,7 +20,7 @@ package io.fd.honeycomb.translate.read.registry; import io.fd.honeycomb.translate.read.InitFailedException; import io.fd.honeycomb.translate.read.ReadContext; import javax.annotation.Nonnull; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataBroker; /** * Root initializer. diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/ReaderRegistry.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/ReaderRegistry.java index 6436fd738..41b819508 100644 --- a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/ReaderRegistry.java +++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/ReaderRegistry.java @@ -17,10 +17,10 @@ package io.fd.honeycomb.translate.read.registry; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.collect.Multimap; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -56,7 +56,6 @@ public interface ReaderRegistry extends InitRegistry { * @throws ReadFailedException if read was unsuccessful */ @Nonnull - Optional<? extends DataObject> read(@Nonnull InstanceIdentifier<? extends DataObject> id, - @Nonnull ReadContext ctx) + Optional<? extends DataObject> read(@Nonnull InstanceIdentifier<? extends DataObject> id, @Nonnull ReadContext ctx) throws ReadFailedException; } diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/WriteContext.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/WriteContext.java index c92bffeca..ef548d410 100644 --- a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/WriteContext.java +++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/WriteContext.java @@ -17,8 +17,8 @@ package io.fd.honeycomb.translate.write; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import io.fd.honeycomb.translate.ModificationContext; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; |