This is an automated email from the ASF dual-hosted git repository.
ptupitsyn 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 4f13df72f7 IGNITE-18881 Move all REST controllers to rest module
(#1717)
4f13df72f7 is described below
commit 4f13df72f79693faa19ab18465b035e7ddbfb2a1
Author: Vadim Pakhnushev <[email protected]>
AuthorDate: Tue Feb 28 11:29:57 2023 +0300
IGNITE-18881 Move all REST controllers to rest module (#1717)
---
modules/cluster-management/build.gradle | 31 +++++++++-------------
.../management/BaseItClusterManagementTest.java | 0
.../internal/cluster/management/MockNode.java | 0
modules/configuration/build.gradle | 13 ---------
.../rest/presentation/package-info.java | 22 ---------------
modules/metrics/build.gradle | 9 +++----
modules/rest/build.gradle | 22 +++++++++++++++
.../ItClusterManagementControllerTest.java | 2 +-
.../internal/rest/cluster}/RestTestBase.java | 2 +-
.../rest/cluster}/ClusterManagementController.java | 4 +--
.../cluster}/ClusterManagementRestFactory.java | 2 +-
.../internal/rest/cluster}/TopologyController.java | 2 +-
...alidArgumentClusterInitializationException.java | 2 +-
.../IgniteInternalCheckedExceptionHandler.java | 2 +-
.../handler/IgniteInternalExceptionHandler.java | 2 +-
...umentClusterInitializationExceptionHandler.java | 4 +--
.../AbstractConfigurationController.java | 1 -
.../ClusterConfigurationController.java | 1 -
.../configuration}/ConfigurationPresentation.java | 2 +-
.../configuration/NodeConfigurationController.java | 1 -
.../rest/configuration/PresentationsFactory.java | 3 +--
.../configuration}/hocon/HoconPresentation.java | 4 +--
.../rest/configuration}/hocon/package-info.java | 2 +-
.../internal/rest/metrics}/MetricRestFactory.java | 2 +-
.../rest/metrics}/NodeMetricController.java | 4 +--
.../exception/MetricNotFoundException.java | 2 +-
.../handler/MetricNotFoundExceptionHandler.java | 4 +--
.../ignite/internal/rest/node/NameProvider.java | 0
.../rest/node/NodeManagementController.java | 0
.../rest/node/NodeManagementRestFactory.java | 0
.../ignite/internal/rest/node/StateProvider.java | 0
.../ClusterConfigurationControllerTest.java | 3 +--
.../ConfigurationControllerBaseTest.java | 2 --
.../NodeConfigurationControllerTest.java | 3 +--
.../internal/rest/configuration/TestFactory.java | 1 -
.../configuration/TestRootConfigurationSchema.java | 0
.../configuration/TestSubConfigurationSchema.java | 0
.../ConfigurationPresentationTest.java | 5 ++--
modules/runner/build.gradle | 1 -
.../org/apache/ignite/internal/app/IgniteImpl.java | 4 +--
40 files changed, 66 insertions(+), 98 deletions(-)
diff --git a/modules/cluster-management/build.gradle
b/modules/cluster-management/build.gradle
index f2b3cb5e65..67bf1ea1c9 100644
--- a/modules/cluster-management/build.gradle
+++ b/modules/cluster-management/build.gradle
@@ -35,40 +35,33 @@ dependencies {
implementation project(':ignite-raft-api')
implementation project(':ignite-vault')
implementation project(':ignite-rocksdb-common')
- implementation project(':ignite-rest-api')
implementation libs.jetbrains.annotations
- implementation libs.micronaut.http.core
- implementation libs.micronaut.http.server.core
implementation libs.fastutil.core
implementation libs.auto.service.annotations
testImplementation project(':ignite-configuration')
testImplementation project(':ignite-core')
- testImplementation(testFixtures(project(':ignite-core')))
- testImplementation(testFixtures(project(':ignite-configuration')))
+ testImplementation testFixtures(project(':ignite-core'))
+ testImplementation testFixtures(project(':ignite-configuration'))
testImplementation project(':ignite-network')
testImplementation libs.hamcrest.core
testImplementation libs.mockito.junit
testImplementation libs.slf4j.jdk14
- testImplementation libs.micronaut.test
- testImplementation libs.micronaut.http.client
- testImplementation libs.micronaut.http.server.netty
testFixturesImplementation project(':ignite-core')
+ testFixturesImplementation project(':ignite-raft')
+ testFixturesImplementation project(':ignite-raft-api')
+ testFixturesImplementation project(':ignite-vault')
+ testFixturesImplementation testFixtures(project(':ignite-core'))
+ testFixturesImplementation testFixtures(project(':ignite-configuration'))
+ testFixturesImplementation testFixtures(project(':ignite-network'))
testFixturesImplementation libs.jetbrains.annotations
integrationTestAnnotationProcessor
libs.micronaut.inject.annotation.processor
integrationTestImplementation project(':ignite-raft')
integrationTestImplementation project(':ignite-raft-api')
- integrationTestImplementation project(':ignite-rest-api')
- integrationTestImplementation project(':ignite-vault')
- integrationTestImplementation(testFixtures(project))
- integrationTestImplementation(testFixtures(project(':ignite-core')))
-
integrationTestImplementation(testFixtures(project(':ignite-configuration')))
- integrationTestImplementation(testFixtures(project(':ignite-network')))
- integrationTestImplementation project(':ignite-raft')
- integrationTestImplementation libs.micronaut.junit5
- integrationTestImplementation libs.micronaut.test
- integrationTestImplementation libs.micronaut.http.client
- integrationTestImplementation libs.micronaut.http.server.netty
+ integrationTestImplementation testFixtures(project)
+ integrationTestImplementation testFixtures(project(':ignite-core'))
+ integrationTestImplementation
testFixtures(project(':ignite-configuration'))
+ integrationTestImplementation testFixtures(project(':ignite-network'))
}
diff --git
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/BaseItClusterManagementTest.java
b/modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/BaseItClusterManagementTest.java
similarity index 100%
rename from
modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/BaseItClusterManagementTest.java
rename to
modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/BaseItClusterManagementTest.java
diff --git
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/MockNode.java
b/modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/MockNode.java
similarity index 100%
rename from
modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/MockNode.java
rename to
modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/MockNode.java
diff --git a/modules/configuration/build.gradle
b/modules/configuration/build.gradle
index 897b4efbfb..d6f7555788 100644
--- a/modules/configuration/build.gradle
+++ b/modules/configuration/build.gradle
@@ -26,30 +26,17 @@ dependencies {
api project(':ignite-configuration-api')
implementation project(':ignite-bytecode')
implementation project(':ignite-api')
- implementation project(':ignite-rest-api')
implementation project(':ignite-core')
implementation libs.jetbrains.annotations
- implementation libs.asm.core
- implementation libs.micronaut.http.core
- implementation libs.micronaut.http.server.core
implementation libs.typesafe.config
annotationProcessor project(':ignite-configuration-annotation-processor')
- annotationProcessor libs.micronaut.inject.annotation.processor
testAnnotationProcessor
project(':ignite-configuration-annotation-processor')
- testAnnotationProcessor libs.micronaut.inject.annotation.processor
testImplementation project(':ignite-core')
- testImplementation project(':ignite-rest-api')
testImplementation(testFixtures(project(':ignite-core')))
- testImplementation libs.junit5.api
- testImplementation libs.junit5.params
testImplementation libs.hamcrest.core
testImplementation libs.mockito.core
- testImplementation libs.micronaut.test
- testImplementation libs.micronaut.junit5
- testImplementation libs.micronaut.http.client
- testImplementation libs.micronaut.http.server.netty
testFixturesAnnotationProcessor
project(':ignite-configuration-annotation-processor')
testFixturesImplementation project(':ignite-core')
diff --git
a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/package-info.java
b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/package-info.java
deleted file mode 100755
index d42fbf96ae..0000000000
---
a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Contains a base interface that provides the ability to convert
representation to other formats.
- */
-
-package org.apache.ignite.internal.configuration.rest.presentation;
diff --git a/modules/metrics/build.gradle b/modules/metrics/build.gradle
index 0adfca769f..6db7728e4d 100644
--- a/modules/metrics/build.gradle
+++ b/modules/metrics/build.gradle
@@ -27,10 +27,7 @@ dependencies {
implementation project(':ignite-core')
implementation project(':ignite-configuration')
implementation project(':ignite-configuration-api')
- implementation project(':ignite-rest-api')
implementation libs.jetbrains.annotations
- implementation libs.micronaut.http.core
- implementation libs.micronaut.http.server.core
implementation libs.auto.service.annotations
annotationProcessor libs.auto.service
@@ -39,13 +36,13 @@ dependencies {
testImplementation libs.hamcrest.core
testImplementation libs.mockito.core
testImplementation project(':ignite-core')
- testImplementation(testFixtures(project(':ignite-core')))
- testImplementation(testFixtures(project(':ignite-configuration')))
+ testImplementation testFixtures(project(':ignite-core'))
+ testImplementation testFixtures(project(':ignite-configuration'))
integrationTestAnnotationProcessor
project(":ignite-configuration-annotation-processor")
integrationTestAnnotationProcessor libs.auto.service
integrationTestImplementation project(':ignite-core')
-
integrationTestImplementation(testFixtures(project(':ignite-configuration')))
+ integrationTestImplementation
testFixtures(project(':ignite-configuration'))
integrationTestImplementation libs.auto.service.annotations
}
diff --git a/modules/rest/build.gradle b/modules/rest/build.gradle
index c9b2951bd4..3082eb2a10 100644
--- a/modules/rest/build.gradle
+++ b/modules/rest/build.gradle
@@ -18,6 +18,8 @@
apply from: "$rootDir/buildscripts/java-core.gradle"
apply from: "$rootDir/buildscripts/publishing.gradle"
apply from: "$rootDir/buildscripts/java-junit5.gradle"
+apply from: "$rootDir/buildscripts/java-test-fixtures.gradle"
+apply from: "$rootDir/buildscripts/java-integration-test.gradle"
description = 'ignite-rest'
@@ -31,15 +33,19 @@ dependencies {
implementation project(':ignite-rest-api')
implementation project(':ignite-core')
implementation project(':ignite-network')
+ implementation project(':ignite-cluster-management')
+ implementation project(':ignite-metrics')
implementation libs.jetbrains.annotations
implementation libs.micronaut.inject
implementation libs.micronaut.http.server.netty
implementation libs.micronaut.openapi
implementation libs.jackson.databind
implementation libs.auto.service.annotations
+ implementation libs.typesafe.config
annotationProcessor libs.auto.service
+ testAnnotationProcessor
project(':ignite-configuration-annotation-processor')
testAnnotationProcessor libs.micronaut.inject.annotation.processor
testImplementation project(':ignite-configuration')
@@ -47,7 +53,23 @@ dependencies {
testImplementation(testFixtures(project(':ignite-configuration')))
testImplementation libs.hamcrest.core
testImplementation libs.slf4j.jdk14
+ testImplementation libs.micronaut.junit5
+ testImplementation libs.micronaut.http.client
+ integrationTestAnnotationProcessor
libs.micronaut.inject.annotation.processor
+ integrationTestAnnotationProcessor testFixtures(project(':ignite-core'))
+ integrationTestAnnotationProcessor
testFixtures(project(':ignite-cluster-management'))
+
+ integrationTestImplementation project(':ignite-rest-api')
+ integrationTestImplementation project(':ignite-network')
+ integrationTestImplementation project(':ignite-api')
+ integrationTestImplementation testFixtures(project(':ignite-core'))
+ integrationTestImplementation
testFixtures(project(':ignite-cluster-management'))
+ integrationTestImplementation libs.micronaut.junit5
+ integrationTestImplementation libs.micronaut.test
+ integrationTestImplementation libs.micronaut.http.client
+ integrationTestImplementation libs.micronaut.http.server.netty
+ integrationTestImplementation libs.typesafe.config
}
compileJava {
diff --git
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/rest/ItClusterManagementControllerTest.java
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/cluster/ItClusterManagementControllerTest.java
similarity index 98%
rename from
modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/rest/ItClusterManagementControllerTest.java
rename to
modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/cluster/ItClusterManagementControllerTest.java
index 6ad2a4c9b0..256c3854ae 100644
---
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/rest/ItClusterManagementControllerTest.java
+++
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/cluster/ItClusterManagementControllerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.cluster.management.rest;
+package org.apache.ignite.internal.rest.cluster;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/rest/RestTestBase.java
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/cluster/RestTestBase.java
similarity index 97%
rename from
modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/rest/RestTestBase.java
rename to
modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/cluster/RestTestBase.java
index ab029cc80c..e6994bb7f7 100644
---
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/rest/RestTestBase.java
+++
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/cluster/RestTestBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.cluster.management.rest;
+package org.apache.ignite.internal.rest.cluster;
import io.micronaut.http.client.exceptions.HttpClientResponseException;
import io.micronaut.runtime.server.EmbeddedServer;
diff --git
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/ClusterManagementController.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/ClusterManagementController.java
similarity index 96%
rename from
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/ClusterManagementController.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/ClusterManagementController.java
index 88b2af6624..6d398fdb8f 100644
---
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/ClusterManagementController.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/ClusterManagementController.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.cluster.management.rest;
+package org.apache.ignite.internal.rest.cluster;
import io.micronaut.http.annotation.Body;
import io.micronaut.http.annotation.Controller;
@@ -24,13 +24,13 @@ import java.util.concurrent.CompletionException;
import org.apache.ignite.internal.cluster.management.ClusterInitializer;
import
org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
import org.apache.ignite.internal.cluster.management.ClusterState;
-import
org.apache.ignite.internal.cluster.management.rest.exception.InvalidArgumentClusterInitializationException;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.rest.api.cluster.ClusterManagementApi;
import org.apache.ignite.internal.rest.api.cluster.ClusterStateDto;
import org.apache.ignite.internal.rest.api.cluster.ClusterTagDto;
import org.apache.ignite.internal.rest.api.cluster.InitCommand;
+import
org.apache.ignite.internal.rest.cluster.exception.InvalidArgumentClusterInitializationException;
import
org.apache.ignite.internal.rest.exception.ClusterNotInitializedException;
import org.apache.ignite.lang.IgniteException;
import org.apache.ignite.lang.IgniteInternalException;
diff --git
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/ClusterManagementRestFactory.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/ClusterManagementRestFactory.java
similarity index 97%
rename from
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/ClusterManagementRestFactory.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/ClusterManagementRestFactory.java
index 5d794ae1ef..e3a5f0de67 100644
---
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/ClusterManagementRestFactory.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/ClusterManagementRestFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.cluster.management.rest;
+package org.apache.ignite.internal.rest.cluster;
import io.micronaut.context.annotation.Bean;
import io.micronaut.context.annotation.Factory;
diff --git
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/TopologyController.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/TopologyController.java
similarity index 98%
rename from
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/TopologyController.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/TopologyController.java
index e926f7ad3f..1da0c3a2ef 100644
---
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/TopologyController.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/TopologyController.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.cluster.management.rest;
+package org.apache.ignite.internal.rest.cluster;
import static java.util.stream.Collectors.toList;
diff --git
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/InvalidArgumentClusterInitializationException.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/InvalidArgumentClusterInitializationException.java
similarity index 93%
rename from
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/InvalidArgumentClusterInitializationException.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/InvalidArgumentClusterInitializationException.java
index 5d925478ca..6d1d4c4995 100644
---
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/InvalidArgumentClusterInitializationException.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/InvalidArgumentClusterInitializationException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.cluster.management.rest.exception;
+package org.apache.ignite.internal.rest.cluster.exception;
/**
* Exception that is thrown when the wrong arguments are passed to the init
cluster method.
diff --git
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/handler/IgniteInternalCheckedExceptionHandler.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/handler/IgniteInternalCheckedExceptionHandler.java
similarity index 96%
rename from
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/handler/IgniteInternalCheckedExceptionHandler.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/handler/IgniteInternalCheckedExceptionHandler.java
index 28c227186a..5f4d038316 100644
---
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/handler/IgniteInternalCheckedExceptionHandler.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/handler/IgniteInternalCheckedExceptionHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.cluster.management.rest.exception.handler;
+package org.apache.ignite.internal.rest.cluster.exception.handler;
import io.micronaut.context.annotation.Requires;
import io.micronaut.http.HttpRequest;
diff --git
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/handler/IgniteInternalExceptionHandler.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/handler/IgniteInternalExceptionHandler.java
similarity index 96%
rename from
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/handler/IgniteInternalExceptionHandler.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/handler/IgniteInternalExceptionHandler.java
index 9cf3cda486..59eb3f9906 100644
---
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/handler/IgniteInternalExceptionHandler.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/handler/IgniteInternalExceptionHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.cluster.management.rest.exception.handler;
+package org.apache.ignite.internal.rest.cluster.exception.handler;
import io.micronaut.context.annotation.Requires;
import io.micronaut.http.HttpRequest;
diff --git
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/handler/InvalidArgumentClusterInitializationExceptionHandler.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/handler/InvalidArgumentClusterInitializationExceptionHandler.java
similarity index 90%
rename from
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/handler/InvalidArgumentClusterInitializationExceptionHandler.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/handler/InvalidArgumentClusterInitializationExceptionHandler.java
index 3e1be6f66c..a24c8e9aee 100644
---
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/rest/exception/handler/InvalidArgumentClusterInitializationExceptionHandler.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/cluster/exception/handler/InvalidArgumentClusterInitializationExceptionHandler.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.cluster.management.rest.exception.handler;
+package org.apache.ignite.internal.rest.cluster.exception.handler;
import io.micronaut.context.annotation.Requires;
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.internal.cluster.management.rest.exception.InvalidArgumentClusterInitializationException;
import org.apache.ignite.internal.rest.api.Problem;
+import
org.apache.ignite.internal.rest.cluster.exception.InvalidArgumentClusterInitializationException;
import org.apache.ignite.internal.rest.constants.HttpCode;
import org.apache.ignite.internal.rest.problem.HttpProblemResponse;
diff --git
a/modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/AbstractConfigurationController.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/AbstractConfigurationController.java
similarity index 96%
rename from
modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/AbstractConfigurationController.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/AbstractConfigurationController.java
index a55c03b664..a85eefd657 100644
---
a/modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/AbstractConfigurationController.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/AbstractConfigurationController.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.rest.configuration;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import
org.apache.ignite.configuration.validation.ConfigurationValidationException;
-import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
import org.apache.ignite.lang.IgniteException;
/**
diff --git
a/modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationController.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationController.java
similarity index 97%
rename from
modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationController.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationController.java
index dee47e58ac..7a2a58a66b 100644
---
a/modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationController.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationController.java
@@ -22,7 +22,6 @@ import io.micronaut.http.annotation.Controller;
import jakarta.inject.Named;
import java.util.concurrent.CompletableFuture;
import org.apache.ignite.internal.configuration.ComponentNotStartedException;
-import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
import
org.apache.ignite.internal.rest.api.configuration.ClusterConfigurationApi;
import
org.apache.ignite.internal.rest.exception.ClusterNotInitializedException;
import
org.apache.ignite.internal.rest.exception.handler.IgniteExceptionHandler;
diff --git
a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/ConfigurationPresentation.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/ConfigurationPresentation.java
similarity index 97%
rename from
modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/ConfigurationPresentation.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/ConfigurationPresentation.java
index 662c4a0f78..f0747a51a6 100644
---
a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/ConfigurationPresentation.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/ConfigurationPresentation.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.configuration.rest.presentation;
+package org.apache.ignite.internal.rest.configuration;
import java.util.concurrent.CompletableFuture;
import
org.apache.ignite.configuration.validation.ConfigurationValidationException;
diff --git
a/modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationController.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationController.java
similarity index 96%
rename from
modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationController.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationController.java
index 8adc7c10bb..f6d1553612 100644
---
a/modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationController.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationController.java
@@ -21,7 +21,6 @@ import io.micronaut.context.annotation.Requires;
import io.micronaut.http.annotation.Controller;
import jakarta.inject.Named;
import java.util.concurrent.CompletableFuture;
-import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
import org.apache.ignite.internal.rest.api.configuration.NodeConfigurationApi;
import
org.apache.ignite.internal.rest.exception.handler.IgniteExceptionHandler;
diff --git
a/modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/PresentationsFactory.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/PresentationsFactory.java
similarity index 91%
rename from
modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/PresentationsFactory.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/PresentationsFactory.java
index b4cf39dc37..c422ff55a4 100644
---
a/modules/configuration/src/main/java/org/apache/ignite/internal/rest/configuration/PresentationsFactory.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/PresentationsFactory.java
@@ -22,9 +22,8 @@ import io.micronaut.context.annotation.Factory;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import org.apache.ignite.internal.configuration.ConfigurationManager;
-import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
-import
org.apache.ignite.internal.configuration.rest.presentation.hocon.HoconPresentation;
import org.apache.ignite.internal.rest.RestFactory;
+import org.apache.ignite.internal.rest.configuration.hocon.HoconPresentation;
/**
* Factory that defines beans required for the rest module.
diff --git
a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/hocon/HoconPresentation.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/hocon/HoconPresentation.java
similarity index 95%
rename from
modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/hocon/HoconPresentation.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/hocon/HoconPresentation.java
index 51d969dff4..d0254410bf 100644
---
a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/hocon/HoconPresentation.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/hocon/HoconPresentation.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.configuration.rest.presentation.hocon;
+package org.apache.ignite.internal.rest.configuration.hocon;
import static com.typesafe.config.ConfigFactory.parseString;
import static com.typesafe.config.ConfigRenderOptions.concise;
@@ -30,7 +30,7 @@ import
org.apache.ignite.configuration.ConfigurationChangeException;
import
org.apache.ignite.configuration.validation.ConfigurationValidationException;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
import org.apache.ignite.internal.configuration.hocon.HoconConverter;
-import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
+import org.apache.ignite.internal.rest.configuration.ConfigurationPresentation;
import org.apache.ignite.lang.IgniteException;
import org.jetbrains.annotations.Nullable;
diff --git
a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/hocon/package-info.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/hocon/package-info.java
old mode 100755
new mode 100644
similarity index 92%
rename from
modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/hocon/package-info.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/hocon/package-info.java
index 586cd4be65..9326fdebf2
---
a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/rest/presentation/hocon/package-info.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/configuration/hocon/package-info.java
@@ -19,4 +19,4 @@
* This package contains classes related to HOCON representation.
*/
-package org.apache.ignite.internal.configuration.rest.presentation.hocon;
+package org.apache.ignite.internal.rest.configuration.hocon;
diff --git
a/modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/MetricRestFactory.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/MetricRestFactory.java
similarity index 96%
rename from
modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/MetricRestFactory.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/MetricRestFactory.java
index 9710de23b7..38bf0b44f4 100644
---
a/modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/MetricRestFactory.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/MetricRestFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.metrics.rest;
+package org.apache.ignite.internal.rest.metrics;
import io.micronaut.context.annotation.Bean;
import io.micronaut.context.annotation.Factory;
diff --git
a/modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/NodeMetricController.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/NodeMetricController.java
similarity index 94%
rename from
modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/NodeMetricController.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/NodeMetricController.java
index 30271d9256..af4fd32444 100644
---
a/modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/NodeMetricController.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/NodeMetricController.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.metrics.rest;
+package org.apache.ignite.internal.rest.metrics;
import io.micronaut.http.annotation.Controller;
import java.util.Collection;
import java.util.stream.Collectors;
import org.apache.ignite.internal.metrics.MetricManager;
-import
org.apache.ignite.internal.metrics.rest.exception.MetricNotFoundException;
import org.apache.ignite.internal.rest.api.metric.MetricSourceDto;
import org.apache.ignite.internal.rest.api.metric.NodeMetricApi;
+import
org.apache.ignite.internal.rest.metrics.exception.MetricNotFoundException;
/** Node metric controller. */
@Controller("/management/v1/metric/node")
diff --git
a/modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/exception/MetricNotFoundException.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/exception/MetricNotFoundException.java
similarity index 94%
rename from
modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/exception/MetricNotFoundException.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/exception/MetricNotFoundException.java
index e6e2300514..43ae2644d3 100644
---
a/modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/exception/MetricNotFoundException.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/exception/MetricNotFoundException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.metrics.rest.exception;
+package org.apache.ignite.internal.rest.metrics.exception;
/**
* Exception that is thrown when requested metric is not found in the registry.
diff --git
a/modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/exception/handler/MetricNotFoundExceptionHandler.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/exception/handler/MetricNotFoundExceptionHandler.java
similarity index 93%
rename from
modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/exception/handler/MetricNotFoundExceptionHandler.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/exception/handler/MetricNotFoundExceptionHandler.java
index d37e00edd8..e053512b62 100644
---
a/modules/metrics/src/main/java/org/apache/ignite/internal/metrics/rest/exception/handler/MetricNotFoundExceptionHandler.java
+++
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/metrics/exception/handler/MetricNotFoundExceptionHandler.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.metrics.rest.exception.handler;
+package org.apache.ignite.internal.rest.metrics.exception.handler;
import io.micronaut.context.annotation.Requires;
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.internal.metrics.rest.exception.MetricNotFoundException;
import org.apache.ignite.internal.rest.api.Problem;
import org.apache.ignite.internal.rest.constants.HttpCode;
+import
org.apache.ignite.internal.rest.metrics.exception.MetricNotFoundException;
import org.apache.ignite.internal.rest.problem.HttpProblemResponse;
/**
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/rest/node/NameProvider.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/node/NameProvider.java
similarity index 100%
rename from
modules/runner/src/main/java/org/apache/ignite/internal/rest/node/NameProvider.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/node/NameProvider.java
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/rest/node/NodeManagementController.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/node/NodeManagementController.java
similarity index 100%
rename from
modules/runner/src/main/java/org/apache/ignite/internal/rest/node/NodeManagementController.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/node/NodeManagementController.java
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/rest/node/NodeManagementRestFactory.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/node/NodeManagementRestFactory.java
similarity index 100%
rename from
modules/runner/src/main/java/org/apache/ignite/internal/rest/node/NodeManagementRestFactory.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/node/NodeManagementRestFactory.java
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/rest/node/StateProvider.java
b/modules/rest/src/main/java/org/apache/ignite/internal/rest/node/StateProvider.java
similarity index 100%
rename from
modules/runner/src/main/java/org/apache/ignite/internal/rest/node/StateProvider.java
rename to
modules/rest/src/main/java/org/apache/ignite/internal/rest/node/StateProvider.java
diff --git
a/modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationControllerTest.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationControllerTest.java
similarity index 91%
rename from
modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationControllerTest.java
rename to
modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationControllerTest.java
index c14939f9c5..15cca78c61 100644
---
a/modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationControllerTest.java
+++
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationControllerTest.java
@@ -25,8 +25,7 @@ import
io.micronaut.test.extensions.junit5.annotation.MicronautTest;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
-import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
-import
org.apache.ignite.internal.configuration.rest.presentation.hocon.HoconPresentation;
+import org.apache.ignite.internal.rest.configuration.hocon.HoconPresentation;
/**
* Functional test for {@link ClusterConfigurationController}.
diff --git
a/modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/ConfigurationControllerBaseTest.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/ConfigurationControllerBaseTest.java
similarity index 96%
rename from
modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/ConfigurationControllerBaseTest.java
rename to
modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/ConfigurationControllerBaseTest.java
index 98f51ac33b..9564847000 100644
---
a/modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/ConfigurationControllerBaseTest.java
+++
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/ConfigurationControllerBaseTest.java
@@ -34,8 +34,6 @@ import io.micronaut.runtime.server.EmbeddedServer;
import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
import jakarta.inject.Inject;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
-import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
-import
org.apache.ignite.internal.configuration.rest.presentation.TestRootConfiguration;
import org.apache.ignite.internal.rest.api.InvalidParam;
import org.apache.ignite.internal.rest.api.Problem;
import org.jetbrains.annotations.NotNull;
diff --git
a/modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationControllerTest.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationControllerTest.java
similarity index 91%
rename from
modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationControllerTest.java
rename to
modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationControllerTest.java
index 97b5b67c8a..33c8af4bd4 100644
---
a/modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationControllerTest.java
+++
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationControllerTest.java
@@ -25,8 +25,7 @@ import
io.micronaut.test.extensions.junit5.annotation.MicronautTest;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
-import
org.apache.ignite.internal.configuration.rest.presentation.ConfigurationPresentation;
-import
org.apache.ignite.internal.configuration.rest.presentation.hocon.HoconPresentation;
+import org.apache.ignite.internal.rest.configuration.hocon.HoconPresentation;
/**
* Functional test for {@link NodeConfigurationController}.
diff --git
a/modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/TestFactory.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestFactory.java
similarity index 96%
rename from
modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/TestFactory.java
rename to
modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestFactory.java
index 94f8ed0774..8e5d736e27 100644
---
a/modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/TestFactory.java
+++
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestFactory.java
@@ -30,7 +30,6 @@ import
org.apache.ignite.configuration.validation.ValidationContext;
import org.apache.ignite.configuration.validation.ValidationIssue;
import org.apache.ignite.configuration.validation.Validator;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
-import
org.apache.ignite.internal.configuration.rest.presentation.TestRootConfiguration;
import
org.apache.ignite.internal.configuration.storage.TestConfigurationStorage;
/**
diff --git
a/modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/TestRootConfigurationSchema.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestRootConfigurationSchema.java
similarity index 100%
rename from
modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/TestRootConfigurationSchema.java
rename to
modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestRootConfigurationSchema.java
diff --git
a/modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/TestSubConfigurationSchema.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestSubConfigurationSchema.java
similarity index 100%
rename from
modules/configuration/src/test/java/org/apache/ignite/internal/rest/configuration/TestSubConfigurationSchema.java
rename to
modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestSubConfigurationSchema.java
diff --git
a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/rest/presentation/ConfigurationPresentationTest.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/presentation/ConfigurationPresentationTest.java
similarity index 97%
rename from
modules/configuration/src/test/java/org/apache/ignite/internal/configuration/rest/presentation/ConfigurationPresentationTest.java
rename to
modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/presentation/ConfigurationPresentationTest.java
index 8d0488c6d5..bb63afed58 100644
---
a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/rest/presentation/ConfigurationPresentationTest.java
+++
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/presentation/ConfigurationPresentationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.configuration.rest.presentation;
+package org.apache.ignite.internal.rest.configuration.presentation;
import static java.util.concurrent.TimeUnit.SECONDS;
import static
org.apache.ignite.configuration.annotation.ConfigurationType.LOCAL;
@@ -41,8 +41,9 @@ import
org.apache.ignite.configuration.validation.ValidationContext;
import org.apache.ignite.configuration.validation.ValidationIssue;
import org.apache.ignite.configuration.validation.Validator;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
-import
org.apache.ignite.internal.configuration.rest.presentation.hocon.HoconPresentation;
import
org.apache.ignite.internal.configuration.storage.TestConfigurationStorage;
+import org.apache.ignite.internal.rest.configuration.ConfigurationPresentation;
+import org.apache.ignite.internal.rest.configuration.hocon.HoconPresentation;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/modules/runner/build.gradle b/modules/runner/build.gradle
index 1316da241d..c1484c0bc3 100644
--- a/modules/runner/build.gradle
+++ b/modules/runner/build.gradle
@@ -135,7 +135,6 @@ dependencies {
exclude group: 'org.ow2.asm', module: 'asm'
}
integrationTestImplementation libs.typesafe.config
-
}
tasks.register("runnerPlatformTest", JavaExec) {
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 8ac95b3be7..199e8381f5 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
@@ -47,7 +47,6 @@ import
org.apache.ignite.internal.cluster.management.ClusterManagementGroupManag
import
org.apache.ignite.internal.cluster.management.configuration.ClusterManagementConfiguration;
import org.apache.ignite.internal.cluster.management.raft.ClusterStateStorage;
import
org.apache.ignite.internal.cluster.management.raft.RocksDbClusterStateStorage;
-import
org.apache.ignite.internal.cluster.management.rest.ClusterManagementRestFactory;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyServiceImpl;
import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyService;
@@ -80,7 +79,6 @@ import
org.apache.ignite.internal.metastorage.server.persistence.RocksDbKeyValue
import org.apache.ignite.internal.metastorage.server.raft.MetastorageGroupId;
import org.apache.ignite.internal.metrics.MetricManager;
import org.apache.ignite.internal.metrics.configuration.MetricConfiguration;
-import org.apache.ignite.internal.metrics.rest.MetricRestFactory;
import org.apache.ignite.internal.metrics.sources.JvmMetricSource;
import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
import
org.apache.ignite.internal.network.configuration.NetworkConfigurationSchema;
@@ -94,8 +92,10 @@ import org.apache.ignite.internal.replicator.ReplicaManager;
import org.apache.ignite.internal.replicator.ReplicaService;
import org.apache.ignite.internal.rest.RestComponent;
import org.apache.ignite.internal.rest.RestFactory;
+import org.apache.ignite.internal.rest.cluster.ClusterManagementRestFactory;
import org.apache.ignite.internal.rest.configuration.PresentationsFactory;
import org.apache.ignite.internal.rest.configuration.RestConfiguration;
+import org.apache.ignite.internal.rest.metrics.MetricRestFactory;
import org.apache.ignite.internal.rest.node.NodeManagementRestFactory;
import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.configuration.TablesConfiguration;
