You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sk...@apache.org on 2022/02/03 14:04:17 UTC

[ignite-3] branch main updated: "IGNITE-15473 Moved rest into internal package. Fixes #621

This is an automated email from the ASF dual-hosted git repository.

sk0x50 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 8931db5  "IGNITE-15473 Moved rest into internal package. Fixes #621
8931db5 is described below

commit 8931db5c4ad639e6397bf709a2ca4bb053f2d077
Author: Slava Koptilin <sl...@gmail.com>
AuthorDate: Thu Feb 3 17:02:50 2022 +0300

    "IGNITE-15473 Moved rest into internal package. Fixes #621
---
 .../org/apache/ignite/{ => internal}/rest/ErrorResult.java |  2 +-
 .../org/apache/ignite/{ => internal}/rest/RestModule.java  | 14 +++++++-------
 .../ignite/{ => internal}/rest/netty/RestApiHandler.java   |  4 ++--
 .../{ => internal}/rest/netty/RestApiHttpRequest.java      |  2 +-
 .../{ => internal}/rest/netty/RestApiHttpResponse.java     |  2 +-
 .../{ => internal}/rest/netty/RestApiInitializer.java      |  4 ++--
 .../ignite/{ => internal}/rest/netty/package-info.java     |  2 +-
 .../apache/ignite/{ => internal}/rest/package-info.java    |  2 +-
 .../rest/presentation/ConfigurationPresentation.java       |  2 +-
 .../rest/presentation/hocon/HoconPresentation.java         |  4 ++--
 .../rest/presentation/hocon/package-info.java              |  2 +-
 .../{ => internal}/rest/presentation/package-info.java     |  2 +-
 .../apache/ignite/{ => internal}/rest/routes/Route.java    |  6 +++---
 .../apache/ignite/{ => internal}/rest/routes/Router.java   |  6 +++---
 .../ignite/{ => internal}/rest/routes/package-info.java    |  2 +-
 .../{ => internal}/rest/netty/RestApiHttpResponseTest.java |  4 ++--
 .../rest/presentation/ConfigurationPresentationTest.java   |  4 ++--
 .../ignite/{ => internal}/rest/routes/RouteTest.java       |  2 +-
 .../java/org/apache/ignite/internal/app/IgniteImpl.java    |  2 +-
 19 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/ErrorResult.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/ErrorResult.java
similarity index 97%
rename from modules/rest/src/main/java/org/apache/ignite/rest/ErrorResult.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/ErrorResult.java
index 836c038..becbb9a 100644
--- a/modules/rest/src/main/java/org/apache/ignite/rest/ErrorResult.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/ErrorResult.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest;
+package org.apache.ignite.internal.rest;
 
 /**
  * Error result represent a tuple of error type and user-friendly error message.
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/RestModule.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/RestModule.java
similarity index 95%
rename from modules/rest/src/main/java/org/apache/ignite/rest/RestModule.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/RestModule.java
index 076c209..7b96d7f 100644
--- a/modules/rest/src/main/java/org/apache/ignite/rest/RestModule.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/RestModule.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest;
+package org.apache.ignite.internal.rest;
 
 import static io.netty.handler.codec.http.HttpHeaderValues.APPLICATION_JSON;
 import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
@@ -34,15 +34,15 @@ import org.apache.ignite.configuration.validation.ConfigurationValidationExcepti
 import org.apache.ignite.internal.configuration.ConfigurationManager;
 import org.apache.ignite.internal.configuration.ConfigurationRegistry;
 import org.apache.ignite.internal.manager.IgniteComponent;
+import org.apache.ignite.internal.rest.netty.RestApiHttpRequest;
+import org.apache.ignite.internal.rest.netty.RestApiHttpResponse;
+import org.apache.ignite.internal.rest.netty.RestApiInitializer;
+import org.apache.ignite.internal.rest.presentation.ConfigurationPresentation;
+import org.apache.ignite.internal.rest.presentation.hocon.HoconPresentation;
+import org.apache.ignite.internal.rest.routes.Router;
 import org.apache.ignite.lang.IgniteException;
 import org.apache.ignite.lang.IgniteLogger;
 import org.apache.ignite.network.NettyBootstrapFactory;
-import org.apache.ignite.rest.netty.RestApiHttpRequest;
-import org.apache.ignite.rest.netty.RestApiHttpResponse;
-import org.apache.ignite.rest.netty.RestApiInitializer;
-import org.apache.ignite.rest.presentation.ConfigurationPresentation;
-import org.apache.ignite.rest.presentation.hocon.HoconPresentation;
-import org.apache.ignite.rest.routes.Router;
 
 /**
  * Rest module is responsible for starting a REST endpoints for accessing and managing configuration.
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiHandler.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiHandler.java
similarity index 97%
rename from modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiHandler.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiHandler.java
index a803cb7..41e9664 100644
--- a/modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiHandler.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.netty;
+package org.apache.ignite.internal.rest.netty;
 
 import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION;
 import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
@@ -39,8 +39,8 @@ import io.netty.handler.codec.http.HttpObject;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpUtil;
 import io.netty.handler.codec.http.HttpVersion;
+import org.apache.ignite.internal.rest.routes.Router;
 import org.apache.ignite.lang.IgniteLogger;
-import org.apache.ignite.rest.routes.Router;
 
 /**
  * Main handler of REST HTTP chain. It receives http request, process it by {@link Router} and produce http response.
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiHttpRequest.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiHttpRequest.java
similarity index 97%
rename from modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiHttpRequest.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiHttpRequest.java
index 6d1c1f0..d52cc6a 100644
--- a/modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiHttpRequest.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiHttpRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.netty;
+package org.apache.ignite.internal.rest.netty;
 
 import io.netty.handler.codec.http.FullHttpRequest;
 import java.util.Collections;
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiHttpResponse.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiHttpResponse.java
similarity index 98%
rename from modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiHttpResponse.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiHttpResponse.java
index 1cdfb04..978818e 100644
--- a/modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiHttpResponse.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiHttpResponse.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.netty;
+package org.apache.ignite.internal.rest.netty;
 
 import com.google.gson.Gson;
 import io.netty.handler.codec.http.HttpHeaderNames;
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiInitializer.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiInitializer.java
similarity index 94%
rename from modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiInitializer.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiInitializer.java
index 9bbfceb..4da7215 100644
--- a/modules/rest/src/main/java/org/apache/ignite/rest/netty/RestApiInitializer.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/RestApiInitializer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.netty;
+package org.apache.ignite.internal.rest.netty;
 
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
@@ -23,7 +23,7 @@ import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
 import io.netty.handler.codec.http.HttpServerExpectContinueHandler;
-import org.apache.ignite.rest.routes.Router;
+import org.apache.ignite.internal.rest.routes.Router;
 
 /**
  * Initializes channel with needed handlers for HTTP processing.
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/netty/package-info.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/package-info.java
similarity index 95%
rename from modules/rest/src/main/java/org/apache/ignite/rest/netty/package-info.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/package-info.java
index f5e4ce0..c7ab254 100755
--- a/modules/rest/src/main/java/org/apache/ignite/rest/netty/package-info.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/netty/package-info.java
@@ -19,4 +19,4 @@
  * This package contains classes that represent inbound requests, outbound responses and main REST handler.
  */
 
-package org.apache.ignite.rest.netty;
+package org.apache.ignite.internal.rest.netty;
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/package-info.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/package-info.java
similarity index 95%
rename from modules/rest/src/main/java/org/apache/ignite/rest/package-info.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/package-info.java
index 756a21a..81b40c3 100755
--- a/modules/rest/src/main/java/org/apache/ignite/rest/package-info.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/package-info.java
@@ -19,4 +19,4 @@
  * This package contains an implementation of Ignite component related to REST interface.
  */
 
-package org.apache.ignite.rest;
+package org.apache.ignite.internal.rest;
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/presentation/ConfigurationPresentation.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/ConfigurationPresentation.java
similarity index 97%
rename from modules/rest/src/main/java/org/apache/ignite/rest/presentation/ConfigurationPresentation.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/ConfigurationPresentation.java
index 3cd9638..266a524 100644
--- a/modules/rest/src/main/java/org/apache/ignite/rest/presentation/ConfigurationPresentation.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/ConfigurationPresentation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.presentation;
+package org.apache.ignite.internal.rest.presentation;
 
 import org.apache.ignite.configuration.validation.ConfigurationValidationException;
 import org.apache.ignite.lang.IgniteException;
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/presentation/hocon/HoconPresentation.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/hocon/HoconPresentation.java
similarity index 96%
rename from modules/rest/src/main/java/org/apache/ignite/rest/presentation/hocon/HoconPresentation.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/hocon/HoconPresentation.java
index d173f83..bc7846b 100644
--- a/modules/rest/src/main/java/org/apache/ignite/rest/presentation/hocon/HoconPresentation.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/hocon/HoconPresentation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.presentation.hocon;
+package org.apache.ignite.internal.rest.presentation.hocon;
 
 import static com.typesafe.config.ConfigFactory.parseString;
 import static com.typesafe.config.ConfigRenderOptions.concise;
@@ -27,8 +27,8 @@ 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.rest.presentation.ConfigurationPresentation;
 import org.apache.ignite.lang.IgniteException;
-import org.apache.ignite.rest.presentation.ConfigurationPresentation;
 import org.jetbrains.annotations.Nullable;
 
 /**
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/presentation/hocon/package-info.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/hocon/package-info.java
similarity index 93%
rename from modules/rest/src/main/java/org/apache/ignite/rest/presentation/hocon/package-info.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/hocon/package-info.java
index af09426..3c0dffa 100755
--- a/modules/rest/src/main/java/org/apache/ignite/rest/presentation/hocon/package-info.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/hocon/package-info.java
@@ -19,4 +19,4 @@
  * This package contains classes related to HOCON representation.
  */
 
-package org.apache.ignite.rest.presentation.hocon;
+package org.apache.ignite.internal.rest.presentation.hocon;
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/presentation/package-info.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/package-info.java
similarity index 94%
rename from modules/rest/src/main/java/org/apache/ignite/rest/presentation/package-info.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/package-info.java
index fc4a91d..7aa8c91 100755
--- a/modules/rest/src/main/java/org/apache/ignite/rest/presentation/package-info.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/presentation/package-info.java
@@ -19,4 +19,4 @@
  * Contains a base interface that provides the ability to convert representation to other formats.
  */
 
-package org.apache.ignite.rest.presentation;
+package org.apache.ignite.internal.rest.presentation;
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/routes/Route.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/routes/Route.java
similarity index 96%
rename from modules/rest/src/main/java/org/apache/ignite/rest/routes/Route.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/routes/Route.java
index 631d685..21cefe0 100644
--- a/modules/rest/src/main/java/org/apache/ignite/rest/routes/Route.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/routes/Route.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.routes;
+package org.apache.ignite.internal.rest.routes;
 
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpHeaderNames;
@@ -26,8 +26,8 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiConsumer;
-import org.apache.ignite.rest.netty.RestApiHttpRequest;
-import org.apache.ignite.rest.netty.RestApiHttpResponse;
+import org.apache.ignite.internal.rest.netty.RestApiHttpRequest;
+import org.apache.ignite.internal.rest.netty.RestApiHttpResponse;
 
 /**
  * URI route with appropriate handler for request.
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/routes/Router.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/routes/Router.java
similarity index 94%
rename from modules/rest/src/main/java/org/apache/ignite/rest/routes/Router.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/routes/Router.java
index f3731d3..c2b1c0d 100644
--- a/modules/rest/src/main/java/org/apache/ignite/rest/routes/Router.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/routes/Router.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.routes;
+package org.apache.ignite.internal.rest.routes;
 
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
@@ -24,8 +24,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiConsumer;
-import org.apache.ignite.rest.netty.RestApiHttpRequest;
-import org.apache.ignite.rest.netty.RestApiHttpResponse;
+import org.apache.ignite.internal.rest.netty.RestApiHttpRequest;
+import org.apache.ignite.internal.rest.netty.RestApiHttpResponse;
 
 /**
  * Dispatcher of http requests.
diff --git a/modules/rest/src/main/java/org/apache/ignite/rest/routes/package-info.java b/modules/rest/src/main/java/org/apache/ignite/internal/rest/routes/package-info.java
similarity index 94%
rename from modules/rest/src/main/java/org/apache/ignite/rest/routes/package-info.java
rename to modules/rest/src/main/java/org/apache/ignite/internal/rest/routes/package-info.java
index 73733c3..abad541 100755
--- a/modules/rest/src/main/java/org/apache/ignite/rest/routes/package-info.java
+++ b/modules/rest/src/main/java/org/apache/ignite/internal/rest/routes/package-info.java
@@ -19,4 +19,4 @@
  * This package contains classes that represent URI routers and their dispatching.
  */
 
-package org.apache.ignite.rest.routes;
+package org.apache.ignite.internal.rest.routes;
diff --git a/modules/rest/src/test/java/org/apache/ignite/rest/netty/RestApiHttpResponseTest.java b/modules/rest/src/test/java/org/apache/ignite/internal/rest/netty/RestApiHttpResponseTest.java
similarity index 95%
rename from modules/rest/src/test/java/org/apache/ignite/rest/netty/RestApiHttpResponseTest.java
rename to modules/rest/src/test/java/org/apache/ignite/internal/rest/netty/RestApiHttpResponseTest.java
index 6b2ea45..9e76828 100644
--- a/modules/rest/src/test/java/org/apache/ignite/rest/netty/RestApiHttpResponseTest.java
+++ b/modules/rest/src/test/java/org/apache/ignite/internal/rest/netty/RestApiHttpResponseTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.netty;
+package org.apache.ignite.internal.rest.netty;
 
 import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
 import static io.netty.handler.codec.http.HttpHeaderValues.APPLICATION_JSON;
@@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import io.netty.handler.codec.http.DefaultHttpResponse;
 import io.netty.handler.codec.http.HttpVersion;
 import java.util.Map;
-import org.apache.ignite.rest.ErrorResult;
+import org.apache.ignite.internal.rest.ErrorResult;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/modules/rest/src/test/java/org/apache/ignite/rest/presentation/ConfigurationPresentationTest.java b/modules/rest/src/test/java/org/apache/ignite/internal/rest/presentation/ConfigurationPresentationTest.java
similarity index 98%
rename from modules/rest/src/test/java/org/apache/ignite/rest/presentation/ConfigurationPresentationTest.java
rename to modules/rest/src/test/java/org/apache/ignite/internal/rest/presentation/ConfigurationPresentationTest.java
index 1e10d08..51c3472 100644
--- a/modules/rest/src/test/java/org/apache/ignite/rest/presentation/ConfigurationPresentationTest.java
+++ b/modules/rest/src/test/java/org/apache/ignite/internal/rest/presentation/ConfigurationPresentationTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.presentation;
+package org.apache.ignite.internal.rest.presentation;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.ignite.configuration.annotation.ConfigurationType.LOCAL;
@@ -37,7 +37,7 @@ 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.storage.TestConfigurationStorage;
-import org.apache.ignite.rest.presentation.hocon.HoconPresentation;
+import org.apache.ignite.internal.rest.presentation.hocon.HoconPresentation;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/modules/rest/src/test/java/org/apache/ignite/rest/routes/RouteTest.java b/modules/rest/src/test/java/org/apache/ignite/internal/rest/routes/RouteTest.java
similarity index 98%
rename from modules/rest/src/test/java/org/apache/ignite/rest/routes/RouteTest.java
rename to modules/rest/src/test/java/org/apache/ignite/internal/rest/routes/RouteTest.java
index fe48323..f78ac85 100644
--- a/modules/rest/src/test/java/org/apache/ignite/rest/routes/RouteTest.java
+++ b/modules/rest/src/test/java/org/apache/ignite/internal/rest/routes/RouteTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.rest.routes;
+package org.apache.ignite.internal.rest.routes;
 
 import static io.netty.handler.codec.http.HttpMethod.GET;
 import static io.netty.handler.codec.http.HttpMethod.PUT;
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 0a5afe3..8a07442 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
@@ -45,6 +45,7 @@ import org.apache.ignite.internal.manager.IgniteComponent;
 import org.apache.ignite.internal.metastorage.MetaStorageManager;
 import org.apache.ignite.internal.metastorage.server.persistence.RocksDbKeyValueStorage;
 import org.apache.ignite.internal.raft.Loza;
+import org.apache.ignite.internal.rest.RestModule;
 import org.apache.ignite.internal.sql.engine.QueryProcessor;
 import org.apache.ignite.internal.sql.engine.SqlQueryProcessor;
 import org.apache.ignite.internal.sql.engine.message.SqlQueryMessagesSerializationRegistryInitializer;
@@ -67,7 +68,6 @@ import org.apache.ignite.network.MessageSerializationRegistryImpl;
 import org.apache.ignite.network.NettyBootstrapFactory;
 import org.apache.ignite.network.scalecube.ScaleCubeClusterServiceFactory;
 import org.apache.ignite.raft.jraft.RaftMessagesSerializationRegistryInitializer;
-import org.apache.ignite.rest.RestModule;
 import org.apache.ignite.table.manager.IgniteTables;
 import org.apache.ignite.tx.IgniteTransactions;
 import org.jetbrains.annotations.NotNull;