This is an automated email from the ASF dual-hosted git repository. mpochatkin pushed a commit to branch IGNITE-22426 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit e722b1599e5283b3283009f9eb8d1b9b258b9bf9 Author: Mikhail Pochatkin <[email protected]> AuthorDate: Fri Jun 28 10:46:23 2024 +0300 IGNITE-22426 Move deployment code to separate package --- .../api/src/main/java/org/apache/ignite/compute/IgniteCompute.java | 1 + .../api/src/main/java/org/apache/ignite/compute/JobDescriptor.java | 1 + .../org/apache/ignite/{compute => deployment}/DeploymentUnit.java | 4 ++-- .../apache/ignite/{compute => deployment}/version/UnitVersion.java | 2 +- .../org/apache/ignite/{compute => deployment}/version/Version.java | 2 +- .../{compute => deployment}/version/VersionParseException.java | 2 +- .../src/main/java/org/apache/ignite/table/ReceiverDescriptor.java | 2 +- .../apache/ignite/{compute => deployment}/version/VersionTest.java | 2 +- .../apache/ignite/internal/client/proto/ClientMessagePacker.java | 2 +- .../apache/ignite/internal/client/proto/ClientMessageUnpacker.java | 2 +- .../requests/compute/ClientComputeExecuteColocatedRequest.java | 2 +- .../requests/compute/ClientComputeExecuteMapReduceRequest.java | 2 +- .../handler/requests/compute/ClientComputeExecuteRequest.java | 2 +- .../requests/table/ClientStreamerWithReceiverBatchSendRequest.java | 2 +- .../org/apache/ignite/internal/client/compute/ClientCompute.java | 2 +- .../org/apache/ignite/internal/client/table/ClientDataStreamer.java | 2 +- .../src/test/java/org/apache/ignite/client/ClientComputeTest.java | 4 ++-- .../src/test/java/org/apache/ignite/client/fakes/FakeCompute.java | 2 +- .../java/org/apache/ignite/internal/deployment/DeployFiles.java | 2 +- .../ignite/internal/deployment/ItDeploymentUnitFailoverTest.java | 2 +- .../org/apache/ignite/internal/deployment/ItDeploymentUnitTest.java | 2 +- .../java/org/apache/ignite/internal/deployment/Unit.java | 2 +- .../org/apache/ignite/internal/deployunit/DefaultNodeCallback.java | 4 ++-- .../apache/ignite/internal/deployunit/DeployMessagingService.java | 2 +- .../apache/ignite/internal/deployunit/DeploymentManagerImpl.java | 2 +- .../apache/ignite/internal/deployunit/DeploymentUnitAccessor.java | 2 +- .../ignite/internal/deployunit/DeploymentUnitAccessorImpl.java | 2 +- .../ignite/internal/deployunit/DeploymentUnitAcquiredWaiter.java | 2 +- .../apache/ignite/internal/deployunit/DisposableDeploymentUnit.java | 2 +- .../java/org/apache/ignite/internal/deployunit/DownloadTracker.java | 2 +- .../org/apache/ignite/internal/deployunit/FileDeployerService.java | 2 +- .../org/apache/ignite/internal/deployunit/IgniteDeployment.java | 2 +- .../main/java/org/apache/ignite/internal/deployunit/UnitStatus.java | 2 +- .../java/org/apache/ignite/internal/deployunit/UnitStatuses.java | 2 +- .../org/apache/ignite/internal/deployunit/UnitVersionStatus.java | 2 +- .../deployunit/exception/DeploymentUnitNotFoundException.java | 2 +- .../deployunit/exception/DeploymentUnitUnavailableException.java | 2 +- .../internal/deployunit/metastore/ClusterEventCallbackImpl.java | 2 +- .../internal/deployunit/metastore/DeploymentUnitFailover.java | 2 +- .../ignite/internal/deployunit/metastore/DeploymentUnitStore.java | 2 +- .../internal/deployunit/metastore/DeploymentUnitStoreImpl.java | 2 +- .../ignite/internal/deployunit/metastore/NodeEventCallback.java | 2 +- .../internal/deployunit/metastore/status/ClusterStatusKey.java | 2 +- .../ignite/internal/deployunit/metastore/status/NodeStatusKey.java | 2 +- .../ignite/internal/deployunit/metastore/status/SerializeUtils.java | 4 ++-- .../internal/deployunit/metastore/status/UnitClusterStatus.java | 2 +- .../ignite/internal/deployunit/metastore/status/UnitNodeStatus.java | 2 +- .../java/org/apache/ignite/deployment/FileDeployerServiceTest.java | 2 +- .../org/apache/ignite/deployment/UnitStatusesSerializerTest.java | 2 +- .../ignite/deployment/metastore/DeploymentUnitStoreImplTest.java | 2 +- .../ignite/internal/deployunit/DeploymentManagerImplTest.java | 2 +- .../ignite/internal/deployunit/DeploymentUnitAccessorImplTest.java | 2 +- .../internal/deployunit/DeploymentUnitAcquiredWaiterTest.java | 2 +- .../ignite/internal/deployunit/metastore/status/UnitKeyTest.java | 2 +- .../java/org/apache/ignite/internal/compute/ItComputeBaseTest.java | 2 +- .../org/apache/ignite/internal/compute/ItComputeTestEmbedded.java | 2 +- .../org/apache/ignite/internal/compute/ItComputeTestStandalone.java | 4 ++-- .../src/jobs/java/org/apache/ignite/internal/compute/MapReduce.java | 2 +- .../org/apache/ignite/internal/compute/AntiHijackIgniteCompute.java | 2 +- .../java/org/apache/ignite/internal/compute/ComputeComponent.java | 2 +- .../org/apache/ignite/internal/compute/ComputeComponentImpl.java | 2 +- .../java/org/apache/ignite/internal/compute/ComputeJobFailover.java | 2 +- .../main/java/org/apache/ignite/internal/compute/ComputeUtils.java | 4 ++-- .../java/org/apache/ignite/internal/compute/IgniteComputeImpl.java | 2 +- .../org/apache/ignite/internal/compute/IgniteComputeInternal.java | 2 +- .../main/java/org/apache/ignite/internal/compute/JobStarter.java | 2 +- .../org/apache/ignite/internal/compute/RemoteExecutionContext.java | 2 +- .../apache/ignite/internal/compute/loader/JobContextManager.java | 4 ++-- .../apache/ignite/internal/compute/message/DeploymentUnitMsg.java | 2 +- .../apache/ignite/internal/compute/messaging/ComputeMessaging.java | 2 +- .../ignite/internal/compute/ClassLoaderExceptionsMapperTest.java | 2 +- .../apache/ignite/internal/compute/ComputeComponentImplTest.java | 4 ++-- .../org/apache/ignite/internal/compute/IgniteComputeImplTest.java | 2 +- .../ignite/internal/compute/loader/JobClassLoaderFactoryTest.java | 2 +- .../ignite/internal/compute/loader/JobContextManagerTest.java | 6 +++--- .../apache/ignite/internal/compute/util/DummyIgniteDeployment.java | 2 +- .../internal/rest/deployment/DeploymentManagementController.java | 2 +- .../deployment/exception/handler/VersionParseExceptionHandler.java | 2 +- .../ignite/internal/runner/app/client/ItThinClientComputeTest.java | 2 +- 79 files changed, 89 insertions(+), 87 deletions(-) diff --git a/modules/api/src/main/java/org/apache/ignite/compute/IgniteCompute.java b/modules/api/src/main/java/org/apache/ignite/compute/IgniteCompute.java index 9db34bbe1b..fe7048dc05 100644 --- a/modules/api/src/main/java/org/apache/ignite/compute/IgniteCompute.java +++ b/modules/api/src/main/java/org/apache/ignite/compute/IgniteCompute.java @@ -29,6 +29,7 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import org.apache.ignite.compute.task.MapReduceTask; import org.apache.ignite.compute.task.TaskExecution; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.network.ClusterNode; /** diff --git a/modules/api/src/main/java/org/apache/ignite/compute/JobDescriptor.java b/modules/api/src/main/java/org/apache/ignite/compute/JobDescriptor.java index 174e0bd3bc..341c7f5b5b 100644 --- a/modules/api/src/main/java/org/apache/ignite/compute/JobDescriptor.java +++ b/modules/api/src/main/java/org/apache/ignite/compute/JobDescriptor.java @@ -19,6 +19,7 @@ package org.apache.ignite.compute; import java.util.List; import java.util.Objects; +import org.apache.ignite.deployment.DeploymentUnit; /** * Compute job descriptor. diff --git a/modules/api/src/main/java/org/apache/ignite/compute/DeploymentUnit.java b/modules/api/src/main/java/org/apache/ignite/deployment/DeploymentUnit.java similarity index 96% rename from modules/api/src/main/java/org/apache/ignite/compute/DeploymentUnit.java rename to modules/api/src/main/java/org/apache/ignite/deployment/DeploymentUnit.java index cf5dd3a257..47a959eb59 100644 --- a/modules/api/src/main/java/org/apache/ignite/compute/DeploymentUnit.java +++ b/modules/api/src/main/java/org/apache/ignite/deployment/DeploymentUnit.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.ignite.compute; +package org.apache.ignite.deployment; import java.util.Objects; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; /** * Deployment unit. diff --git a/modules/api/src/main/java/org/apache/ignite/compute/version/UnitVersion.java b/modules/api/src/main/java/org/apache/ignite/deployment/version/UnitVersion.java similarity index 98% rename from modules/api/src/main/java/org/apache/ignite/compute/version/UnitVersion.java rename to modules/api/src/main/java/org/apache/ignite/deployment/version/UnitVersion.java index c0a50177c7..9d71a5cf06 100644 --- a/modules/api/src/main/java/org/apache/ignite/compute/version/UnitVersion.java +++ b/modules/api/src/main/java/org/apache/ignite/deployment/version/UnitVersion.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.compute.version; +package org.apache.ignite.deployment.version; import java.util.Objects; diff --git a/modules/api/src/main/java/org/apache/ignite/compute/version/Version.java b/modules/api/src/main/java/org/apache/ignite/deployment/version/Version.java similarity index 97% rename from modules/api/src/main/java/org/apache/ignite/compute/version/Version.java rename to modules/api/src/main/java/org/apache/ignite/deployment/version/Version.java index a4d2a4366d..874194f0de 100644 --- a/modules/api/src/main/java/org/apache/ignite/compute/version/Version.java +++ b/modules/api/src/main/java/org/apache/ignite/deployment/version/Version.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.compute.version; +package org.apache.ignite.deployment.version; /** diff --git a/modules/api/src/main/java/org/apache/ignite/compute/version/VersionParseException.java b/modules/api/src/main/java/org/apache/ignite/deployment/version/VersionParseException.java similarity index 96% rename from modules/api/src/main/java/org/apache/ignite/compute/version/VersionParseException.java rename to modules/api/src/main/java/org/apache/ignite/deployment/version/VersionParseException.java index ff5fa15300..9ab83eaddd 100644 --- a/modules/api/src/main/java/org/apache/ignite/compute/version/VersionParseException.java +++ b/modules/api/src/main/java/org/apache/ignite/deployment/version/VersionParseException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.compute.version; +package org.apache.ignite.deployment.version; /** * Throws when {@link Version} of deployment unit not parsable. diff --git a/modules/api/src/main/java/org/apache/ignite/table/ReceiverDescriptor.java b/modules/api/src/main/java/org/apache/ignite/table/ReceiverDescriptor.java index 659a3dcdd0..eef185ab10 100644 --- a/modules/api/src/main/java/org/apache/ignite/table/ReceiverDescriptor.java +++ b/modules/api/src/main/java/org/apache/ignite/table/ReceiverDescriptor.java @@ -19,7 +19,7 @@ package org.apache.ignite.table; import java.util.List; import java.util.Objects; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; /** * Data streamer receiver descriptor. diff --git a/modules/api/src/test/java/org/apache/ignite/compute/version/VersionTest.java b/modules/api/src/test/java/org/apache/ignite/deployment/version/VersionTest.java similarity index 98% rename from modules/api/src/test/java/org/apache/ignite/compute/version/VersionTest.java rename to modules/api/src/test/java/org/apache/ignite/deployment/version/VersionTest.java index e209f7d582..425d4cf7a4 100644 --- a/modules/api/src/test/java/org/apache/ignite/compute/version/VersionTest.java +++ b/modules/api/src/test/java/org/apache/ignite/deployment/version/VersionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.compute.version; +package org.apache.ignite.deployment.version; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientMessagePacker.java b/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientMessagePacker.java index e3022adf8d..c94b182fb4 100644 --- a/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientMessagePacker.java +++ b/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientMessagePacker.java @@ -27,7 +27,7 @@ import java.time.Instant; import java.util.BitSet; import java.util.List; import java.util.UUID; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder; import org.apache.ignite.internal.binarytuple.BinaryTupleParser; import org.apache.ignite.sql.BatchedArguments; diff --git a/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientMessageUnpacker.java b/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientMessageUnpacker.java index 1a4a2e64e2..234dfadc83 100644 --- a/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientMessageUnpacker.java +++ b/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientMessageUnpacker.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.BitSet; import java.util.List; import java.util.UUID; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.binarytuple.BinaryTupleReader; import org.apache.ignite.internal.util.ArrayUtils; import org.apache.ignite.sql.BatchedArguments; diff --git a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteColocatedRequest.java b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteColocatedRequest.java index bcced5d4fb..cc931db448 100644 --- a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteColocatedRequest.java +++ b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteColocatedRequest.java @@ -25,9 +25,9 @@ import static org.apache.ignite.client.handler.requests.table.ClientTableCommon. import java.util.List; import java.util.concurrent.CompletableFuture; import org.apache.ignite.client.handler.NotificationSender; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobExecutionOptions; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.client.proto.ClientMessagePacker; import org.apache.ignite.internal.client.proto.ClientMessageUnpacker; import org.apache.ignite.internal.compute.IgniteComputeInternal; diff --git a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteMapReduceRequest.java b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteMapReduceRequest.java index 6fb8cd7464..027a0d7dd6 100644 --- a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteMapReduceRequest.java +++ b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteMapReduceRequest.java @@ -26,9 +26,9 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; import org.apache.ignite.client.handler.NotificationSender; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobState; import org.apache.ignite.compute.task.TaskExecution; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.client.proto.ClientMessagePacker; import org.apache.ignite.internal.client.proto.ClientMessageUnpacker; import org.apache.ignite.internal.compute.IgniteComputeInternal; diff --git a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteRequest.java b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteRequest.java index f77f17c315..8007ebadae 100644 --- a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteRequest.java +++ b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/compute/ClientComputeExecuteRequest.java @@ -24,10 +24,10 @@ import java.util.List; import java.util.Set; import java.util.concurrent.CompletableFuture; import org.apache.ignite.client.handler.NotificationSender; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobExecutionOptions; import org.apache.ignite.compute.NodeNotFoundException; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.client.proto.ClientMessagePacker; import org.apache.ignite.internal.client.proto.ClientMessageUnpacker; import org.apache.ignite.internal.compute.IgniteComputeInternal; diff --git a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientStreamerWithReceiverBatchSendRequest.java b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientStreamerWithReceiverBatchSendRequest.java index 46967bd119..d9a0e2b474 100644 --- a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientStreamerWithReceiverBatchSendRequest.java +++ b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientStreamerWithReceiverBatchSendRequest.java @@ -25,10 +25,10 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import org.apache.ignite.compute.ComputeException; import org.apache.ignite.compute.ComputeJob; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobExecutionContext; import org.apache.ignite.compute.JobExecutionOptions; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.client.proto.ClientMessagePacker; import org.apache.ignite.internal.client.proto.ClientMessageUnpacker; import org.apache.ignite.internal.client.proto.StreamerReceiverSerializer; diff --git a/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java b/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java index 629dacb61e..112e5a93e3 100644 --- a/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java +++ b/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java @@ -37,13 +37,13 @@ import java.util.function.Function; import java.util.function.Supplier; import org.apache.ignite.compute.AnyNodeJobTarget; import org.apache.ignite.compute.ColocatedJobTarget; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.IgniteCompute; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobExecutionOptions; import org.apache.ignite.compute.JobTarget; import org.apache.ignite.compute.task.TaskExecution; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.client.ClientUtils; import org.apache.ignite.internal.client.PayloadInputChannel; import org.apache.ignite.internal.client.PayloadOutputChannel; diff --git a/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientDataStreamer.java b/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientDataStreamer.java index 748ad805bc..c07aae89fb 100644 --- a/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientDataStreamer.java +++ b/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientDataStreamer.java @@ -23,7 +23,7 @@ import java.util.concurrent.Flow; import java.util.concurrent.Flow.Publisher; import java.util.function.Function; import org.apache.ignite.client.RetryLimitPolicy; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.client.ClientUtils; import org.apache.ignite.internal.client.proto.ClientMessagePacker; import org.apache.ignite.internal.client.proto.ClientOp; diff --git a/modules/client/src/test/java/org/apache/ignite/client/ClientComputeTest.java b/modules/client/src/test/java/org/apache/ignite/client/ClientComputeTest.java index e55d0f89c1..8920496146 100644 --- a/modules/client/src/test/java/org/apache/ignite/client/ClientComputeTest.java +++ b/modules/client/src/test/java/org/apache/ignite/client/ClientComputeTest.java @@ -46,13 +46,13 @@ import java.util.function.Function; import org.apache.ignite.client.fakes.FakeCompute; import org.apache.ignite.client.fakes.FakeIgnite; import org.apache.ignite.client.fakes.FakeIgniteTables; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.IgniteCompute; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobTarget; import org.apache.ignite.compute.task.TaskExecution; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.DeploymentUnit; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.client.table.ClientTable; import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest; import org.apache.ignite.internal.testframework.IgniteTestUtils; diff --git a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeCompute.java b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeCompute.java index 2400736675..8d1d6e6ca6 100644 --- a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeCompute.java +++ b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeCompute.java @@ -42,7 +42,6 @@ import org.apache.ignite.Ignite; import org.apache.ignite.compute.AnyNodeJobTarget; import org.apache.ignite.compute.ColocatedJobTarget; import org.apache.ignite.compute.ComputeJob; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.IgniteCompute; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobExecution; @@ -51,6 +50,7 @@ import org.apache.ignite.compute.JobState; import org.apache.ignite.compute.JobStatus; import org.apache.ignite.compute.JobTarget; import org.apache.ignite.compute.task.TaskExecution; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.compute.ComputeUtils; import org.apache.ignite.internal.compute.IgniteComputeInternal; import org.apache.ignite.internal.compute.JobExecutionContextImpl; diff --git a/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/DeployFiles.java b/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/DeployFiles.java index 7baa4c8789..13b5c6a881 100644 --- a/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/DeployFiles.java +++ b/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/DeployFiles.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.app.IgniteImpl; import org.apache.ignite.internal.deployunit.DeploymentUnit; import org.apache.ignite.internal.deployunit.NodesToDeploy; diff --git a/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitFailoverTest.java b/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitFailoverTest.java index a6567fbaa1..759682c0f6 100644 --- a/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitFailoverTest.java +++ b/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitFailoverTest.java @@ -24,7 +24,7 @@ import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import java.util.List; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.ClusterPerTestIntegrationTest; import org.apache.ignite.internal.app.IgniteImpl; import org.apache.ignite.internal.deployunit.IgniteDeployment; diff --git a/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitTest.java b/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitTest.java index c686fe3f8d..b182382a8d 100644 --- a/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitTest.java +++ b/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitTest.java @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.nullValue; import java.util.List; import java.util.concurrent.CompletableFuture; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.ClusterPerTestIntegrationTest; import org.apache.ignite.internal.app.IgniteImpl; import org.apache.ignite.internal.deployunit.DeploymentStatus; diff --git a/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/Unit.java b/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/Unit.java index 9253c27486..754f52f6e7 100644 --- a/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/Unit.java +++ b/modules/code-deployment/src/integrationTest/java/org/apache/ignite/internal/deployment/Unit.java @@ -25,7 +25,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; import java.util.concurrent.CompletableFuture; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.app.IgniteImpl; import org.apache.ignite.internal.deployunit.configuration.DeploymentConfiguration; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DefaultNodeCallback.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DefaultNodeCallback.java index df7cf0c115..3b9a805cbb 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DefaultNodeCallback.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DefaultNodeCallback.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.apache.ignite.compute.DeploymentUnit; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.DeploymentUnit; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager; import org.apache.ignite.internal.cluster.management.topology.api.LogicalNode; import org.apache.ignite.internal.deployunit.metastore.DeploymentUnitStore; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployMessagingService.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployMessagingService.java index 86bbe63991..23228abee4 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployMessagingService.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployMessagingService.java @@ -22,7 +22,7 @@ import static java.util.concurrent.CompletableFuture.allOf; import java.util.List; import java.util.Objects; import java.util.concurrent.CompletableFuture; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager; import org.apache.ignite.internal.deployunit.exception.DeploymentUnitReadException; import org.apache.ignite.internal.deployunit.message.DeployUnitMessageTypes; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentManagerImpl.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentManagerImpl.java index 53e2c56cf6..3183e5a7c6 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentManagerImpl.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentManagerImpl.java @@ -38,7 +38,7 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager; import org.apache.ignite.internal.cluster.management.topology.api.LogicalNode; import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyService; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessor.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessor.java index cf384d391a..2804864e52 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessor.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessor.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.deployunit; import java.util.function.Consumer; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; /** * Interface for accessing deployment units. diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImpl.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImpl.java index 368bcce408..60628fa66c 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImpl.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImpl.java @@ -21,7 +21,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Consumer; import java.util.function.Function; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.util.RefCountedObjectPool; /** diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiter.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiter.java index b754275eea..f9ccfac56b 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiter.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiter.java @@ -23,7 +23,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.logger.IgniteLogger; import org.apache.ignite.internal.logger.Loggers; import org.apache.ignite.internal.thread.NamedThreadFactory; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DisposableDeploymentUnit.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DisposableDeploymentUnit.java index 3e1e5beec1..f3bb8f9715 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DisposableDeploymentUnit.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DisposableDeploymentUnit.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.deployunit; import java.nio.file.Path; import java.util.Objects; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; /** * Disposable deployment unit. This class is used to track deployment units that are not needed any more. diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DownloadTracker.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DownloadTracker.java index 0bdc2f202c..d5cf07dfe6 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DownloadTracker.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DownloadTracker.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.metastore.status.ClusterStatusKey; /** diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/FileDeployerService.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/FileDeployerService.java index 93e241b2bd..e1c4493b39 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/FileDeployerService.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/FileDeployerService.java @@ -33,7 +33,7 @@ import java.util.Map.Entry; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.exception.DeploymentUnitNotFoundException; import org.apache.ignite.internal.logger.IgniteLogger; import org.apache.ignite.internal.logger.Loggers; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/IgniteDeployment.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/IgniteDeployment.java index 95cdb0e216..3e96298bad 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/IgniteDeployment.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/IgniteDeployment.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.deployunit; import java.util.List; import java.util.concurrent.CompletableFuture; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.manager.IgniteComponent; /** diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatus.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatus.java index 0a85c60e7b..ef26699e53 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatus.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatus.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.deployunit; import java.util.Objects; import java.util.UUID; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; /** * Unit meta data class. diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatuses.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatuses.java index 835323187d..cedc5576e1 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatuses.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatuses.java @@ -22,7 +22,7 @@ import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; /** * Deployment unit status. diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitVersionStatus.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitVersionStatus.java index cc2c0cf35f..91e4e4e0e5 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitVersionStatus.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitVersionStatus.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.deployunit; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; /** * Unit version and status. diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/exception/DeploymentUnitNotFoundException.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/exception/DeploymentUnitNotFoundException.java index 9f1f45a56f..2e4ced43b7 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/exception/DeploymentUnitNotFoundException.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/exception/DeploymentUnitNotFoundException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.deployunit.exception; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.lang.ErrorGroups.CodeDeployment; import org.apache.ignite.lang.IgniteException; import org.jetbrains.annotations.Nullable; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/exception/DeploymentUnitUnavailableException.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/exception/DeploymentUnitUnavailableException.java index 8ea3e7e353..7bc5f4253b 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/exception/DeploymentUnitUnavailableException.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/exception/DeploymentUnitUnavailableException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.deployunit.exception; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.DeploymentStatus; import org.apache.ignite.lang.ErrorGroups.CodeDeployment; import org.apache.ignite.lang.IgniteException; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/ClusterEventCallbackImpl.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/ClusterEventCallbackImpl.java index 189f2ebef4..7575ab21ee 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/ClusterEventCallbackImpl.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/ClusterEventCallbackImpl.java @@ -22,7 +22,7 @@ import static org.apache.ignite.internal.deployunit.DeploymentStatus.REMOVING; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager; import org.apache.ignite.internal.cluster.management.topology.api.LogicalNode; import org.apache.ignite.internal.deployunit.FileDeployerService; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitFailover.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitFailover.java index ee07fb5edb..a7907fbd3e 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitFailover.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitFailover.java @@ -24,7 +24,7 @@ import static org.apache.ignite.internal.deployunit.DeploymentStatus.UPLOADING; import java.util.Objects; import java.util.UUID; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.cluster.management.topology.api.LogicalNode; import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyEventListener; import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyService; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitStore.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitStore.java index 13fd19f2ae..8b7ba33561 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitStore.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitStore.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Set; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.DeploymentStatus; import org.apache.ignite.internal.deployunit.metastore.status.UnitClusterStatus; import org.apache.ignite.internal.deployunit.metastore.status.UnitNodeStatus; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitStoreImpl.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitStoreImpl.java index fb15c86285..49bc5d98ea 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitStoreImpl.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitStoreImpl.java @@ -35,7 +35,7 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.DeploymentStatus; import org.apache.ignite.internal.deployunit.metastore.accumulator.ClusterStatusAccumulator; import org.apache.ignite.internal.deployunit.metastore.accumulator.NodeStatusAccumulator; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/NodeEventCallback.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/NodeEventCallback.java index 6e10894de0..6f1706fb10 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/NodeEventCallback.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/NodeEventCallback.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.deployunit.metastore; import java.util.List; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.metastore.status.UnitNodeStatus; /** diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/ClusterStatusKey.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/ClusterStatusKey.java index d3c1251a09..0c22670f1a 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/ClusterStatusKey.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/ClusterStatusKey.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.deployunit.metastore.status; import static org.apache.ignite.internal.deployunit.metastore.status.UnitKey.DEPLOY_UNIT_PREFIX; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.lang.ByteArray; /** diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/NodeStatusKey.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/NodeStatusKey.java index bab112284d..4ec8a93d4f 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/NodeStatusKey.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/NodeStatusKey.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.deployunit.metastore.status; import static org.apache.ignite.internal.deployunit.metastore.status.UnitKey.DEPLOY_UNIT_PREFIX; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.lang.ByteArray; /** diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/SerializeUtils.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/SerializeUtils.java index 6068ed80eb..dc900e273e 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/SerializeUtils.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/SerializeUtils.java @@ -26,8 +26,8 @@ import java.util.Collections; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import org.apache.ignite.compute.version.Version; -import org.apache.ignite.compute.version.VersionParseException; +import org.apache.ignite.deployment.version.Version; +import org.apache.ignite.deployment.version.VersionParseException; import org.apache.ignite.internal.deployunit.DeploymentStatus; import org.apache.ignite.internal.deployunit.UnitStatus; import org.jetbrains.annotations.Nullable; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/UnitClusterStatus.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/UnitClusterStatus.java index 63939b7f1a..cc09aa6a8e 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/UnitClusterStatus.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/UnitClusterStatus.java @@ -27,7 +27,7 @@ import static org.apache.ignite.internal.deployunit.metastore.status.SerializeUt import java.util.Collections; import java.util.Set; import java.util.UUID; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.DeploymentStatus; import org.apache.ignite.internal.deployunit.UnitStatus; import org.jetbrains.annotations.Nullable; diff --git a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/UnitNodeStatus.java b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/UnitNodeStatus.java index 0c32b788e3..ace6ca68f8 100644 --- a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/UnitNodeStatus.java +++ b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/status/UnitNodeStatus.java @@ -24,7 +24,7 @@ import static org.apache.ignite.internal.deployunit.metastore.status.SerializeUt import static org.apache.ignite.internal.deployunit.metastore.status.SerializeUtils.deserializeVersion; import java.util.UUID; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.DeploymentStatus; import org.apache.ignite.internal.deployunit.UnitStatus; import org.jetbrains.annotations.Nullable; diff --git a/modules/code-deployment/src/test/java/org/apache/ignite/deployment/FileDeployerServiceTest.java b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/FileDeployerServiceTest.java index a8af0a2726..0cb5764373 100644 --- a/modules/code-deployment/src/test/java/org/apache/ignite/deployment/FileDeployerServiceTest.java +++ b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/FileDeployerServiceTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.deployment; -import static org.apache.ignite.compute.version.Version.parseVersion; +import static org.apache.ignite.deployment.version.Version.parseVersion; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/modules/code-deployment/src/test/java/org/apache/ignite/deployment/UnitStatusesSerializerTest.java b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/UnitStatusesSerializerTest.java index 5b4609ac53..b97d43b1e4 100644 --- a/modules/code-deployment/src/test/java/org/apache/ignite/deployment/UnitStatusesSerializerTest.java +++ b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/UnitStatusesSerializerTest.java @@ -25,7 +25,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments; import java.util.List; import java.util.Set; import java.util.UUID; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.DeploymentStatus; import org.apache.ignite.internal.deployunit.metastore.status.SerializeUtils; import org.apache.ignite.internal.deployunit.metastore.status.UnitClusterStatus; diff --git a/modules/code-deployment/src/test/java/org/apache/ignite/deployment/metastore/DeploymentUnitStoreImplTest.java b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/metastore/DeploymentUnitStoreImplTest.java index 50edb1f030..5a0699f74c 100644 --- a/modules/code-deployment/src/test/java/org/apache/ignite/deployment/metastore/DeploymentUnitStoreImplTest.java +++ b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/metastore/DeploymentUnitStoreImplTest.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Set; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.metastore.ClusterEventCallback; import org.apache.ignite.internal.deployunit.metastore.ClusterStatusWatchListener; import org.apache.ignite.internal.deployunit.metastore.DeploymentUnitStoreImpl; diff --git a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentManagerImplTest.java b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentManagerImplTest.java index 28d1da95a9..8cbcca5415 100644 --- a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentManagerImplTest.java +++ b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentManagerImplTest.java @@ -31,7 +31,7 @@ import java.nio.file.Path; import java.util.List; import java.util.Set; import java.util.UUID; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager; import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyService; import org.apache.ignite.internal.deployunit.configuration.DeploymentConfiguration; diff --git a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImplTest.java b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImplTest.java index 2d84529ec0..ab05ef1af8 100644 --- a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImplTest.java +++ b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImplTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.deployunit; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiterTest.java b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiterTest.java index c363a5dcc7..9f77409686 100644 --- a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiterTest.java +++ b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiterTest.java @@ -31,7 +31,7 @@ import static org.mockito.Mockito.verify; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.TimeUnit; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/metastore/status/UnitKeyTest.java b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/metastore/status/UnitKeyTest.java index 717f0d5229..4b24f0ac68 100644 --- a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/metastore/status/UnitKeyTest.java +++ b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/metastore/status/UnitKeyTest.java @@ -23,7 +23,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; import java.util.List; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java index 47dfb6b86a..a78b529b3a 100644 --- a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java +++ b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java @@ -45,11 +45,11 @@ import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; import org.apache.ignite.Ignite; import org.apache.ignite.compute.ComputeException; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobTarget; import org.apache.ignite.compute.task.TaskExecution; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.ClusterPerClassIntegrationTest; import org.apache.ignite.internal.app.IgniteImpl; import org.apache.ignite.internal.util.ExceptionUtils; diff --git a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestEmbedded.java b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestEmbedded.java index ba46b896d8..ee98977181 100644 --- a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestEmbedded.java +++ b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestEmbedded.java @@ -50,12 +50,12 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; import java.util.stream.Stream; import org.apache.ignite.compute.ComputeJob; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobExecutionContext; import org.apache.ignite.compute.JobExecutionOptions; import org.apache.ignite.compute.JobTarget; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.app.IgniteImpl; import org.apache.ignite.internal.lang.IgniteInternalCheckedException; import org.apache.ignite.internal.lang.IgniteInternalException; diff --git a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java index 3d500298d0..794ccbacce 100644 --- a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java +++ b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java @@ -33,10 +33,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobTarget; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.DeploymentUnit; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.app.IgniteImpl; import org.apache.ignite.internal.deployunit.NodesToDeploy; import org.junit.jupiter.api.AfterEach; diff --git a/modules/compute/src/jobs/java/org/apache/ignite/internal/compute/MapReduce.java b/modules/compute/src/jobs/java/org/apache/ignite/internal/compute/MapReduce.java index e176d81b29..9438f0d2f4 100644 --- a/modules/compute/src/jobs/java/org/apache/ignite/internal/compute/MapReduce.java +++ b/modules/compute/src/jobs/java/org/apache/ignite/internal/compute/MapReduce.java @@ -25,12 +25,12 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobExecutionOptions; import org.apache.ignite.compute.task.MapReduceJob; import org.apache.ignite.compute.task.MapReduceTask; import org.apache.ignite.compute.task.TaskExecutionContext; +import org.apache.ignite.deployment.DeploymentUnit; /** Map reduce task which runs a {@link GetNodeNameJob} on each node and computes a sum of length of all node names. */ public class MapReduce implements MapReduceTask<Integer> { diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/AntiHijackIgniteCompute.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/AntiHijackIgniteCompute.java index 770915221e..92627408bd 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/AntiHijackIgniteCompute.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/AntiHijackIgniteCompute.java @@ -24,12 +24,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.Executor; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.IgniteCompute; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobTarget; import org.apache.ignite.compute.task.TaskExecution; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.compute.task.AntiHijackTaskExecution; import org.apache.ignite.internal.wrapper.Wrapper; import org.apache.ignite.network.ClusterNode; diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeComponent.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeComponent.java index 0eae2f0251..86d1bb76f3 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeComponent.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeComponent.java @@ -21,10 +21,10 @@ import java.util.Collection; import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobState; import org.apache.ignite.compute.task.TaskExecution; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.compute.task.JobSubmitter; import org.apache.ignite.internal.manager.IgniteComponent; import org.apache.ignite.network.ClusterNode; diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeComponentImpl.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeComponentImpl.java index ee49434632..97cade907a 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeComponentImpl.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeComponentImpl.java @@ -33,10 +33,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobState; import org.apache.ignite.compute.task.TaskExecution; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyService; import org.apache.ignite.internal.compute.configuration.ComputeConfiguration; import org.apache.ignite.internal.compute.executor.ComputeExecutor; diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeJobFailover.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeJobFailover.java index 1ed9dbb0eb..3cba4da38b 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeJobFailover.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeJobFailover.java @@ -20,8 +20,8 @@ package org.apache.ignite.internal.compute; import java.util.List; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicReference; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobExecution; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.cluster.management.topology.api.LogicalNode; import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyEventListener; import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyService; diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeUtils.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeUtils.java index 405720ced0..b50dbd4089 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeUtils.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/ComputeUtils.java @@ -32,10 +32,10 @@ import java.util.concurrent.CompletionException; import java.util.stream.Collectors; import org.apache.ignite.compute.ComputeException; import org.apache.ignite.compute.ComputeJob; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobState; import org.apache.ignite.compute.task.MapReduceTask; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.DeploymentUnit; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.compute.message.DeploymentUnitMsg; import org.apache.ignite.internal.compute.message.ExecuteResponse; import org.apache.ignite.internal.compute.message.JobCancelResponse; diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeImpl.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeImpl.java index 5dd261fb6c..ca28742e80 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeImpl.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeImpl.java @@ -42,7 +42,6 @@ import java.util.stream.Collectors; import org.apache.ignite.compute.AnyNodeJobTarget; import org.apache.ignite.compute.ColocatedJobTarget; import org.apache.ignite.compute.ComputeException; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.IgniteCompute; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobExecution; @@ -52,6 +51,7 @@ import org.apache.ignite.compute.JobTarget; import org.apache.ignite.compute.NodeNotFoundException; import org.apache.ignite.compute.task.MapReduceJob; import org.apache.ignite.compute.task.TaskExecution; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.hlc.HybridClock; import org.apache.ignite.internal.network.TopologyService; import org.apache.ignite.internal.placementdriver.PlacementDriver; diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeInternal.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeInternal.java index 32ac1fe731..449d57d07f 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeInternal.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeInternal.java @@ -23,11 +23,11 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.CompletableFuture; import org.apache.ignite.compute.ComputeJob; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.IgniteCompute; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobExecutionOptions; import org.apache.ignite.compute.JobState; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.table.TableViewInternal; import org.apache.ignite.network.ClusterNode; import org.apache.ignite.table.Tuple; diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/JobStarter.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/JobStarter.java index 1766dc762a..f96fbdfbee 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/JobStarter.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/JobStarter.java @@ -18,8 +18,8 @@ package org.apache.ignite.internal.compute; import java.util.List; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobExecution; +import org.apache.ignite.deployment.DeploymentUnit; /** * Compute job starter interface. diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/RemoteExecutionContext.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/RemoteExecutionContext.java index 9b5526a8a5..ff89760437 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/RemoteExecutionContext.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/RemoteExecutionContext.java @@ -19,8 +19,8 @@ package org.apache.ignite.internal.compute; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobExecution; +import org.apache.ignite.deployment.DeploymentUnit; /** * Captures the context of a remote job execution. Also provides methods to access the job execution object diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/loader/JobContextManager.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/loader/JobContextManager.java index 2d6646d6f6..3f68348130 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/loader/JobContextManager.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/loader/JobContextManager.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.ignite.compute.DeploymentUnit; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.DeploymentUnit; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.DeploymentStatus; import org.apache.ignite.internal.deployunit.DeploymentUnitAccessor; import org.apache.ignite.internal.deployunit.DisposableDeploymentUnit; diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/message/DeploymentUnitMsg.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/message/DeploymentUnitMsg.java index 03559079b8..5892b029ed 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/message/DeploymentUnitMsg.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/message/DeploymentUnitMsg.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.compute.message; import java.io.Serializable; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.compute.ComputeMessageTypes; import org.apache.ignite.internal.compute.ComputeMessagesFactory; import org.apache.ignite.internal.network.NetworkMessage; diff --git a/modules/compute/src/main/java/org/apache/ignite/internal/compute/messaging/ComputeMessaging.java b/modules/compute/src/main/java/org/apache/ignite/internal/compute/messaging/ComputeMessaging.java index d6ed5d76c0..6f900a95c1 100644 --- a/modules/compute/src/main/java/org/apache/ignite/internal/compute/messaging/ComputeMessaging.java +++ b/modules/compute/src/main/java/org/apache/ignite/internal/compute/messaging/ComputeMessaging.java @@ -40,9 +40,9 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.function.Function; import org.apache.ignite.compute.ComputeException; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobState; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.compute.ComputeMessageTypes; import org.apache.ignite.internal.compute.ComputeMessagesFactory; import org.apache.ignite.internal.compute.ComputeUtils; diff --git a/modules/compute/src/test/java/org/apache/ignite/internal/compute/ClassLoaderExceptionsMapperTest.java b/modules/compute/src/test/java/org/apache/ignite/internal/compute/ClassLoaderExceptionsMapperTest.java index 53d2a94c3c..771e79c217 100644 --- a/modules/compute/src/test/java/org/apache/ignite/internal/compute/ClassLoaderExceptionsMapperTest.java +++ b/modules/compute/src/test/java/org/apache/ignite/internal/compute/ClassLoaderExceptionsMapperTest.java @@ -22,7 +22,7 @@ import static org.apache.ignite.internal.compute.ClassLoaderExceptionsMapper.map import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow; import static org.hamcrest.MatcherAssert.assertThat; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.DeploymentStatus; import org.apache.ignite.internal.deployunit.exception.DeploymentUnitNotFoundException; import org.apache.ignite.internal.deployunit.exception.DeploymentUnitUnavailableException; diff --git a/modules/compute/src/test/java/org/apache/ignite/internal/compute/ComputeComponentImplTest.java b/modules/compute/src/test/java/org/apache/ignite/internal/compute/ComputeComponentImplTest.java index ec5bbc1820..5c69c07041 100644 --- a/modules/compute/src/test/java/org/apache/ignite/internal/compute/ComputeComponentImplTest.java +++ b/modules/compute/src/test/java/org/apache/ignite/internal/compute/ComputeComponentImplTest.java @@ -64,11 +64,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.Ignite; import org.apache.ignite.compute.ComputeJob; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobExecutionContext; import org.apache.ignite.compute.JobStatus; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.DeploymentUnit; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyService; import org.apache.ignite.internal.compute.configuration.ComputeConfiguration; import org.apache.ignite.internal.compute.executor.ComputeExecutor; diff --git a/modules/compute/src/test/java/org/apache/ignite/internal/compute/IgniteComputeImplTest.java b/modules/compute/src/test/java/org/apache/ignite/internal/compute/IgniteComputeImplTest.java index 3942e5a7a1..2c26d48559 100644 --- a/modules/compute/src/test/java/org/apache/ignite/internal/compute/IgniteComputeImplTest.java +++ b/modules/compute/src/test/java/org/apache/ignite/internal/compute/IgniteComputeImplTest.java @@ -38,12 +38,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.CompletableFuture; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobExecution; import org.apache.ignite.compute.JobExecutionOptions; import org.apache.ignite.compute.JobState; import org.apache.ignite.compute.JobTarget; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyService; import org.apache.ignite.internal.hlc.HybridClock; import org.apache.ignite.internal.network.ClusterNodeImpl; diff --git a/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderFactoryTest.java b/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderFactoryTest.java index d6eeaa81c6..328ae1084f 100644 --- a/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderFactoryTest.java +++ b/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderFactoryTest.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import org.apache.ignite.compute.ComputeJob; -import org.apache.ignite.compute.DeploymentUnit; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.internal.deployunit.DisposableDeploymentUnit; import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest; import org.junit.jupiter.api.DisplayName; diff --git a/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobContextManagerTest.java b/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobContextManagerTest.java index f7476aae65..1df4f94497 100644 --- a/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobContextManagerTest.java +++ b/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobContextManagerTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.compute.loader; import static java.util.concurrent.CompletableFuture.completedFuture; -import static org.apache.ignite.compute.version.Version.LATEST; +import static org.apache.ignite.deployment.version.Version.LATEST; import static org.apache.ignite.internal.deployunit.DeploymentStatus.OBSOLETE; import static org.apache.ignite.internal.deployunit.DeploymentStatus.REMOVING; import static org.apache.ignite.internal.testframework.IgniteTestUtils.getPath; @@ -40,8 +40,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; import java.util.stream.Collectors; -import org.apache.ignite.compute.DeploymentUnit; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.DeploymentUnit; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.compute.util.DummyIgniteDeployment; import org.apache.ignite.internal.deployunit.DeploymentUnitAccessorImpl; import org.apache.ignite.internal.deployunit.DisposableDeploymentUnit; diff --git a/modules/compute/src/test/java/org/apache/ignite/internal/compute/util/DummyIgniteDeployment.java b/modules/compute/src/test/java/org/apache/ignite/internal/compute/util/DummyIgniteDeployment.java index bfc77c4b76..be75511e21 100644 --- a/modules/compute/src/test/java/org/apache/ignite/internal/compute/util/DummyIgniteDeployment.java +++ b/modules/compute/src/test/java/org/apache/ignite/internal/compute/util/DummyIgniteDeployment.java @@ -28,7 +28,7 @@ import java.nio.file.Path; import java.util.Arrays; import java.util.List; import java.util.concurrent.CompletableFuture; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.DeploymentStatus; import org.apache.ignite.internal.deployunit.DeploymentUnit; import org.apache.ignite.internal.deployunit.IgniteDeployment; diff --git a/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/DeploymentManagementController.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/DeploymentManagementController.java index c1f7856e07..58996ee418 100644 --- a/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/DeploymentManagementController.java +++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/DeploymentManagementController.java @@ -28,7 +28,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; import java.util.stream.Collectors; -import org.apache.ignite.compute.version.Version; +import org.apache.ignite.deployment.version.Version; import org.apache.ignite.internal.deployunit.IgniteDeployment; import org.apache.ignite.internal.deployunit.NodesToDeploy; import org.apache.ignite.internal.deployunit.UnitStatuses; diff --git a/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/exception/handler/VersionParseExceptionHandler.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/exception/handler/VersionParseExceptionHandler.java index 195ca6617c..752cfe78a8 100644 --- a/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/exception/handler/VersionParseExceptionHandler.java +++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/exception/handler/VersionParseExceptionHandler.java @@ -22,7 +22,7 @@ import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpResponse; import io.micronaut.http.server.exceptions.ExceptionHandler; import jakarta.inject.Singleton; -import org.apache.ignite.compute.version.VersionParseException; +import org.apache.ignite.deployment.version.VersionParseException; import org.apache.ignite.internal.rest.api.Problem; import org.apache.ignite.internal.rest.constants.HttpCode; import org.apache.ignite.internal.rest.problem.HttpProblemResponse; 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 4bcb14fe44..1260ef5a4f 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 @@ -74,7 +74,6 @@ import org.apache.ignite.client.IgniteClient.Builder; import org.apache.ignite.client.IgniteClientConnectionException; import org.apache.ignite.compute.ComputeException; import org.apache.ignite.compute.ComputeJob; -import org.apache.ignite.compute.DeploymentUnit; import org.apache.ignite.compute.IgniteCompute; import org.apache.ignite.compute.JobDescriptor; import org.apache.ignite.compute.JobExecution; @@ -84,6 +83,7 @@ import org.apache.ignite.compute.task.MapReduceJob; import org.apache.ignite.compute.task.MapReduceTask; import org.apache.ignite.compute.task.TaskExecution; import org.apache.ignite.compute.task.TaskExecutionContext; +import org.apache.ignite.deployment.DeploymentUnit; import org.apache.ignite.lang.IgniteException; import org.apache.ignite.network.ClusterNode; import org.apache.ignite.table.Tuple;
