From ff73c17be7840781085c48efb28612f045fe1d9f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 18 Feb 2019 18:59:03 +0100 Subject: [PATCH 1/1] Remove use of CheckedFuture YangTextSchemaSource uses ListenableFuture only, hence we can remove use of deprecated Futures.immediate(Failed)CheckedFuture(). Change-Id: I40e571441894c49bbea7a8c11a3854505147af3d Signed-off-by: Robert Varga --- .../provider/impl/RemoteYangTextSourceProviderImplTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java index 6a3f2337b8..1fda858fdd 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.schema.provider.impl; import static org.junit.Assert.assertArrayEquals; @@ -50,7 +49,7 @@ public class RemoteYangTextSourceProviderImplTest { YangTextSchemaSource schemaSource = YangTextSchemaSource.delegateForByteSource( ID, ByteSource.wrap(source.getBytes())); Mockito.when(mockedLocalRepository.getSchemaSource(ID, YangTextSchemaSource.class)).thenReturn( - Futures.immediateCheckedFuture(schemaSource)); + Futures.immediateFuture(schemaSource)); Future retrievedSourceFuture = remoteRepository.getYangTextSchemaSource(ID); @@ -64,8 +63,7 @@ public class RemoteYangTextSourceProviderImplTest { @Test(expected = SchemaSourceException.class) public void testGetNonExistentYangTextSchemaSource() throws Exception { Mockito.when(mockedLocalRepository.getSchemaSource(ID, YangTextSchemaSource.class)).thenReturn( - Futures.immediateFailedCheckedFuture( - new SchemaSourceException("Source is not provided"))); + Futures.immediateFailedFuture(new SchemaSourceException("Source is not provided"))); Future retrievedSourceFuture = remoteRepository.getYangTextSchemaSource(ID); -- 2.36.6