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 --- .../translate/impl/read/registry/SubtreeReaderTest.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/registry/SubtreeReaderTest.java') diff --git a/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/registry/SubtreeReaderTest.java b/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/registry/SubtreeReaderTest.java index d2375e6be..7c0206446 100644 --- a/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/registry/SubtreeReaderTest.java +++ b/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/read/registry/SubtreeReaderTest.java @@ -23,11 +23,11 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import com.google.common.base.Optional; import com.google.common.collect.Sets; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.Reader; import io.fd.honeycomb.translate.util.DataObjects; +import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -48,14 +48,14 @@ public class SubtreeReaderTest { private ReadContext ctx; @Before - public void setUp() throws Exception { + public void setUp() { MockitoAnnotations.initMocks(this); Mockito.doReturn(DataObjects.DataObject4.IID).when(delegate).getManagedDataObjectType(); doReturn(DataObject1.IID).when(delegateLocal).getManagedDataObjectType(); } @Test - public void testCreate() throws Exception { + public void testCreate() { final Reader> subtreeR = SubtreeReader.createForReader(Sets.newHashSet(DataObjects.DataObject4.DataObject41.IID), delegate); @@ -76,7 +76,8 @@ public class SubtreeReaderTest { final Reader> subtreeR = SubtreeReader.createForReader(Sets.newHashSet(DataObjects.DataObject4.DataObject41.IID), delegate); - doReturn(Optional.fromNullable(mock(DataObjects.DataObject4.class))).when(delegate).read(DataObjects.DataObject4.IID, ctx); + doReturn(Optional.ofNullable(mock(DataObjects.DataObject4.class))).when(delegate) + .read(DataObjects.DataObject4.IID, ctx); subtreeR.read(DataObjects.DataObject4.DataObject41.IID, ctx); } @@ -85,7 +86,7 @@ public class SubtreeReaderTest { final Reader> subtreeR = SubtreeReader.createForReader(Sets.newHashSet(DataObjects.DataObject4.DataObject41.IID), delegate); - doReturn(Optional.absent()).when(delegate).read(DataObjects.DataObject4.IID, ctx); + doReturn(Optional.empty()).when(delegate).read(DataObjects.DataObject4.IID, ctx); assertFalse(subtreeR.read(DataObjects.DataObject4.DataObject41.IID, ctx).isPresent()); } @@ -97,7 +98,7 @@ public class SubtreeReaderTest { final DataObject1 mock = mock(DataObject1.class); final DataObject1.DataObject11 mock11 = mock(DataObject1.DataObject11.class); doReturn(mock11).when(mock).getDataObject11(); - doReturn(Optional.fromNullable(mock)).when(delegateLocal).read(DataObject1.IID, ctx); + doReturn(Optional.ofNullable(mock)).when(delegateLocal).read(DataObject1.IID, ctx); assertEquals(mock11, subtreeR.read(DataObject1.DataObject11.IID, ctx).get()); } @@ -109,7 +110,7 @@ public class SubtreeReaderTest { final DataObject1 mock = mock(DataObject1.class); final DataObject1.DataObject11 mock11 = mock(DataObject1.DataObject11.class); doReturn(mock11).when(mock).getDataObject11(); - doReturn(Optional.fromNullable(mock)).when(delegateLocal).read(DataObject1.IID, ctx); + doReturn(Optional.ofNullable(mock)).when(delegateLocal).read(DataObject1.IID, ctx); assertEquals(mock, subtreeR.read(DataObject1.IID, ctx).get()); } -- cgit 1.2.3-korg