This is an automated email from the ASF dual-hosted git repository.
apkhmv 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 7381daeef3 IGNITE-19025 Remove deployment code from API module (#1844)
7381daeef3 is described below
commit 7381daeef3927ae69fc0964dee55dc9e080f804e
Author: Mikhail <[email protected]>
AuthorDate: Tue Mar 28 13:57:43 2023 +0300
IGNITE-19025 Remove deployment code from API module (#1844)
---
.../src/main/java/org/apache/ignite/Ignite.java | 8 ------
.../ignite/internal/client/TcpIgniteClient.java | 7 -----
.../org/apache/ignite/client/fakes/FakeIgnite.java | 6 ----
.../deployunit/DeployMessagingService.java | 2 +-
.../deployunit/DeployMetastoreService.java | 2 +-
.../ignite/internal/deployunit/DeployTracker.java | 2 +-
.../internal/deployunit}/DeploymentInfo.java | 2 +-
.../internal/deployunit/DeploymentManagerImpl.java | 15 ++++------
.../internal/deployunit}/DeploymentStatus.java | 2 +-
.../internal/deployunit}/DeploymentUnit.java | 2 +-
.../internal/deployunit}/IgniteDeployment.java | 7 +++--
.../ignite/internal/deployunit/UnitMeta.java | 3 +-
.../ignite/internal/deployunit}/UnitStatus.java | 4 +--
.../ignite/internal/deployunit/key/UnitKey.java | 2 +-
.../deployunit/key/UnitMetaSerializer.java | 4 +--
.../metastore/UnitStatusAccumulator.java | 6 ++--
.../deployunit/metastore/UnitsAccumulator.java | 6 ++--
.../internal/deployunit}/version/UnitVersion.java | 2 +-
.../internal/deployunit}/version/Version.java | 2 +-
.../deployunit}/version/VersionParseException.java | 2 +-
.../ignite/deployment/UnitMetaSerializerTest.java | 4 +--
.../ignite/deployment/version/VersionUnitTest.java | 3 ++
modules/rest-api/openapi/openapi.yaml | 4 +--
.../rest/api/deployment/UnitStatusDto.java | 23 +---------------
.../DeploymentManagementControllerTest.java | 2 +-
.../rest/deployment/CodeDeploymentRestFactory.java | 2 +-
.../deployment/DeploymentManagementController.java | 32 ++++++++++++++++++----
.../handler/VersionParseExceptionHandler.java | 2 +-
.../internal/deployment/ItDeploymentUnitTest.java | 19 +++++++------
.../org/apache/ignite/internal/app/IgniteImpl.java | 15 +++++-----
30 files changed, 84 insertions(+), 108 deletions(-)
diff --git a/modules/api/src/main/java/org/apache/ignite/Ignite.java
b/modules/api/src/main/java/org/apache/ignite/Ignite.java
index 4d36bbddaf..f01f8779da 100644
--- a/modules/api/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/api/src/main/java/org/apache/ignite/Ignite.java
@@ -21,7 +21,6 @@ import java.util.Collection;
import java.util.concurrent.CompletableFuture;
import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.IgniteCompute;
-import org.apache.ignite.deployment.IgniteDeployment;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.sql.IgniteSql;
import org.apache.ignite.table.manager.IgniteTables;
@@ -68,13 +67,6 @@ public interface Ignite extends AutoCloseable {
*/
IgniteCompute compute();
- /**
- * Returns {@link IgniteDeployment} which can be used to deploy units.
- *
- * @return Deployment management object.
- */
- IgniteDeployment deployment();
-
/**
* Gets the cluster nodes.
* NOTE: Temporary API to enable Compute until we have proper Cluster API.
diff --git
a/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
b/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
index e7feb7862c..4bfe8e40c4 100644
---
a/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
+++
b/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
@@ -26,7 +26,6 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.client.IgniteClient;
import org.apache.ignite.client.IgniteClientConfiguration;
import org.apache.ignite.compute.IgniteCompute;
-import org.apache.ignite.deployment.IgniteDeployment;
import org.apache.ignite.internal.client.compute.ClientCompute;
import org.apache.ignite.internal.client.proto.ClientOp;
import org.apache.ignite.internal.client.sql.ClientSql;
@@ -162,12 +161,6 @@ public class TcpIgniteClient implements IgniteClient {
return compute;
}
- /** {@inheritDoc} */
- @Override
- public IgniteDeployment deployment() {
- throw new UnsupportedOperationException("Deployment management not
implemented yet.");
- }
-
/** {@inheritDoc} */
@Override
public Collection<ClusterNode> clusterNodes() {
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
index 16deb7367f..51da2b6737 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
@@ -22,7 +22,6 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import org.apache.ignite.Ignite;
import org.apache.ignite.compute.IgniteCompute;
-import org.apache.ignite.deployment.IgniteDeployment;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.internal.sql.engine.QueryProcessor;
@@ -168,11 +167,6 @@ public class FakeIgnite implements Ignite {
throw new UnsupportedOperationException("Not implemented yet");
}
- @Override
- public IgniteDeployment deployment() {
- throw new UnsupportedOperationException("Not implemented yet");
- }
-
/** {@inheritDoc} */
@Override
public Collection<ClusterNode> clusterNodes() {
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 6370a5a3f3..efb6f76e21 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
@@ -24,7 +24,6 @@ import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import org.apache.ignite.deployment.version.Version;
import
org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
import org.apache.ignite.internal.deployunit.message.DeployUnitMessageTypes;
import org.apache.ignite.internal.deployunit.message.DeployUnitRequest;
@@ -37,6 +36,7 @@ import
org.apache.ignite.internal.deployunit.message.StopDeployResponseImpl;
import org.apache.ignite.internal.deployunit.message.UndeployUnitRequest;
import org.apache.ignite.internal.deployunit.message.UndeployUnitRequestImpl;
import org.apache.ignite.internal.deployunit.message.UndeployUnitResponseImpl;
+import org.apache.ignite.internal.deployunit.version.Version;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.network.ChannelType;
diff --git
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployMetastoreService.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployMetastoreService.java
index 1222bb32a6..926e950512 100644
---
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployMetastoreService.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployMetastoreService.java
@@ -30,8 +30,8 @@ import static
org.apache.ignite.internal.metastorage.dsl.Operations.remove;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Flow.Publisher;
import java.util.function.Consumer;
-import org.apache.ignite.deployment.version.Version;
import org.apache.ignite.internal.deployunit.key.UnitMetaSerializer;
+import org.apache.ignite.internal.deployunit.version.Version;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.metastorage.Entry;
diff --git
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployTracker.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployTracker.java
index a32a3e978d..2b9a516c44 100644
---
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployTracker.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployTracker.java
@@ -22,7 +22,7 @@ import static
org.apache.ignite.internal.deployunit.key.UnitKey.key;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.ignite.deployment.version.Version;
+import org.apache.ignite.internal.deployunit.version.Version;
import org.apache.ignite.internal.future.InFlightFutures;
import org.apache.ignite.lang.ByteArray;
diff --git
a/modules/api/src/main/java/org/apache/ignite/deployment/DeploymentInfo.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentInfo.java
similarity index 98%
rename from
modules/api/src/main/java/org/apache/ignite/deployment/DeploymentInfo.java
rename to
modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentInfo.java
index 68b909285e..a998b72d8a 100644
--- a/modules/api/src/main/java/org/apache/ignite/deployment/DeploymentInfo.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.deployment;
+package org.apache.ignite.internal.deployunit;
import java.util.ArrayList;
import java.util.Collection;
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 470110e673..d071be1008 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
@@ -18,9 +18,9 @@
package org.apache.ignite.internal.deployunit;
import static java.util.concurrent.CompletableFuture.allOf;
-import static org.apache.ignite.deployment.DeploymentStatus.DEPLOYED;
-import static org.apache.ignite.deployment.DeploymentStatus.OBSOLETE;
-import static org.apache.ignite.deployment.DeploymentStatus.REMOVING;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.OBSOLETE;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.REMOVING;
import java.io.IOException;
import java.nio.file.Path;
@@ -28,11 +28,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
-import org.apache.ignite.deployment.DeploymentStatus;
-import org.apache.ignite.deployment.DeploymentUnit;
-import org.apache.ignite.deployment.IgniteDeployment;
-import org.apache.ignite.deployment.UnitStatus;
-import org.apache.ignite.deployment.version.Version;
import
org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
import
org.apache.ignite.internal.deployunit.configuration.DeploymentConfiguration;
import
org.apache.ignite.internal.deployunit.exception.DeploymentUnitAlreadyExistsException;
@@ -43,16 +38,16 @@ import
org.apache.ignite.internal.deployunit.metastore.EntrySubscriber;
import org.apache.ignite.internal.deployunit.metastore.SortedListAccumulator;
import org.apache.ignite.internal.deployunit.metastore.UnitStatusAccumulator;
import org.apache.ignite.internal.deployunit.metastore.UnitsAccumulator;
+import org.apache.ignite.internal.deployunit.version.Version;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
-import org.apache.ignite.internal.manager.IgniteComponent;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.network.ClusterService;
/**
* Deployment manager implementation.
*/
-public class DeploymentManagerImpl implements IgniteDeployment,
IgniteComponent {
+public class DeploymentManagerImpl implements IgniteDeployment {
private static final IgniteLogger LOG =
Loggers.forClass(DeploymentManagerImpl.class);
diff --git
a/modules/api/src/main/java/org/apache/ignite/deployment/DeploymentStatus.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentStatus.java
similarity index 96%
rename from
modules/api/src/main/java/org/apache/ignite/deployment/DeploymentStatus.java
rename to
modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentStatus.java
index 41cf27d845..3c106cff7e 100644
---
a/modules/api/src/main/java/org/apache/ignite/deployment/DeploymentStatus.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.deployment;
+package org.apache.ignite.internal.deployunit;
/**
* Status of deployment process.
diff --git
a/modules/api/src/main/java/org/apache/ignite/deployment/DeploymentUnit.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnit.java
similarity index 96%
rename from
modules/api/src/main/java/org/apache/ignite/deployment/DeploymentUnit.java
rename to
modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnit.java
index 75660a9121..4e206eb0ae 100644
--- a/modules/api/src/main/java/org/apache/ignite/deployment/DeploymentUnit.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentUnit.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.deployment;
+package org.apache.ignite.internal.deployunit;
import java.io.InputStream;
diff --git
a/modules/api/src/main/java/org/apache/ignite/deployment/IgniteDeployment.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/IgniteDeployment.java
similarity index 93%
rename from
modules/api/src/main/java/org/apache/ignite/deployment/IgniteDeployment.java
rename to
modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/IgniteDeployment.java
index 63514b091a..f59478955a 100644
---
a/modules/api/src/main/java/org/apache/ignite/deployment/IgniteDeployment.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/IgniteDeployment.java
@@ -15,16 +15,17 @@
* limitations under the License.
*/
-package org.apache.ignite.deployment;
+package org.apache.ignite.internal.deployunit;
import java.util.List;
import java.util.concurrent.CompletableFuture;
-import org.apache.ignite.deployment.version.Version;
+import org.apache.ignite.internal.deployunit.version.Version;
+import org.apache.ignite.internal.manager.IgniteComponent;
/**
* Provides access to the Deployment Unit functionality.
*/
-public interface IgniteDeployment {
+public interface IgniteDeployment extends IgniteComponent {
/**
* Deploy provided unit to current node.
* After deploy finished, this deployment unit will be place to CMG group
asynchronously.
diff --git
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitMeta.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitMeta.java
index 29e5f0f8df..6d23d95330 100644
---
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitMeta.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitMeta.java
@@ -19,8 +19,7 @@ package org.apache.ignite.internal.deployunit;
import java.util.ArrayList;
import java.util.List;
-import org.apache.ignite.deployment.DeploymentStatus;
-import org.apache.ignite.deployment.version.Version;
+import org.apache.ignite.internal.deployunit.version.Version;
/**
* Unit meta data class.
diff --git
a/modules/api/src/main/java/org/apache/ignite/deployment/UnitStatus.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatus.java
similarity index 97%
rename from
modules/api/src/main/java/org/apache/ignite/deployment/UnitStatus.java
rename to
modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatus.java
index 478d67a220..b734a0e622 100644
--- a/modules/api/src/main/java/org/apache/ignite/deployment/UnitStatus.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/UnitStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.deployment;
+package org.apache.ignite.internal.deployunit;
import java.util.Collections;
import java.util.HashMap;
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import org.apache.ignite.deployment.version.Version;
+import org.apache.ignite.internal.deployunit.version.Version;
/**
* Deployment unit status.
diff --git
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/key/UnitKey.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/key/UnitKey.java
index e79a5dbfc6..bec1d4e54d 100644
---
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/key/UnitKey.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/key/UnitKey.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.deployunit.key;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.Base64.Encoder;
-import org.apache.ignite.deployment.version.Version;
+import org.apache.ignite.internal.deployunit.version.Version;
import org.apache.ignite.lang.ByteArray;
/**
diff --git
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/key/UnitMetaSerializer.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/key/UnitMetaSerializer.java
index 624bdd17ab..347e77175a 100644
---
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/key/UnitMetaSerializer.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/key/UnitMetaSerializer.java
@@ -24,9 +24,9 @@ import java.util.Base64;
import java.util.Base64.Decoder;
import java.util.Base64.Encoder;
import java.util.List;
-import org.apache.ignite.deployment.DeploymentStatus;
-import org.apache.ignite.deployment.version.Version;
+import org.apache.ignite.internal.deployunit.DeploymentStatus;
import org.apache.ignite.internal.deployunit.UnitMeta;
+import org.apache.ignite.internal.deployunit.version.Version;
/**
* Serializer for {@link UnitMeta}.
diff --git
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/UnitStatusAccumulator.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/UnitStatusAccumulator.java
index 1a96868589..b37f210be8 100644
---
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/UnitStatusAccumulator.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/UnitStatusAccumulator.java
@@ -17,10 +17,10 @@
package org.apache.ignite.internal.deployunit.metastore;
-import org.apache.ignite.deployment.DeploymentInfo;
-import org.apache.ignite.deployment.UnitStatus;
-import org.apache.ignite.deployment.UnitStatus.UnitStatusBuilder;
+import org.apache.ignite.internal.deployunit.DeploymentInfo;
import org.apache.ignite.internal.deployunit.UnitMeta;
+import org.apache.ignite.internal.deployunit.UnitStatus;
+import org.apache.ignite.internal.deployunit.UnitStatus.UnitStatusBuilder;
import
org.apache.ignite.internal.deployunit.exception.DeploymentUnitNotFoundException;
import org.apache.ignite.internal.deployunit.key.UnitMetaSerializer;
import org.apache.ignite.internal.metastorage.Entry;
diff --git
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/UnitsAccumulator.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/UnitsAccumulator.java
index 6d1e91c555..55850f2a17 100644
---
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/UnitsAccumulator.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/UnitsAccumulator.java
@@ -22,10 +22,10 @@ import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import org.apache.ignite.deployment.DeploymentInfo;
-import org.apache.ignite.deployment.UnitStatus;
-import org.apache.ignite.deployment.UnitStatus.UnitStatusBuilder;
+import org.apache.ignite.internal.deployunit.DeploymentInfo;
import org.apache.ignite.internal.deployunit.UnitMeta;
+import org.apache.ignite.internal.deployunit.UnitStatus;
+import org.apache.ignite.internal.deployunit.UnitStatus.UnitStatusBuilder;
import org.apache.ignite.internal.deployunit.key.UnitMetaSerializer;
import org.apache.ignite.internal.metastorage.Entry;
diff --git
a/modules/api/src/main/java/org/apache/ignite/deployment/version/UnitVersion.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/version/UnitVersion.java
similarity index 98%
rename from
modules/api/src/main/java/org/apache/ignite/deployment/version/UnitVersion.java
rename to
modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/version/UnitVersion.java
index 08bfd8d9e4..c408595e64 100644
---
a/modules/api/src/main/java/org/apache/ignite/deployment/version/UnitVersion.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/version/UnitVersion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.deployment.version;
+package org.apache.ignite.internal.deployunit.version;
import java.util.Objects;
diff --git
a/modules/api/src/main/java/org/apache/ignite/deployment/version/Version.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/version/Version.java
similarity index 97%
rename from
modules/api/src/main/java/org/apache/ignite/deployment/version/Version.java
rename to
modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/version/Version.java
index 9bb09073a4..f15393c3b4 100644
---
a/modules/api/src/main/java/org/apache/ignite/deployment/version/Version.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/version/Version.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.deployment.version;
+package org.apache.ignite.internal.deployunit.version;
/**
diff --git
a/modules/api/src/main/java/org/apache/ignite/deployment/version/VersionParseException.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/version/VersionParseException.java
similarity index 96%
rename from
modules/api/src/main/java/org/apache/ignite/deployment/version/VersionParseException.java
rename to
modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/version/VersionParseException.java
index 9ab83eaddd..57f1ed9e10 100644
---
a/modules/api/src/main/java/org/apache/ignite/deployment/version/VersionParseException.java
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/version/VersionParseException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.deployment.version;
+package org.apache.ignite.internal.deployunit.version;
/**
* Throws when {@link Version} of deployment unit not parsable.
diff --git
a/modules/code-deployment/src/test/java/org/apache/ignite/deployment/UnitMetaSerializerTest.java
b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/UnitMetaSerializerTest.java
index 09501557a4..88336e4ad4 100644
---
a/modules/code-deployment/src/test/java/org/apache/ignite/deployment/UnitMetaSerializerTest.java
+++
b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/UnitMetaSerializerTest.java
@@ -17,16 +17,16 @@
package org.apache.ignite.deployment;
-import static org.apache.ignite.deployment.DeploymentStatus.UPLOADING;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.UPLOADING;
import static
org.apache.ignite.internal.deployunit.key.UnitMetaSerializer.deserialize;
import static
org.apache.ignite.internal.deployunit.key.UnitMetaSerializer.serialize;
import static org.hamcrest.Matchers.is;
import java.util.Arrays;
import java.util.Collections;
-import org.apache.ignite.deployment.version.Version;
import org.apache.ignite.internal.deployunit.UnitMeta;
import org.apache.ignite.internal.deployunit.key.UnitMetaSerializer;
+import org.apache.ignite.internal.deployunit.version.Version;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.Test;
diff --git
a/modules/api/src/test/java/org/apache/ignite/deployment/version/VersionUnitTest.java
b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/version/VersionUnitTest.java
similarity index 91%
rename from
modules/api/src/test/java/org/apache/ignite/deployment/version/VersionUnitTest.java
rename to
modules/code-deployment/src/test/java/org/apache/ignite/deployment/version/VersionUnitTest.java
index bd0ed3cf44..f2f436fef3 100644
---
a/modules/api/src/test/java/org/apache/ignite/deployment/version/VersionUnitTest.java
+++
b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/version/VersionUnitTest.java
@@ -20,6 +20,9 @@ package org.apache.ignite.deployment.version;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
+import org.apache.ignite.internal.deployunit.version.UnitVersion;
+import org.apache.ignite.internal.deployunit.version.Version;
+import org.apache.ignite.internal.deployunit.version.VersionParseException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/modules/rest-api/openapi/openapi.yaml
b/modules/rest-api/openapi/openapi.yaml
index 727589e27c..53cd30ff45 100644
--- a/modules/rest-api/openapi/openapi.yaml
+++ b/modules/rest-api/openapi/openapi.yaml
@@ -327,7 +327,7 @@ paths:
parameters: []
responses:
"200":
- description: All statutes returned successfully.
+ description: All statuses returned successfully.
content:
application/json:
schema:
@@ -402,7 +402,7 @@ paths:
type: string
responses:
"200":
- description: All statutes returned successfully.
+ description: All statuses returned successfully.
content:
application/json:
schema:
diff --git
a/modules/rest-api/src/main/java/org/apache/ignite/internal/rest/api/deployment/UnitStatusDto.java
b/modules/rest-api/src/main/java/org/apache/ignite/internal/rest/api/deployment/UnitStatusDto.java
index 7d33a606e1..bdee9ec6a7 100644
---
a/modules/rest-api/src/main/java/org/apache/ignite/internal/rest/api/deployment/UnitStatusDto.java
+++
b/modules/rest-api/src/main/java/org/apache/ignite/internal/rest/api/deployment/UnitStatusDto.java
@@ -21,15 +21,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonGetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import org.apache.ignite.deployment.UnitStatus;
-import org.apache.ignite.deployment.version.Version;
/**
- * DTO of {@link UnitStatus}.
+ * DTO of unit status.
*/
@Schema(name = "UnitStatus", description = "Unit status.")
public class UnitStatusDto {
@@ -70,21 +66,4 @@ public class UnitStatusDto {
public Map<String, List<String>> versionToConsistentIds() {
return versionToConsistentIds;
}
-
-
- /**
- * Mapper method.
- *
- * @param status Unit status.
- * @return Unit status DTO.
- */
- public static UnitStatusDto fromUnitStatus(UnitStatus status) {
- Map<String, List<String>> versionToConsistentIds = new HashMap<>();
- Set<Version> versions = status.versions();
- for (Version version : versions) {
- versionToConsistentIds.put(version.render(),
status.consistentIds(version));
- }
- return new UnitStatusDto(status.id(), versionToConsistentIds);
- }
-
}
diff --git
a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/deployment/DeploymentManagementControllerTest.java
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/deployment/DeploymentManagementControllerTest.java
index 47307108ba..0cafad3431 100644
---
a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/deployment/DeploymentManagementControllerTest.java
+++
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/deployment/DeploymentManagementControllerTest.java
@@ -50,7 +50,7 @@ import java.nio.file.Path;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import org.apache.ignite.deployment.version.Version;
+import org.apache.ignite.internal.deployunit.version.Version;
import org.apache.ignite.internal.rest.api.deployment.UnitStatusDto;
import org.apache.ignite.internal.testframework.IntegrationTestBase;
import org.junit.jupiter.api.AfterEach;
diff --git
a/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/CodeDeploymentRestFactory.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/CodeDeploymentRestFactory.java
index d4411a0618..932ba9452f 100644
---
a/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/CodeDeploymentRestFactory.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/CodeDeploymentRestFactory.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.rest.deployment;
import io.micronaut.context.annotation.Bean;
import io.micronaut.context.annotation.Factory;
import jakarta.inject.Singleton;
-import org.apache.ignite.deployment.IgniteDeployment;
+import org.apache.ignite.internal.deployunit.IgniteDeployment;
import org.apache.ignite.internal.rest.RestFactory;
/**
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 0178afef8a..73a56d6b35 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
@@ -22,11 +22,16 @@ import io.micronaut.http.multipart.CompletedFileUpload;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
-import org.apache.ignite.deployment.DeploymentUnit;
-import org.apache.ignite.deployment.IgniteDeployment;
-import org.apache.ignite.deployment.version.Version;
+import org.apache.ignite.internal.deployunit.DeploymentUnit;
+import org.apache.ignite.internal.deployunit.IgniteDeployment;
+import org.apache.ignite.internal.deployunit.UnitStatus;
+import org.apache.ignite.internal.deployunit.version.Version;
import org.apache.ignite.internal.rest.api.deployment.DeploymentCodeApi;
import org.apache.ignite.internal.rest.api.deployment.UnitStatusDto;
@@ -66,7 +71,7 @@ public class DeploymentManagementController implements
DeploymentCodeApi {
@Override
public CompletableFuture<Collection<UnitStatusDto>> units() {
- return deployment.unitsAsync().thenApply(statuses ->
statuses.stream().map(UnitStatusDto::fromUnitStatus)
+ return deployment.unitsAsync().thenApply(statuses ->
statuses.stream().map(DeploymentManagementController::fromUnitStatus)
.collect(Collectors.toList()));
}
@@ -78,13 +83,13 @@ public class DeploymentManagementController implements
DeploymentCodeApi {
@Override
public CompletableFuture<UnitStatusDto> status(String unitId) {
- return
deployment.statusAsync(unitId).thenApply(UnitStatusDto::fromUnitStatus);
+ return
deployment.statusAsync(unitId).thenApply(DeploymentManagementController::fromUnitStatus);
}
@Override
public CompletableFuture<Collection<UnitStatusDto>>
findByConsistentId(String consistentId) {
return deployment.findUnitByConsistentIdAsync(consistentId)
- .thenApply(units ->
units.stream().map(UnitStatusDto::fromUnitStatus)
+ .thenApply(units ->
units.stream().map(DeploymentManagementController::fromUnitStatus)
.collect(Collectors.toList()));
}
@@ -103,4 +108,19 @@ public class DeploymentManagementController implements
DeploymentCodeApi {
}
};
}
+
+ /**
+ * Mapper method.
+ *
+ * @param status Unit status.
+ * @return Unit status DTO.
+ */
+ public static UnitStatusDto fromUnitStatus(UnitStatus status) {
+ Map<String, List<String>> versionToConsistentIds = new HashMap<>();
+ Set<Version> versions = status.versions();
+ for (Version version : versions) {
+ versionToConsistentIds.put(version.render(),
status.consistentIds(version));
+ }
+ return new UnitStatusDto(status.id(), versionToConsistentIds);
+ }
}
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 752cfe78a8..04afdacd4b 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.deployment.version.VersionParseException;
+import org.apache.ignite.internal.deployunit.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/deployment/ItDeploymentUnitTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitTest.java
index a3fb8e1db9..c1a617592b 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/deployment/ItDeploymentUnitTest.java
@@ -21,9 +21,9 @@ import static java.nio.file.StandardOpenOption.CREATE;
import static java.nio.file.StandardOpenOption.WRITE;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.ignite.deployment.DeploymentStatus.DEPLOYED;
-import static org.apache.ignite.deployment.DeploymentStatus.REMOVING;
-import static org.apache.ignite.deployment.DeploymentStatus.UPLOADING;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.REMOVING;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.UPLOADING;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowFast;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedFast;
@@ -42,20 +42,21 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
-import org.apache.ignite.deployment.DeploymentInfo;
-import org.apache.ignite.deployment.DeploymentUnit;
-import org.apache.ignite.deployment.UnitStatus;
-import org.apache.ignite.deployment.UnitStatus.UnitStatusBuilder;
-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.DeploymentInfo;
+import org.apache.ignite.internal.deployunit.DeploymentUnit;
+import org.apache.ignite.internal.deployunit.IgniteDeployment;
+import org.apache.ignite.internal.deployunit.UnitStatus;
+import org.apache.ignite.internal.deployunit.UnitStatus.UnitStatusBuilder;
import
org.apache.ignite.internal.deployunit.configuration.DeploymentConfiguration;
import
org.apache.ignite.internal.deployunit.exception.DeploymentUnitNotFoundException;
+import org.apache.ignite.internal.deployunit.version.Version;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
- * Integration tests for {@link org.apache.ignite.deployment.IgniteDeployment}.
+ * Integration tests for {@link IgniteDeployment}.
*/
public class ItDeploymentUnitTest extends ClusterPerTestIntegrationTest {
private static final int BASE_REPLICA_TIMEOUT = 30;
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
index 52a494ac92..5eeb0aa5aa 100644
---
a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
+++
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
@@ -39,7 +39,6 @@ import
org.apache.ignite.client.handler.ClientHandlerMetricSource;
import org.apache.ignite.client.handler.ClientHandlerModule;
import org.apache.ignite.compute.IgniteCompute;
import org.apache.ignite.configuration.ConfigurationModule;
-import org.apache.ignite.deployment.IgniteDeployment;
import org.apache.ignite.internal.baseline.BaselineManager;
import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.catalog.CatalogServiceImpl;
@@ -69,6 +68,7 @@ import
org.apache.ignite.internal.configuration.storage.ConfigurationStorage;
import
org.apache.ignite.internal.configuration.storage.DistributedConfigurationStorage;
import
org.apache.ignite.internal.configuration.storage.LocalFileConfigurationStorage;
import org.apache.ignite.internal.deployunit.DeploymentManagerImpl;
+import org.apache.ignite.internal.deployunit.IgniteDeployment;
import
org.apache.ignite.internal.deployunit.configuration.DeploymentConfiguration;
import org.apache.ignite.internal.distributionzones.DistributionZoneManager;
import
org.apache.ignite.internal.distributionzones.configuration.DistributionZonesConfiguration;
@@ -77,7 +77,6 @@ import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.index.IndexManager;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
-import org.apache.ignite.internal.manager.IgniteComponent;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.metastorage.impl.MetaStorageManagerImpl;
import
org.apache.ignite.internal.metastorage.server.persistence.RocksDbKeyValueStorage;
@@ -673,7 +672,7 @@ public class IgniteImpl implements Ignite {
indexManager,
qryEngine,
clientHandlerModule,
- (IgniteComponent) deploymentManager
+ deploymentManager
);
} catch (NodeStoppingException e) {
throw new CompletionException(e);
@@ -801,11 +800,6 @@ public class IgniteImpl implements Ignite {
return compute;
}
- @Override
- public IgniteDeployment deployment() {
- return deploymentManager;
- }
-
/** {@inheritDoc} */
@Override
public Collection<ClusterNode> clusterNodes() {
@@ -965,6 +959,11 @@ public class IgniteImpl implements Ignite {
return logicalTopologyService;
}
+ @TestOnly
+ public IgniteDeployment deployment() {
+ return deploymentManager;
+ }
+
// TODO: IGNITE-18493 - remove/move this
@TestOnly
public void dropMessages(BiPredicate<String, NetworkMessage> predicate) {
