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 2b4e7b0ee1 IGNITE-19651 Create internal presentation of DeploymentUnit
and use it in the internal code base (#2211)
2b4e7b0ee1 is described below
commit 2b4e7b0ee143f464300a4f458edf73d105212a17
Author: Ivan Gagarkin <[email protected]>
AuthorDate: Tue Jun 20 18:17:47 2023 +0400
IGNITE-19651 Create internal presentation of DeploymentUnit and use it in
the internal code base (#2211)
---
modules/code-deployment/build.gradle | 1 -
.../internal/deployunit/DefaultNodeCallback.java | 2 +-
.../internal/deployunit/DeploymentManagerImpl.java | 7 ++---
.../internal/deployunit/DeploymentStatus.java | 35 ++++++++++++++++++++++
.../internal/deployunit/IgniteDeployment.java | 1 -
.../ignite/internal/deployunit/UnitStatus.java | 1 -
.../ignite/internal/deployunit/UnitStatuses.java | 1 -
.../DeploymentUnitUnavailableException.java | 2 +-
.../metastore/DeploymentUnitFailover.java | 4 +--
.../deployunit/metastore/DeploymentUnitStore.java | 4 +--
.../metastore/DeploymentUnitStoreImpl.java | 6 ++--
.../metastore/status/UnitClusterStatus.java | 2 +-
.../metastore/status/UnitNodeStatus.java | 2 +-
.../deployment/UnitStatusesSerializerTest.java | 4 +--
.../metastore/DeploymentUnitStoreImplTest.java | 8 ++---
.../deployunit/DeploymentManagerImplTest.java | 1 -
modules/compute/build.gradle | 1 -
.../internal/compute/loader/JobContextManager.java | 2 +-
.../compute/ClassLoaderExceptionsMapperTest.java | 2 +-
.../internal/compute/ComputeComponentImplTest.java | 2 +-
.../compute/loader/JobContextManagerTest.java | 4 +--
.../compute/util/DummyIgniteDeployment.java | 4 +--
modules/rest-api/openapi/openapi.yaml | 2 +-
.../authentication/NodeOnlyEndpointsFilter.java | 2 +-
.../deployment/DeploymentManagementController.java | 6 +++-
.../internal/compute/ItComputeTestStandalone.java | 2 +-
.../ignite/internal/deployment/DeployFiles.java | 2 +-
.../internal/deployment/ItDeploymentUnitTest.java | 6 ++--
28 files changed, 74 insertions(+), 42 deletions(-)
diff --git a/modules/code-deployment/build.gradle
b/modules/code-deployment/build.gradle
index 6264087f83..6933e2accf 100644
--- a/modules/code-deployment/build.gradle
+++ b/modules/code-deployment/build.gradle
@@ -32,7 +32,6 @@ dependencies {
implementation project(':ignite-core')
implementation project(':ignite-api')
implementation project(':ignite-network-api')
- implementation project(':ignite-rest-api')
implementation project(':ignite-metastorage-api')
implementation project(':ignite-cluster-management')
implementation project(':ignite-configuration-api')
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 3d26681e33..79248e49a2 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
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.deployunit;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.DEPLOYED;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED;
import java.util.List;
import org.apache.ignite.internal.deployunit.metastore.DeploymentUnitStore;
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 a15b15b144..bfa075a318 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
@@ -20,9 +20,9 @@ package org.apache.ignite.internal.deployunit;
import static java.util.concurrent.CompletableFuture.allOf;
import static java.util.concurrent.CompletableFuture.completedFuture;
import static java.util.concurrent.CompletableFuture.failedFuture;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.DEPLOYED;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.OBSOLETE;
-import static
org.apache.ignite.internal.rest.api.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.nio.file.Path;
import java.util.HashMap;
@@ -49,7 +49,6 @@ import
org.apache.ignite.internal.deployunit.metastore.NodeStatusWatchListener;
import
org.apache.ignite.internal.deployunit.metastore.status.UnitClusterStatus;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.ClusterService;
import org.jetbrains.annotations.Nullable;
diff --git
a/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentStatus.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentStatus.java
new file mode 100644
index 0000000000..3c106cff7e
--- /dev/null
+++
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeploymentStatus.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.deployunit;
+
+/**
+ * Status of deployment process.
+ */
+public enum DeploymentStatus {
+ /** Unit deployment is in progress. */
+ UPLOADING,
+
+ /** Unit is deployed on the cluster. */
+ DEPLOYED,
+
+ /** Remove command was initiated for the unit and it will be removed soon.
*/
+ OBSOLETE,
+
+ /** Unit removal from the cluster is in progress. */
+ REMOVING
+}
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 5c1310979b..7ed34b21c6 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
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.apache.ignite.compute.version.Version;
import org.apache.ignite.internal.manager.IgniteComponent;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
/**
* Provides access to the Deployment Unit functionality.
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 dea9aec2d2..b950792008 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
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.deployunit;
import org.apache.ignite.compute.version.Version;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
/**
* 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 588e83ffae..8aaf5de04a 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
@@ -23,7 +23,6 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.ignite.compute.version.Version;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
/**
* Deployment unit status.
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 84bac71202..8ea3e7e353 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
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.deployunit.exception;
import org.apache.ignite.compute.version.Version;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
+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/DeploymentUnitFailover.java
b/modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/metastore/DeploymentUnitFailover.java
index 6ed476baa5..396124500a 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
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.deployunit.metastore;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.DEPLOYED;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.UPLOADING;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.UPLOADING;
import java.util.Objects;
import org.apache.ignite.internal.cluster.management.topology.api.LogicalNode;
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 e44731b88f..60f18309bf 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
@@ -17,15 +17,15 @@
package org.apache.ignite.internal.deployunit.metastore;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.UPLOADING;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.UPLOADING;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import org.apache.ignite.compute.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;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
/**
* Metastore for deployment units.
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 ab708e497a..6c6cd51b60 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
@@ -18,13 +18,13 @@
package org.apache.ignite.internal.deployunit.metastore;
import static java.util.concurrent.CompletableFuture.completedFuture;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.UPLOADING;
import static org.apache.ignite.internal.metastorage.dsl.Conditions.exists;
import static org.apache.ignite.internal.metastorage.dsl.Conditions.notExists;
import static org.apache.ignite.internal.metastorage.dsl.Conditions.revision;
import static org.apache.ignite.internal.metastorage.dsl.Operations.noop;
import static org.apache.ignite.internal.metastorage.dsl.Operations.put;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.DEPLOYED;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.UPLOADING;
import java.util.ArrayList;
import java.util.Collection;
@@ -36,6 +36,7 @@ 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.internal.deployunit.DeploymentStatus;
import
org.apache.ignite.internal.deployunit.metastore.accumulator.ClusterStatusAccumulator;
import
org.apache.ignite.internal.deployunit.metastore.accumulator.KeyAccumulator;
import
org.apache.ignite.internal.deployunit.metastore.accumulator.NodeStatusAccumulator;
@@ -48,7 +49,6 @@ import org.apache.ignite.internal.metastorage.dsl.Condition;
import org.apache.ignite.internal.metastorage.dsl.Conditions;
import org.apache.ignite.internal.metastorage.dsl.Operation;
import org.apache.ignite.internal.metastorage.dsl.Operations;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
import org.apache.ignite.lang.ByteArray;
/**
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 d57260f9b3..7a0e6f8c2f 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
@@ -20,8 +20,8 @@ package
org.apache.ignite.internal.deployunit.metastore.status;
import java.util.Collections;
import java.util.Set;
import org.apache.ignite.compute.version.Version;
+import org.apache.ignite.internal.deployunit.DeploymentStatus;
import org.apache.ignite.internal.deployunit.UnitStatus;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
/**
* Deployment unit cluster status.
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 e229dc4e4b..7cd4993509 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
@@ -19,8 +19,8 @@ package
org.apache.ignite.internal.deployunit.metastore.status;
import org.apache.ignite.compute.version.Version;
import org.apache.ignite.compute.version.VersionParseException;
+import org.apache.ignite.internal.deployunit.DeploymentStatus;
import org.apache.ignite.internal.deployunit.UnitStatus;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
/**
* Deployment unit node status.
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 91b984912c..913bd5ca76 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
@@ -17,7 +17,7 @@
package org.apache.ignite.deployment;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.UPLOADING;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.UPLOADING;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.params.provider.Arguments.arguments;
@@ -25,10 +25,10 @@ import static
org.junit.jupiter.params.provider.Arguments.arguments;
import java.util.List;
import java.util.Set;
import org.apache.ignite.compute.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;
import org.apache.ignite.internal.deployunit.metastore.status.UnitNodeStatus;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
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 2cc191f3d9..234a12ac6c 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
@@ -17,10 +17,10 @@
package org.apache.ignite.deployment.metastore;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.DEPLOYED;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.OBSOLETE;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.REMOVING;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.UPLOADING;
+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 static org.apache.ignite.internal.deployunit.DeploymentStatus.UPLOADING;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.hamcrest.MatcherAssert.assertThat;
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 6d949f8008..a12a09e02d 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
@@ -32,7 +32,6 @@ import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopolog
import
org.apache.ignite.internal.deployunit.configuration.DeploymentConfiguration;
import org.apache.ignite.internal.deployunit.metastore.DeploymentUnitStore;
import
org.apache.ignite.internal.deployunit.metastore.status.UnitClusterStatus;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
import org.apache.ignite.network.ClusterService;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/modules/compute/build.gradle b/modules/compute/build.gradle
index 03f7b3f4f5..746c9957ed 100644
--- a/modules/compute/build.gradle
+++ b/modules/compute/build.gradle
@@ -26,7 +26,6 @@ dependencies {
implementation project(':ignite-configuration-api')
implementation project(':ignite-core')
implementation project(':ignite-code-deployment')
- implementation project(':ignite-rest-api')
implementation libs.jetbrains.annotations
implementation libs.fastutil.core
implementation libs.auto.service.annotations
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 e5308ed6ec..de1641af1d 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
@@ -29,6 +29,7 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.ignite.compute.DeploymentUnit;
import org.apache.ignite.compute.version.Version;
+import org.apache.ignite.internal.deployunit.DeploymentStatus;
import org.apache.ignite.internal.deployunit.DeploymentUnitAccessor;
import org.apache.ignite.internal.deployunit.DisposableDeploymentUnit;
import org.apache.ignite.internal.deployunit.IgniteDeployment;
@@ -36,7 +37,6 @@ import
org.apache.ignite.internal.deployunit.exception.DeploymentUnitNotFoundExc
import
org.apache.ignite.internal.deployunit.exception.DeploymentUnitUnavailableException;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
import org.apache.ignite.internal.util.RefCountedObjectPool;
import org.apache.ignite.lang.ErrorGroups.Compute;
import org.apache.ignite.lang.IgniteInternalException;
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 7c46dce41a..b36269235f 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
@@ -23,9 +23,9 @@ import static
org.apache.ignite.internal.testframework.matchers.CompletableFutur
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.ignite.compute.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;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
import org.apache.ignite.lang.ErrorGroups.Compute;
import org.apache.ignite.lang.IgniteException;
import org.junit.jupiter.api.Test;
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 7f14c571dc..e232537d2e 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,9 +64,9 @@ import org.apache.ignite.internal.compute.loader.JobContext;
import org.apache.ignite.internal.compute.loader.JobContextManager;
import org.apache.ignite.internal.compute.message.ExecuteRequest;
import org.apache.ignite.internal.compute.message.ExecuteResponse;
+import org.apache.ignite.internal.deployunit.DeploymentStatus;
import
org.apache.ignite.internal.deployunit.exception.DeploymentUnitNotFoundException;
import
org.apache.ignite.internal.deployunit.exception.DeploymentUnitUnavailableException;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
import org.apache.ignite.internal.testframework.IgniteTestUtils;
import
org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher;
import org.apache.ignite.internal.thread.NamedThreadFactory;
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 578b7be1c9..e34c43897f 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
@@ -19,8 +19,8 @@ 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.internal.rest.api.deployment.DeploymentStatus.OBSOLETE;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.REMOVING;
+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.matchers.CompletableFutureExceptionMatcher.willThrowFast;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertSame;
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 69f0cdf50e..75f6d173a0 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
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.compute.util;
import static java.util.concurrent.CompletableFuture.completedFuture;
import static java.util.concurrent.CompletableFuture.failedFuture;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.DEPLOYED;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED;
import java.io.File;
import java.nio.file.Files;
@@ -28,12 +28,12 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.apache.ignite.compute.version.Version;
+import org.apache.ignite.internal.deployunit.DeploymentStatus;
import org.apache.ignite.internal.deployunit.DeploymentUnit;
import org.apache.ignite.internal.deployunit.IgniteDeployment;
import org.apache.ignite.internal.deployunit.InitialDeployMode;
import org.apache.ignite.internal.deployunit.UnitStatuses;
import
org.apache.ignite.internal.deployunit.exception.DeploymentUnitNotFoundException;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
/**
* Implementation of {@link IgniteDeployment} for tests.
diff --git a/modules/rest-api/openapi/openapi.yaml
b/modules/rest-api/openapi/openapi.yaml
index f7c1ac06d5..358a88f66a 100644
--- a/modules/rest-api/openapi/openapi.yaml
+++ b/modules/rest-api/openapi/openapi.yaml
@@ -775,7 +775,7 @@ components:
description: Unique tag that identifies the cluster.
DeploymentStatus:
type: string
- description: Status of deployment process.
+ description: REST presentation of the deployment statuses.
enum:
- UPLOADING
- DEPLOYED
diff --git
a/modules/rest/src/main/java/org/apache/ignite/internal/rest/authentication/NodeOnlyEndpointsFilter.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/authentication/NodeOnlyEndpointsFilter.java
index 1b7414afd5..7d67179207 100644
---
a/modules/rest/src/main/java/org/apache/ignite/internal/rest/authentication/NodeOnlyEndpointsFilter.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/authentication/NodeOnlyEndpointsFilter.java
@@ -40,7 +40,7 @@ import org.reactivestreams.Publisher;
/** Filters out endpoints that are not allowed to be accessed before cluster
is initialized. */
@Filter(Filter.MATCH_ALL_PATTERN)
@Requires(property = "ignite.endpoints.filter-non-initialized", value =
"true", defaultValue = "false")
-// TODO: https://issues.apache.org/jira/browse/IGNITE-19077
+// TODO: https://issues.apache.org/jira/browse/IGNITE-19365
public class NodeOnlyEndpointsFilter implements HttpServerFilter {
private static final String[] ENABLED_ENDPOINTS = {
"/management/v1/configuration/node",
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 e94250b4f6..428aa1fef9 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
@@ -161,7 +161,7 @@ public class DeploymentManagementController implements
DeploymentCodeApi {
Map<String, DeploymentStatus> versionToDeploymentStatus = new
HashMap<>();
Set<Version> versions = statuses.versions();
for (Version version : versions) {
- DeploymentStatus status = statuses.status(version);
+ DeploymentStatus status =
fromDeploymentStatus(statuses.status(version));
if (statusFilter.test(status)) {
versionToDeploymentStatus.put(version.render(), status);
}
@@ -194,4 +194,8 @@ public class DeploymentManagementController implements
DeploymentCodeApi {
return
org.apache.ignite.internal.deployunit.InitialDeployMode.MAJORITY;
}
}
+
+ private static DeploymentStatus
fromDeploymentStatus(org.apache.ignite.internal.deployunit.DeploymentStatus
status) {
+ return DeploymentStatus.valueOf(status.name());
+ }
}
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java
index 384164f654..c10ef85b85 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.compute;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED;
import static org.apache.ignite.internal.deployunit.InitialDeployMode.MAJORITY;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.DEPLOYED;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
import static org.awaitility.Awaitility.await;
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/deployment/DeployFiles.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/deployment/DeployFiles.java
index c87ddcc338..782249c2a7 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/deployment/DeployFiles.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/deployment/DeployFiles.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.deployment;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.DEPLOYED;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
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 67a7f4a270..42e3561178 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
@@ -20,8 +20,8 @@ package org.apache.ignite.internal.deployment;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.ignite.internal.deployment.DeployFiles.buildStatus;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.DEPLOYED;
-import static
org.apache.ignite.internal.rest.api.deployment.DeploymentStatus.UPLOADING;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED;
+import static org.apache.ignite.internal.deployunit.DeploymentStatus.UPLOADING;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedFast;
import static org.awaitility.Awaitility.await;
@@ -34,10 +34,10 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.compute.version.Version;
import org.apache.ignite.internal.ClusterPerTestIntegrationTest;
import org.apache.ignite.internal.app.IgniteImpl;
+import org.apache.ignite.internal.deployunit.DeploymentStatus;
import org.apache.ignite.internal.deployunit.IgniteDeployment;
import org.apache.ignite.internal.deployunit.InitialDeployMode;
import org.apache.ignite.internal.deployunit.UnitStatuses;
-import org.apache.ignite.internal.rest.api.deployment.DeploymentStatus;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
