This is an automated email from the ASF dual-hosted git repository.
rpuch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new a2c86670cb7 IGNITE-27363 Remove JobsCommon (#7241)
a2c86670cb7 is described below
commit a2c86670cb7724bcbb84a23373f91314069eff03
Author: Roman Puchkovskiy <[email protected]>
AuthorDate: Tue Dec 16 14:11:17 2025 +0400
IGNITE-27363 Remove JobsCommon (#7241)
---
.../ignite/internal/compute/CheckpointJob.java | 4 +--
.../DisableWriteIntentSwitchExecutionJob.java | 3 ++-
.../apache/ignite/internal/compute/JobsCommon.java | 29 ----------------------
.../internal/compute/PutVaultEntriesJob.java | 4 +--
.../compute/SendAllMetastorageCommandTypesJob.java | 3 ++-
.../internal/compute/TruncateRaftLogCommand.java | 5 ++--
6 files changed, 10 insertions(+), 38 deletions(-)
diff --git
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/CheckpointJob.java
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/CheckpointJob.java
index d20576f72c0..a6b13639678 100644
---
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/CheckpointJob.java
+++
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/CheckpointJob.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.compute;
import static java.lang.Thread.sleep;
import static java.util.concurrent.CompletableFuture.failedFuture;
-import static org.apache.ignite.internal.compute.JobsCommon.unwrapIgniteImpl;
import static org.apache.ignite.internal.wrapper.Wrappers.unwrapNullable;
import java.lang.reflect.Field;
@@ -34,6 +33,7 @@ import
org.apache.ignite.internal.pagememory.persistence.compaction.Compactor;
import
org.apache.ignite.internal.pagememory.persistence.store.FilePageStoreManager;
import org.apache.ignite.internal.storage.DataStorageManager;
import
org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine;
+import org.apache.ignite.internal.wrapper.Wrappers;
/** A job that forces a checkpoint and optionally cancels the compaction
process on the node. */
public class CheckpointJob implements ComputeJob<Boolean, Void> {
@@ -41,7 +41,7 @@ public class CheckpointJob implements ComputeJob<Boolean,
Void> {
public CompletableFuture<Void> executeAsync(JobExecutionContext context,
Boolean shouldCancelCompaction) {
try {
- IgniteImpl igniteImpl = unwrapIgniteImpl(context.ignite());
+ IgniteImpl igniteImpl = Wrappers.unwrap(context.ignite(),
IgniteImpl.class);
CheckpointManager checkpointManager =
checkpointManager(igniteImpl);
diff --git
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/DisableWriteIntentSwitchExecutionJob.java
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/DisableWriteIntentSwitchExecutionJob.java
index 2c6dd5a79cd..4cbca610abc 100644
---
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/DisableWriteIntentSwitchExecutionJob.java
+++
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/DisableWriteIntentSwitchExecutionJob.java
@@ -21,13 +21,14 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.JobExecutionContext;
import org.apache.ignite.internal.app.IgniteImpl;
+import org.apache.ignite.internal.wrapper.Wrappers;
import org.jetbrains.annotations.Nullable;
/** Disables write intent switches on the local node until restart. */
public class DisableWriteIntentSwitchExecutionJob implements ComputeJob<Void,
Void> {
@Override
public @Nullable CompletableFuture<Void> executeAsync(JobExecutionContext
context, @Nullable Void arg) {
- IgniteImpl igniteImpl = JobsCommon.unwrapIgniteImpl(context.ignite());
+ IgniteImpl igniteImpl = Wrappers.unwrap(context.ignite(),
IgniteImpl.class);
igniteImpl.dropMessages((recipientId, message) ->
message.getClass().getName().contains("WriteIntentSwitchReplicaRequest"));
diff --git
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/JobsCommon.java
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/JobsCommon.java
deleted file mode 100644
index 13c8306e132..00000000000
---
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/JobsCommon.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.compute;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.internal.app.IgniteImpl;
-import org.apache.ignite.internal.wrapper.Wrappers;
-
-/** Common utilities for jobs in compatibility tests. */
-class JobsCommon {
- static IgniteImpl unwrapIgniteImpl(Ignite ignite) {
- return Wrappers.unwrap(ignite, IgniteImpl.class);
- }
-}
diff --git
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/PutVaultEntriesJob.java
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/PutVaultEntriesJob.java
index dbac8766229..d769ed4b82b 100644
---
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/PutVaultEntriesJob.java
+++
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/PutVaultEntriesJob.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.compute;
-import static org.apache.ignite.internal.compute.JobsCommon.unwrapIgniteImpl;
import static
org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
import java.nio.charset.StandardCharsets;
@@ -28,6 +27,7 @@ import org.apache.ignite.compute.JobExecutionContext;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.lang.ByteArray;
import org.apache.ignite.internal.vault.VaultManager;
+import org.apache.ignite.internal.wrapper.Wrappers;
/** A job that writes values specified in constants to node's vault. */
public class PutVaultEntriesJob implements ComputeJob<String, Void> {
@@ -50,7 +50,7 @@ public class PutVaultEntriesJob implements ComputeJob<String,
Void> {
@Override
public CompletableFuture<Void> executeAsync(JobExecutionContext context,
String arg) {
- IgniteImpl igniteImpl = unwrapIgniteImpl(context.ignite());
+ IgniteImpl igniteImpl = Wrappers.unwrap(context.ignite(),
IgniteImpl.class);
VaultManager vault = igniteImpl.vault();
diff --git
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/SendAllMetastorageCommandTypesJob.java
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/SendAllMetastorageCommandTypesJob.java
index fd89163f39c..ab16d7d113f 100644
---
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/SendAllMetastorageCommandTypesJob.java
+++
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/SendAllMetastorageCommandTypesJob.java
@@ -35,13 +35,14 @@ import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.lang.ByteArray;
import org.apache.ignite.internal.metastorage.impl.MetaStorageManagerImpl;
+import org.apache.ignite.internal.wrapper.Wrappers;
/** A job that runs different MetastorageWriteCommands. */
// TODO IGNITE-26874 Add a check that all write commands are covered.
public class SendAllMetastorageCommandTypesJob implements ComputeJob<String,
Void> {
@Override
public CompletableFuture<Void> executeAsync(JobExecutionContext context,
String arg) {
- IgniteImpl igniteImpl = JobsCommon.unwrapIgniteImpl(context.ignite());
+ IgniteImpl igniteImpl = Wrappers.unwrap(context.ignite(),
IgniteImpl.class);
byte[] value = "value".getBytes(StandardCharsets.UTF_8);
diff --git
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/TruncateRaftLogCommand.java
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/TruncateRaftLogCommand.java
index f6f1f4fda8d..f233b432eba 100644
---
a/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/TruncateRaftLogCommand.java
+++
b/modules/compatibility-tests/src/jobs/java/org/apache/ignite/internal/compute/TruncateRaftLogCommand.java
@@ -17,13 +17,12 @@
package org.apache.ignite.internal.compute;
-import static org.apache.ignite.internal.compute.JobsCommon.unwrapIgniteImpl;
-
import java.util.concurrent.CompletableFuture;
import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.JobExecutionContext;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.network.MessagingService;
+import org.apache.ignite.internal.wrapper.Wrappers;
import org.apache.ignite.raft.jraft.RaftMessagesFactory;
import org.apache.ignite.raft.jraft.rpc.CliRequests.SnapshotRequest;
@@ -32,7 +31,7 @@ import
org.apache.ignite.raft.jraft.rpc.CliRequests.SnapshotRequest;
public class TruncateRaftLogCommand implements ComputeJob<String, Void> {
@Override
public CompletableFuture<Void> executeAsync(JobExecutionContext context,
String groupId) {
- IgniteImpl igniteImpl = unwrapIgniteImpl(context.ignite());
+ IgniteImpl igniteImpl = Wrappers.unwrap(context.ignite(),
IgniteImpl.class);
SnapshotRequest request = new RaftMessagesFactory().snapshotRequest()
.groupId(groupId)
