From b16cea20258ba537db7c0755208c82ab93331ff7 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Mon, 8 Apr 2019 11:37:45 +0200 Subject: HONEYCOMB-443: ODL bump to Neon - bumps ODL dependencies to neon - migrates guava optional to java.utils.optional Change-Id: Ibdaa365c7e21a341103aba88dfd67277e40d2969 Signed-off-by: Michal Cmarada --- .../java/io/fd/honeycomb/data/impl/HoneycombReadInfraTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/HoneycombReadInfraTest.java') diff --git a/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/HoneycombReadInfraTest.java b/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/HoneycombReadInfraTest.java index 2c50a5381..e39b7bf72 100644 --- a/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/HoneycombReadInfraTest.java +++ b/infra/it/it-test/src/test/java/io/fd/honeycomb/data/impl/HoneycombReadInfraTest.java @@ -32,10 +32,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import com.google.common.base.Optional; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.FluentFuture; import io.fd.honeycomb.test.model.Ids; import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.impl.read.GenericReader; @@ -51,6 +50,7 @@ import io.fd.honeycomb.translate.util.read.ReflexiveListReaderCustomizer; import io.fd.honeycomb.translate.util.read.ReflexiveReaderCustomizer; import java.lang.reflect.InvocationTargetException; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nonnull; import org.junit.Test; @@ -151,11 +151,11 @@ public class HoneycombReadInfraTest extends AbstractInfraTest { public void testReadAll() throws Exception { final ReadableDataTreeDelegator readableDataTreeDelegator = new ReadableDataTreeDelegator(serializer, schemaContext, registry, contextBroker); - final CheckedFuture>, org.opendaylight.controller.md.sal.common.api.data.ReadFailedException> + final FluentFuture>> read = readableDataTreeDelegator.read(YangInstanceIdentifier.EMPTY); final Multimap, ? extends DataObject> readAll = - toBinding(read.checkedGet().get()); + toBinding(read.get().get()); assertThat(readAll.size(), is(2)); assertTrue(readAll.containsKey(Ids.CONTAINER_WITH_LIST_ID)); assertEquals(readContainerWithList(), readAll.get(Ids.CONTAINER_WITH_LIST_ID).stream().findFirst().get()); -- cgit 1.2.3-korg