This is an automated email from the ASF dual-hosted git repository. tkalkirill pushed a commit to branch ignite-26058 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit ccf3edb382c04205961f2d48b329c56174ef0668 Author: Kirill Tkalenko <[email protected]> AuthorDate: Tue Jul 29 14:41:03 2025 +0300 IGNITE-26058 wip --- .../catalog/compaction/CatalogCompactionRunnerSelfTest.java | 6 +++--- .../java/org/apache/ignite/client/handler/FakeCatalogService.java | 3 ++- .../org/apache/ignite/internal/client/tx/ClientLazyTransaction.java | 5 +++-- .../test/java/org/apache/ignite/client/PartitionAwarenessTest.java | 3 ++- .../internal/compute/threading/ItComputeApiThreadingTest.java | 3 ++- .../org/apache/ignite/internal/compute/InfiniteMapReduceTask.java | 3 ++- .../ignite/internal/compute/streamer/StreamerReceiverJob.java | 4 +++- .../java/org/apache/ignite/lang/CancelHandleHelperSelfTest.java | 3 ++- .../rebalance/DistributionZoneRebalanceEngine.java | 3 +-- .../rebalance/DistributionZoneRebalanceEngineV2.java | 3 +-- .../internal/eventlog/impl/ConfigurationBasedChannelRegistry.java | 4 ++-- .../internal/eventlog/impl/ConfigurationBasedSinkRegistry.java | 4 ++-- .../replicator/schema/ExecutorInclinedSchemaSyncServiceTest.java | 4 ++-- .../wrappers/ExecutorInclinedPlacementDriverTest.java | 4 ++-- .../ignite/internal/replicator/PlacementDriverReplicaSideTest.java | 2 +- .../java/org/apache/ignite/internal/app/NoOpMapReduceTask.java | 3 ++- .../apache/ignite/internal/runner/app/PlatformTestNodeRunner.java | 5 +++-- .../ignite/internal/runner/app/client/ItThinClientComputeTest.java | 2 +- .../internal/metastorage/server/ConditionalWatchInhibitor.java | 4 ++-- .../internal/sql/engine/systemviews/ItComputeSystemViewTest.java | 3 ++- .../internal/tx/impl/TransactionExpirationRegistryBenchmark.java | 2 +- .../tx/impl/TransactionExpirationRegistryConcurrentTest.java | 2 +- 22 files changed, 42 insertions(+), 33 deletions(-) diff --git a/modules/catalog-compaction/src/test/java/org/apache/ignite/internal/catalog/compaction/CatalogCompactionRunnerSelfTest.java b/modules/catalog-compaction/src/test/java/org/apache/ignite/internal/catalog/compaction/CatalogCompactionRunnerSelfTest.java index 9e086a99ba5..20fb6392a22 100644 --- a/modules/catalog-compaction/src/test/java/org/apache/ignite/internal/catalog/compaction/CatalogCompactionRunnerSelfTest.java +++ b/modules/catalog-compaction/src/test/java/org/apache/ignite/internal/catalog/compaction/CatalogCompactionRunnerSelfTest.java @@ -25,6 +25,7 @@ import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCo import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import static org.apache.ignite.sql.ColumnType.INT32; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -117,7 +118,6 @@ import org.apache.ignite.internal.replicator.message.ReplicaRequest; import org.apache.ignite.internal.schema.SchemaSyncService; import org.apache.ignite.internal.table.distributed.raft.MinimumRequiredTimeCollectorService; import org.apache.ignite.internal.testframework.log4j2.LogInspector; -import org.apache.ignite.internal.util.CompletableFutures; import org.apache.ignite.network.ClusterNode; import org.apache.ignite.network.NetworkAddress; import org.apache.logging.log4j.Level; @@ -1202,7 +1202,7 @@ public class CatalogCompactionRunnerSelfTest extends AbstractCatalogCompactionTe })); when(messagingService.send(any(ClusterNode.class), any(NetworkMessage.class))) - .thenReturn(CompletableFuture.completedFuture(null)); + .thenReturn(nullCompletedFuture()); Set<Assignment> assignments = assignmentNodes.stream() .map(node -> Assignment.forPeer(node.name())) @@ -1241,7 +1241,7 @@ public class CatalogCompactionRunnerSelfTest extends AbstractCatalogCompactionTe return null; })); - when(schemaSyncService.waitForMetadataCompleteness(any())).thenReturn(CompletableFutures.nullCompletedFuture()); + when(schemaSyncService.waitForMetadataCompleteness(any())).thenReturn(nullCompletedFuture()); CatalogCompactionRunner runner = new CatalogCompactionRunner( localNode.name(), diff --git a/modules/client-handler/src/testFixtures/java/org/apache/ignite/client/handler/FakeCatalogService.java b/modules/client-handler/src/testFixtures/java/org/apache/ignite/client/handler/FakeCatalogService.java index 2fa0f92b86b..f3cdffffcce 100644 --- a/modules/client-handler/src/testFixtures/java/org/apache/ignite/client/handler/FakeCatalogService.java +++ b/modules/client-handler/src/testFixtures/java/org/apache/ignite/client/handler/FakeCatalogService.java @@ -18,6 +18,7 @@ package org.apache.ignite.client.handler; import static org.apache.ignite.internal.catalog.commands.CatalogUtils.fromParams; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; @@ -128,7 +129,7 @@ public class FakeCatalogService implements CatalogService { @Override public CompletableFuture<Void> catalogReadyFuture(int version) { - return CompletableFuture.completedFuture(null); + return nullCompletedFuture(); } @Override diff --git a/modules/client/src/main/java/org/apache/ignite/internal/client/tx/ClientLazyTransaction.java b/modules/client/src/main/java/org/apache/ignite/internal/client/tx/ClientLazyTransaction.java index b905b61ef96..a816c050434 100644 --- a/modules/client/src/main/java/org/apache/ignite/internal/client/tx/ClientLazyTransaction.java +++ b/modules/client/src/main/java/org/apache/ignite/internal/client/tx/ClientLazyTransaction.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.client.tx; import static org.apache.ignite.internal.client.tx.ClientTransactions.USE_CONFIGURED_TIMEOUT_DEFAULT; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; @@ -63,7 +64,7 @@ public class ClientLazyTransaction implements Transaction { if (tx0 == null) { // No operations were performed, nothing to commit. - return CompletableFuture.completedFuture(null); + return nullCompletedFuture(); } return tx0.thenCompose(ClientTransaction::commitAsync); @@ -87,7 +88,7 @@ public class ClientLazyTransaction implements Transaction { if (tx0 == null) { // No operations were performed, nothing to rollback. - return CompletableFuture.completedFuture(null); + return nullCompletedFuture(); } return tx0.thenCompose(ClientTransaction::rollbackAsync); diff --git a/modules/client/src/test/java/org/apache/ignite/client/PartitionAwarenessTest.java b/modules/client/src/test/java/org/apache/ignite/client/PartitionAwarenessTest.java index 3cce075caa7..f1c3e580c8a 100644 --- a/modules/client/src/test/java/org/apache/ignite/client/PartitionAwarenessTest.java +++ b/modules/client/src/test/java/org/apache/ignite/client/PartitionAwarenessTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.client; import static org.apache.ignite.internal.lang.IgniteStringFormatter.format; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import static org.apache.ignite.internal.util.IgniteUtils.closeAll; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; @@ -804,7 +805,7 @@ public class PartitionAwarenessTest extends AbstractClientTest { @Override public CompletableFuture<List<Object>> receive(List<Object> page, DataStreamerReceiverContext ctx, Object arg) { ctx.ignite().tables().table(DEFAULT_TABLE).recordView().upsert(null, Tuple.create().set("ID", 0L)); - return CompletableFuture.completedFuture(null); + return nullCompletedFuture(); } } } diff --git a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/threading/ItComputeApiThreadingTest.java b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/threading/ItComputeApiThreadingTest.java index 3e1d24f51cb..dc3798a7af7 100644 --- a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/threading/ItComputeApiThreadingTest.java +++ b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/threading/ItComputeApiThreadingTest.java @@ -24,6 +24,7 @@ import static org.apache.ignite.internal.PublicApiThreadingTests.asyncContinuati import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.is; @@ -194,7 +195,7 @@ class ItComputeApiThreadingTest extends ClusterPerClassIntegrationTest { @Override public CompletableFuture<Void> reduceAsync(TaskExecutionContext taskContext, Map<UUID, String> results) { - return completedFuture(null); + return nullCompletedFuture(); } } diff --git a/modules/compute/src/jobs/java/org/apache/ignite/internal/compute/InfiniteMapReduceTask.java b/modules/compute/src/jobs/java/org/apache/ignite/internal/compute/InfiniteMapReduceTask.java index b51346e5031..6b65bbed5fd 100644 --- a/modules/compute/src/jobs/java/org/apache/ignite/internal/compute/InfiniteMapReduceTask.java +++ b/modules/compute/src/jobs/java/org/apache/ignite/internal/compute/InfiniteMapReduceTask.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.compute; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import java.util.List; import java.util.Map; @@ -44,7 +45,7 @@ public class InfiniteMapReduceTask implements MapReduceTask<Void, Void, Void, Vo @Override public CompletableFuture<Void> reduceAsync(TaskExecutionContext taskContext, Map<UUID, Void> results) { - return completedFuture(null); + return nullCompletedFuture(); } private static class InfiniteMapReduceJob implements ComputeJob<Void, Void> { diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/streamer/StreamerReceiverJob.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/streamer/StreamerReceiverJob.java index 30c15635576..a84df822857 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/streamer/StreamerReceiverJob.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/streamer/StreamerReceiverJob.java @@ -17,6 +17,8 @@ package org.apache.ignite.internal.compute.streamer; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; + import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.List; @@ -60,7 +62,7 @@ public class StreamerReceiverJob implements ComputeJob<byte[], byte[]> { CompletableFuture<List<Object>> receiverRes = receiver.receive(receiverInfo.items(), receiverContext, receiverInfo.arg()); if (receiverRes == null) { - return CompletableFuture.completedFuture(null); + return nullCompletedFuture(); } return receiverRes.thenApply(r -> StreamerReceiverSerializer.serializeReceiverJobResults(r, receiver.resultMarshaller())); diff --git a/modules/core/src/test/java/org/apache/ignite/lang/CancelHandleHelperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/CancelHandleHelperSelfTest.java index c2b8ddb43ea..6e7dab74185 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/CancelHandleHelperSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/CancelHandleHelperSelfTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.lang; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotSame; @@ -187,7 +188,7 @@ public class CancelHandleHelperSelfTest extends BaseIgniteAbstractTest { CancelHandle cancelHandle = CancelHandle.create(); CancellationToken token = cancelHandle.token(); Runnable action = Mockito.mock(Runnable.class); - CompletableFuture<Void> f = CompletableFuture.completedFuture(null); + CompletableFuture<Void> f = nullCompletedFuture(); { NullPointerException err = assertThrows( diff --git a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngine.java b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngine.java index fce6f6cb4b3..5e34b695f44 100644 --- a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngine.java +++ b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngine.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.distributionzones.rebalance; import static java.util.concurrent.CompletableFuture.allOf; -import static java.util.concurrent.CompletableFuture.completedFuture; import static java.util.stream.Collectors.toSet; import static org.apache.ignite.internal.catalog.events.CatalogEvent.ZONE_ALTER; import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.DISTRIBUTION_ZONE_DATA_NODES_HISTORY_PREFIX_BYTES; @@ -187,7 +186,7 @@ public class DistributionZoneRebalanceEngine { return allOf(zonesRecoveryFutures.toArray(new CompletableFuture[0])); } else { - return completedFuture(null); + return nullCompletedFuture(); } } diff --git a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngineV2.java b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngineV2.java index 71cc0d4570d..a9b19bc9e04 100644 --- a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngineV2.java +++ b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngineV2.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.distributionzones.rebalance; import static java.util.concurrent.CompletableFuture.allOf; -import static java.util.concurrent.CompletableFuture.completedFuture; import static java.util.stream.Collectors.toSet; import static org.apache.ignite.internal.catalog.events.CatalogEvent.ZONE_ALTER; import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.DISTRIBUTION_ZONE_DATA_NODES_HISTORY_PREFIX_BYTES; @@ -302,7 +301,7 @@ public class DistributionZoneRebalanceEngineV2 { return allOf(zonesRecoveryFutures.toArray(new CompletableFuture[0])); } else { - return completedFuture(null); + return nullCompletedFuture(); } } } diff --git a/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/impl/ConfigurationBasedChannelRegistry.java b/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/impl/ConfigurationBasedChannelRegistry.java index 5f036a7a6b6..cd1938b898e 100644 --- a/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/impl/ConfigurationBasedChannelRegistry.java +++ b/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/impl/ConfigurationBasedChannelRegistry.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.eventlog.impl; -import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import java.util.Arrays; import java.util.HashMap; @@ -84,7 +84,7 @@ class ConfigurationBasedChannelRegistry implements ChannelRegistry { cache = newCache; typeCache = newTypeCache; - return completedFuture(null); + return nullCompletedFuture(); } private EventChannel createChannel(ChannelView view) { diff --git a/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/impl/ConfigurationBasedSinkRegistry.java b/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/impl/ConfigurationBasedSinkRegistry.java index 8364eb844b4..4a3fddf9442 100644 --- a/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/impl/ConfigurationBasedSinkRegistry.java +++ b/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/impl/ConfigurationBasedSinkRegistry.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.eventlog.impl; -import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import java.util.HashMap; import java.util.HashSet; @@ -79,7 +79,7 @@ class ConfigurationBasedSinkRegistry implements SinkRegistry { cache = newCache; cacheByChannel = newCacheByChannel; - return completedFuture(null); + return nullCompletedFuture(); } } } diff --git a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schema/ExecutorInclinedSchemaSyncServiceTest.java b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schema/ExecutorInclinedSchemaSyncServiceTest.java index 99fb2f283a0..54feb47a408 100644 --- a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schema/ExecutorInclinedSchemaSyncServiceTest.java +++ b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schema/ExecutorInclinedSchemaSyncServiceTest.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.partition.replicator.schema; -import static java.util.concurrent.CompletableFuture.completedFuture; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureCompletedMatcher.completedFuture; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.instanceOf; @@ -99,7 +99,7 @@ class ExecutorInclinedSchemaSyncServiceTest extends BaseIgniteAbstractTest { */ @Test void completesFuturesInGivenExecutorOrCurrentThreadForCompletedFuture() { - when(schemaSyncService.waitForMetadataCompleteness(timestamp)).thenReturn(completedFuture(null)); + when(schemaSyncService.waitForMetadataCompleteness(timestamp)).thenReturn(nullCompletedFuture()); AtomicReference<Thread> threadReference = new AtomicReference<>(); diff --git a/modules/placement-driver-api/src/test/java/org/apache/ignite/internal/placementdriver/wrappers/ExecutorInclinedPlacementDriverTest.java b/modules/placement-driver-api/src/test/java/org/apache/ignite/internal/placementdriver/wrappers/ExecutorInclinedPlacementDriverTest.java index 40fbbad9bee..0ec9d499f49 100644 --- a/modules/placement-driver-api/src/test/java/org/apache/ignite/internal/placementdriver/wrappers/ExecutorInclinedPlacementDriverTest.java +++ b/modules/placement-driver-api/src/test/java/org/apache/ignite/internal/placementdriver/wrappers/ExecutorInclinedPlacementDriverTest.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.placementdriver.wrappers; -import static java.util.concurrent.CompletableFuture.completedFuture; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureCompletedMatcher.completedFuture; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.instanceOf; @@ -112,7 +112,7 @@ class ExecutorInclinedPlacementDriverTest extends BaseIgniteAbstractTest { @ParameterizedTest @EnumSource(AsyncOperation.class) void completesFuturesInGivenExecutorOrCurrentThreadForCompletedFuture(AsyncOperation operation) { - when(operation.execute(placementDriver, context)).thenReturn(completedFuture(null)); + when(operation.execute(placementDriver, context)).thenReturn(nullCompletedFuture()); AtomicReference<Thread> threadReference = new AtomicReference<>(); diff --git a/modules/replicator/src/test/java/org/apache/ignite/internal/replicator/PlacementDriverReplicaSideTest.java b/modules/replicator/src/test/java/org/apache/ignite/internal/replicator/PlacementDriverReplicaSideTest.java index a95a792443f..d1f84abbaf1 100644 --- a/modules/replicator/src/test/java/org/apache/ignite/internal/replicator/PlacementDriverReplicaSideTest.java +++ b/modules/replicator/src/test/java/org/apache/ignite/internal/replicator/PlacementDriverReplicaSideTest.java @@ -120,7 +120,7 @@ public class PlacementDriverReplicaSideTest extends BaseIgniteAbstractTest { } }); - when(raftClient.run(any())).thenAnswer(invocationOnMock -> completedFuture(null)); + when(raftClient.run(any())).thenAnswer(invocationOnMock -> nullCompletedFuture()); var listener = mock(ReplicaListener.class); when(listener.raftClient()).thenReturn(raftClient); diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/app/NoOpMapReduceTask.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/app/NoOpMapReduceTask.java index e559a3d147d..973106f8af4 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/app/NoOpMapReduceTask.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/app/NoOpMapReduceTask.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.app; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import java.util.List; import java.util.Map; @@ -42,6 +43,6 @@ class NoOpMapReduceTask implements MapReduceTask<Void, Void, String, Void> { @Override public CompletableFuture<Void> reduceAsync(TaskExecutionContext taskContext, Map<UUID, String> results) { - return completedFuture(null); + return nullCompletedFuture(); } } diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java index ee741f8f9aa..5cfecff7be7 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java @@ -27,6 +27,7 @@ import static org.apache.ignite.internal.table.TableTestUtils.createTable; import static org.apache.ignite.internal.testframework.IgniteTestUtils.escapeWindowsPath; import static org.apache.ignite.internal.testframework.IgniteTestUtils.getResourcePath; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import static org.apache.ignite.sql.ColumnType.BOOLEAN; import static org.apache.ignite.sql.ColumnType.BYTE_ARRAY; import static org.apache.ignite.sql.ColumnType.DATE; @@ -918,7 +919,7 @@ public class PlatformTestNodeRunner { @Override public CompletableFuture<Void> reduceAsync(TaskExecutionContext taskContext, Map<java.util.UUID, Void> results) { - return completedFuture(null); + return nullCompletedFuture(); } } @@ -979,7 +980,7 @@ public class PlatformTestNodeRunner { @Override public @Nullable CompletableFuture<Nested> executeAsync(JobExecutionContext context, Nested arg) { if (arg == null) { - return completedFuture(null); + return nullCompletedFuture(); } arg.price = arg.price.add(BigDecimal.ONE); diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientComputeTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientComputeTest.java index 338b0866de4..c39ac7a7cd3 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientComputeTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientComputeTest.java @@ -1159,7 +1159,7 @@ public class ItThinClientComputeTest extends ItAbstractThinClientTest { @Override public CompletableFuture<Void> reduceAsync(TaskExecutionContext taskContext, Map<UUID, Void> results) { - return completedFuture(null); + return nullCompletedFuture(); } private static class InfiniteMapReduceJob implements ComputeJob<Void, Void> { diff --git a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/metastorage/server/ConditionalWatchInhibitor.java b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/metastorage/server/ConditionalWatchInhibitor.java index c48f2c46537..0f0aa04677c 100644 --- a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/metastorage/server/ConditionalWatchInhibitor.java +++ b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/metastorage/server/ConditionalWatchInhibitor.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.metastorage.server; -import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; @@ -54,7 +54,7 @@ public class ConditionalWatchInhibitor { LOG.info("Started inhibiting, rev=" + rev); return inhibitFuture; } else { - return completedFuture(null); + return nullCompletedFuture(); } }; diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItComputeSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItComputeSystemViewTest.java index a71e5807a18..575564aac73 100644 --- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItComputeSystemViewTest.java +++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItComputeSystemViewTest.java @@ -26,6 +26,7 @@ import static org.apache.ignite.internal.testframework.matchers.CompletableFutur import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; import static org.apache.ignite.internal.testframework.matchers.JobStateMatcher.jobStateWithStatus; import static org.apache.ignite.internal.testframework.matchers.TaskStateMatcher.taskStateWithStatus; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; @@ -264,7 +265,7 @@ public class ItComputeSystemViewTest extends AbstractSystemViewTest { @Override public CompletableFuture<Void> reduceAsync(TaskExecutionContext taskContext, Map<UUID, Void> results) { - return completedFuture(null); + return nullCompletedFuture(); } } diff --git a/modules/transactions/src/jmh/java/org/apache/ignite/internal/tx/impl/TransactionExpirationRegistryBenchmark.java b/modules/transactions/src/jmh/java/org/apache/ignite/internal/tx/impl/TransactionExpirationRegistryBenchmark.java index 2d40daa10e0..51da08d4e1b 100644 --- a/modules/transactions/src/jmh/java/org/apache/ignite/internal/tx/impl/TransactionExpirationRegistryBenchmark.java +++ b/modules/transactions/src/jmh/java/org/apache/ignite/internal/tx/impl/TransactionExpirationRegistryBenchmark.java @@ -219,7 +219,7 @@ public class TransactionExpirationRegistryBenchmark { @Override public CompletableFuture<Void> rollbackAsync() { - return CompletableFuture.completedFuture(null); + return nullCompletedFuture(); } @Override diff --git a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/TransactionExpirationRegistryConcurrentTest.java b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/TransactionExpirationRegistryConcurrentTest.java index 7b8e590c104..42cfe948736 100644 --- a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/TransactionExpirationRegistryConcurrentTest.java +++ b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/TransactionExpirationRegistryConcurrentTest.java @@ -282,7 +282,7 @@ class TransactionExpirationRegistryConcurrentTest extends BaseIgniteAbstractTest @Override public CompletableFuture<Void> rollbackAsync() { this.rollbackCount.incrementAndGet(); - return CompletableFuture.completedFuture(null); + return nullCompletedFuture(); } @Override
