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 <mcmarada@cisco.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/infra/rpc/impl/src/test/java/io/fd/honeycomb/rpc/HoneycombDOMRpcServiceTest.java b/infra/rpc/impl/src/test/java/io/fd/honeycomb/rpc/HoneycombDOMRpcServiceTest.java
index 7b27fec4e..c47590887 100644
--- a/infra/rpc/impl/src/test/java/io/fd/honeycomb/rpc/HoneycombDOMRpcServiceTest.java
+++ b/infra/rpc/impl/src/test/java/io/fd/honeycomb/rpc/HoneycombDOMRpcServiceTest.java
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.when;
 
 import java.net.URI;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentMatchers;
@@ -74,13 +75,13 @@ public class HoneycombDOMRpcServiceTest {
         assertEquals(outputBi, service.invokeRpc(path, node).get().getResult());
     }
 
-    @Test(expected = RpcException.class)
+    @Test(expected = ExecutionException.class)
     public void testInvokeRpcFailed() throws Exception {
         final CompletableFuture future = new CompletableFuture();
         future.completeExceptionally(new RuntimeException());
         when(registry.invoke(path, input)).thenReturn(future);
 
-        service.invokeRpc(path, node).checkedGet();
+        service.invokeRpc(path, node).get();
     }
 
     private ContainerNode mockContainerNode(final QName nn1) {