You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by tk...@apache.org on 2022/10/17 10:22:24 UTC
[ignite-3] branch main updated: IGNITE-17909 Extract Network configuration (#1216)
This is an automated email from the ASF dual-hosted git repository.
tkalkirill 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 2abb2e9ee1 IGNITE-17909 Extract Network configuration (#1216)
2abb2e9ee1 is described below
commit 2abb2e9ee11fed33b0e157260bfb29439447eba4
Author: Alexander Polovtcev <al...@gmail.com>
AuthorDate: Mon Oct 17 13:22:19 2022 +0300
IGNITE-17909 Extract Network configuration (#1216)
---
modules/api/src/main/java/org/apache/ignite/Ignition.java | 3 +--
.../api/src/main/java/org/apache/ignite/IgnitionManager.java | 3 +--
.../org/apache/ignite/client/handler/ItClientHandlerTest.java | 2 +-
.../src/test/java/org/apache/ignite/client/TestServer.java | 2 +-
modules/network/build.gradle | 1 +
modules/network/pom.xml | 11 ++++++++++-
.../internal/network/netty/ItConnectionManagerTest.java | 7 ++-----
.../configuration}/ClusterMembershipConfigurationSchema.java | 2 +-
.../network/configuration}/InboundConfigurationSchema.java | 2 +-
.../network/configuration/NetworkConfigurationModule.java | 3 +--
.../network/configuration}/NetworkConfigurationSchema.java | 2 +-
.../network/configuration}/NodeFinderConfigurationSchema.java | 2 +-
.../internal/network/configuration}/NodeFinderType.java | 2 +-
.../network/configuration}/OutboundConfigurationSchema.java | 2 +-
.../network/configuration}/ScaleCubeConfigurationSchema.java | 2 +-
.../ignite/internal/network/configuration}/package-info.java | 2 +-
.../ignite/internal/network/netty/ConnectionManager.java | 2 +-
.../org/apache/ignite/internal/network/netty/NettyServer.java | 2 +-
.../java/org/apache/ignite/network/NettyBootstrapFactory.java | 8 ++++----
.../java/org/apache/ignite/network/NodeFinderFactory.java | 4 ++--
.../network/scalecube/ScaleCubeClusterServiceFactory.java | 8 ++++----
...g.apache.ignite.internal.configuration.ConfigurationModule | 2 +-
.../apache/ignite/internal/network/netty/NettyServerTest.java | 2 +-
.../apache/ignite/network/DefaultMessagingServiceTest.java | 8 ++++----
.../network/scalecube/TestScaleCubeClusterServiceFactory.java | 2 +-
.../java/org/apache/ignite/utils/ClusterServiceTestUtils.java | 4 ++--
.../configuration/storage/ItRebalanceDistributedTest.java | 2 +-
.../ignite/internal/runner/app/ItIgniteNodeRestartTest.java | 2 +-
.../main/java/org/apache/ignite/internal/app/IgniteImpl.java | 5 +++--
29 files changed, 52 insertions(+), 47 deletions(-)
diff --git a/modules/api/src/main/java/org/apache/ignite/Ignition.java b/modules/api/src/main/java/org/apache/ignite/Ignition.java
index b389303a47..803372452b 100644
--- a/modules/api/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/api/src/main/java/org/apache/ignite/Ignition.java
@@ -86,8 +86,7 @@ public interface Ignition {
* REST endpoint is functional).
*
* @param nodeName Name of the node. Must not be {@code null}.
- * @param config Optional node configuration based on
- * {@link org.apache.ignite.configuration.schemas.network.NetworkConfigurationSchema}.
+ * @param config Optional node configuration.
* Following rules are used for applying the configuration properties:
* <ol>
* <li>Specified property overrides existing one or just applies itself if it wasn't
diff --git a/modules/api/src/main/java/org/apache/ignite/IgnitionManager.java b/modules/api/src/main/java/org/apache/ignite/IgnitionManager.java
index b34e0182f7..7a594196f3 100644
--- a/modules/api/src/main/java/org/apache/ignite/IgnitionManager.java
+++ b/modules/api/src/main/java/org/apache/ignite/IgnitionManager.java
@@ -48,8 +48,7 @@ public class IgnitionManager {
* REST endpoint is functional).
*
* @param nodeName Name of the node. Must not be {@code null}.
- * @param configStr Optional node configuration based on
- * {@link org.apache.ignite.configuration.schemas.network.NetworkConfigurationSchema}.
+ * @param configStr Optional node configuration.
* Following rules are used for applying the configuration properties:
* <ol>
* <li>Specified property overrides existing one or just applies itself if it wasn't
diff --git a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java
index 2e1eebad23..2c722d4508 100644
--- a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java
+++ b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java
@@ -37,9 +37,9 @@ import java.util.List;
import java.util.Map;
import org.apache.ignite.client.handler.configuration.ClientConnectorConfiguration;
import org.apache.ignite.compute.IgniteCompute;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
import org.apache.ignite.internal.configuration.ConfigurationManager;
import org.apache.ignite.internal.configuration.storage.TestConfigurationStorage;
+import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
import org.apache.ignite.internal.sql.engine.QueryProcessor;
import org.apache.ignite.internal.table.IgniteTablesInternal;
import org.apache.ignite.network.ClusterService;
diff --git a/modules/client/src/test/java/org/apache/ignite/client/TestServer.java b/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
index 2ecbe1dbb0..69ed82d52f 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
@@ -35,10 +35,10 @@ import org.apache.ignite.client.fakes.FakeIgnite;
import org.apache.ignite.client.handler.ClientHandlerModule;
import org.apache.ignite.client.handler.configuration.ClientConnectorConfiguration;
import org.apache.ignite.compute.IgniteCompute;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
import org.apache.ignite.internal.configuration.storage.TestConfigurationStorage;
import org.apache.ignite.internal.manager.IgniteComponent;
+import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
import org.apache.ignite.internal.table.IgniteTablesInternal;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.ClusterService;
diff --git a/modules/network/build.gradle b/modules/network/build.gradle
index b757acf769..412a36d764 100644
--- a/modules/network/build.gradle
+++ b/modules/network/build.gradle
@@ -33,6 +33,7 @@ dependencies {
implementation libs.fastutil.core
implementation libs.netty.handler
implementation libs.netty.transport
+ annotationProcessor project(":ignite-configuration-annotation-processor")
annotationProcessor project(":ignite-network-annotation-processor")
annotationProcessor libs.jmh.annotation.processor
diff --git a/modules/network/pom.xml b/modules/network/pom.xml
index 791e983bda..e20006f7a9 100644
--- a/modules/network/pom.xml
+++ b/modules/network/pom.xml
@@ -177,12 +177,16 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<dependencies>
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-configuration-annotation-processor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-network-annotation-processor</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
@@ -191,6 +195,11 @@
</dependencies>
<configuration>
<annotationProcessorPaths>
+ <path>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-configuration-annotation-processor</artifactId>
+ <version>${project.version}</version>
+ </path>
<path>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-network-annotation-processor</artifactId>
diff --git a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java b/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java
index 2300e76d0a..96f6a862c8 100644
--- a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java
+++ b/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java
@@ -41,11 +41,10 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
-import org.apache.ignite.configuration.schemas.network.NetworkView;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
-import org.apache.ignite.internal.network.NetworkMessagesFactory;
+import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
+import org.apache.ignite.internal.network.configuration.NetworkView;
import org.apache.ignite.internal.network.messages.TestMessage;
import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.apache.ignite.internal.network.serialization.SerializationService;
@@ -338,8 +337,6 @@ public class ItConnectionManagerTest {
UUID launchId = UUID.randomUUID();
String consistentId = UUID.randomUUID().toString();
- var messageFactory = new NetworkMessagesFactory();
-
networkConfiguration.port().update(port).join();
NetworkView cfg = networkConfiguration.value();
diff --git a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/ClusterMembershipConfigurationSchema.java b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/ClusterMembershipConfigurationSchema.java
similarity index 96%
rename from modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/ClusterMembershipConfigurationSchema.java
rename to modules/network/src/main/java/org/apache/ignite/internal/network/configuration/ClusterMembershipConfigurationSchema.java
index 4cbf806a7b..bfb18e047a 100644
--- a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/ClusterMembershipConfigurationSchema.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/ClusterMembershipConfigurationSchema.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.configuration.schemas.network;
+package org.apache.ignite.internal.network.configuration;
import org.apache.ignite.configuration.annotation.Config;
import org.apache.ignite.configuration.annotation.ConfigValue;
diff --git a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/InboundConfigurationSchema.java b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/InboundConfigurationSchema.java
similarity index 96%
rename from modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/InboundConfigurationSchema.java
rename to modules/network/src/main/java/org/apache/ignite/internal/network/configuration/InboundConfigurationSchema.java
index 0b8467ea84..06aff4f33f 100644
--- a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/InboundConfigurationSchema.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/InboundConfigurationSchema.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.configuration.schemas.network;
+package org.apache.ignite.internal.network.configuration;
import org.apache.ignite.configuration.annotation.Config;
import org.apache.ignite.configuration.annotation.Value;
diff --git a/modules/network/src/main/java/org/apache/ignite/network/configuration/NetworkConfigurationModule.java b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationModule.java
similarity index 92%
rename from modules/network/src/main/java/org/apache/ignite/network/configuration/NetworkConfigurationModule.java
rename to modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationModule.java
index 80196cef2b..2477b93c7b 100644
--- a/modules/network/src/main/java/org/apache/ignite/network/configuration/NetworkConfigurationModule.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationModule.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.network.configuration;
+package org.apache.ignite.internal.network.configuration;
import java.util.Collection;
import java.util.Collections;
import org.apache.ignite.configuration.RootKey;
import org.apache.ignite.configuration.annotation.ConfigurationType;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
import org.apache.ignite.internal.configuration.ConfigurationModule;
/**
diff --git a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/NetworkConfigurationSchema.java b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
similarity index 97%
rename from modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/NetworkConfigurationSchema.java
rename to modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
index bf082f8e7f..dbe18bee72 100644
--- a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/NetworkConfigurationSchema.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.configuration.schemas.network;
+package org.apache.ignite.internal.network.configuration;
import org.apache.ignite.configuration.annotation.ConfigValue;
import org.apache.ignite.configuration.annotation.ConfigurationRoot;
diff --git a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/NodeFinderConfigurationSchema.java b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NodeFinderConfigurationSchema.java
similarity index 95%
rename from modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/NodeFinderConfigurationSchema.java
rename to modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NodeFinderConfigurationSchema.java
index 618f8ea0b5..9b44d4a4f8 100644
--- a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/NodeFinderConfigurationSchema.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NodeFinderConfigurationSchema.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.configuration.schemas.network;
+package org.apache.ignite.internal.network.configuration;
import org.apache.ignite.configuration.annotation.Config;
import org.apache.ignite.configuration.annotation.Value;
diff --git a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/NodeFinderType.java b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NodeFinderType.java
similarity index 94%
rename from modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/NodeFinderType.java
rename to modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NodeFinderType.java
index 05cf9a292f..e870dff5cf 100644
--- a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/NodeFinderType.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NodeFinderType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.configuration.schemas.network;
+package org.apache.ignite.internal.network.configuration;
/** NodeFinder type. */
public enum NodeFinderType {
diff --git a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/OutboundConfigurationSchema.java b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/OutboundConfigurationSchema.java
similarity index 96%
rename from modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/OutboundConfigurationSchema.java
rename to modules/network/src/main/java/org/apache/ignite/internal/network/configuration/OutboundConfigurationSchema.java
index 07952a86bf..3e3a8f7f5c 100644
--- a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/OutboundConfigurationSchema.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/OutboundConfigurationSchema.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.configuration.schemas.network;
+package org.apache.ignite.internal.network.configuration;
import org.apache.ignite.configuration.annotation.Config;
import org.apache.ignite.configuration.annotation.Value;
diff --git a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/ScaleCubeConfigurationSchema.java b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/ScaleCubeConfigurationSchema.java
similarity index 96%
rename from modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/ScaleCubeConfigurationSchema.java
rename to modules/network/src/main/java/org/apache/ignite/internal/network/configuration/ScaleCubeConfigurationSchema.java
index 080de4bb0c..9412a98350 100644
--- a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/ScaleCubeConfigurationSchema.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/ScaleCubeConfigurationSchema.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.configuration.schemas.network;
+package org.apache.ignite.internal.network.configuration;
import org.apache.ignite.configuration.annotation.Config;
import org.apache.ignite.configuration.annotation.Value;
diff --git a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/package-info.java b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/package-info.java
similarity index 93%
rename from modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/package-info.java
rename to modules/network/src/main/java/org/apache/ignite/internal/network/configuration/package-info.java
index f39ea4b04f..7756906032 100644
--- a/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/package-info.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/package-info.java
@@ -19,4 +19,4 @@
* Configuration schemas for Network components.
*/
-package org.apache.ignite.configuration.schemas.network;
+package org.apache.ignite.internal.network.configuration;
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/ConnectionManager.java b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/ConnectionManager.java
index e49fbe0787..26599bed27 100644
--- a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/ConnectionManager.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/ConnectionManager.java
@@ -31,11 +31,11 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import org.apache.ignite.configuration.schemas.network.NetworkView;
import org.apache.ignite.internal.future.OrderingFuture;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.network.NetworkMessagesFactory;
+import org.apache.ignite.internal.network.configuration.NetworkView;
import org.apache.ignite.internal.network.handshake.HandshakeManager;
import org.apache.ignite.internal.network.recovery.RecoveryClientHandhakeManagerFactory;
import org.apache.ignite.internal.network.recovery.RecoveryClientHandshakeManager;
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/NettyServer.java b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/NettyServer.java
index fbc60acf28..52d0e93910 100644
--- a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/NettyServer.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/NettyServer.java
@@ -29,7 +29,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
-import org.apache.ignite.configuration.schemas.network.NetworkView;
+import org.apache.ignite.internal.network.configuration.NetworkView;
import org.apache.ignite.internal.network.handshake.HandshakeManager;
import org.apache.ignite.internal.network.serialization.PerSessionSerializationService;
import org.apache.ignite.internal.network.serialization.SerializationService;
diff --git a/modules/network/src/main/java/org/apache/ignite/network/NettyBootstrapFactory.java b/modules/network/src/main/java/org/apache/ignite/network/NettyBootstrapFactory.java
index 14ea4ba141..9d086cd419 100644
--- a/modules/network/src/main/java/org/apache/ignite/network/NettyBootstrapFactory.java
+++ b/modules/network/src/main/java/org/apache/ignite/network/NettyBootstrapFactory.java
@@ -24,11 +24,11 @@ import io.netty.channel.EventLoopGroup;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import java.util.concurrent.TimeUnit;
-import org.apache.ignite.configuration.schemas.network.InboundView;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
-import org.apache.ignite.configuration.schemas.network.NetworkView;
-import org.apache.ignite.configuration.schemas.network.OutboundView;
import org.apache.ignite.internal.manager.IgniteComponent;
+import org.apache.ignite.internal.network.configuration.InboundView;
+import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
+import org.apache.ignite.internal.network.configuration.NetworkView;
+import org.apache.ignite.internal.network.configuration.OutboundView;
import org.apache.ignite.internal.network.netty.NamedNioEventLoopGroup;
import org.apache.ignite.internal.network.netty.NamedNioEventLoopGroup.NetworkThread;
diff --git a/modules/network/src/main/java/org/apache/ignite/network/NodeFinderFactory.java b/modules/network/src/main/java/org/apache/ignite/network/NodeFinderFactory.java
index 53c433288e..976126946b 100644
--- a/modules/network/src/main/java/org/apache/ignite/network/NodeFinderFactory.java
+++ b/modules/network/src/main/java/org/apache/ignite/network/NodeFinderFactory.java
@@ -21,8 +21,8 @@ import static java.util.stream.Collectors.collectingAndThen;
import static java.util.stream.Collectors.toUnmodifiableList;
import java.util.Arrays;
-import org.apache.ignite.configuration.schemas.network.NodeFinderType;
-import org.apache.ignite.configuration.schemas.network.NodeFinderView;
+import org.apache.ignite.internal.network.configuration.NodeFinderType;
+import org.apache.ignite.internal.network.configuration.NodeFinderView;
/**
* {@link NodeFinder} factory.
diff --git a/modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeClusterServiceFactory.java b/modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeClusterServiceFactory.java
index a49064d82f..b191c66749 100644
--- a/modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeClusterServiceFactory.java
+++ b/modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeClusterServiceFactory.java
@@ -29,13 +29,13 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
-import org.apache.ignite.configuration.schemas.network.ClusterMembershipView;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
-import org.apache.ignite.configuration.schemas.network.NetworkView;
-import org.apache.ignite.configuration.schemas.network.ScaleCubeView;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.network.NetworkMessagesFactory;
+import org.apache.ignite.internal.network.configuration.ClusterMembershipView;
+import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
+import org.apache.ignite.internal.network.configuration.NetworkView;
+import org.apache.ignite.internal.network.configuration.ScaleCubeView;
import org.apache.ignite.internal.network.netty.ConnectionManager;
import org.apache.ignite.internal.network.serialization.ClassDescriptorFactory;
import org.apache.ignite.internal.network.serialization.ClassDescriptorRegistry;
diff --git a/modules/network/src/main/resources/META-INF/services/org.apache.ignite.internal.configuration.ConfigurationModule b/modules/network/src/main/resources/META-INF/services/org.apache.ignite.internal.configuration.ConfigurationModule
index b718f733a9..66800145c9 100644
--- a/modules/network/src/main/resources/META-INF/services/org.apache.ignite.internal.configuration.ConfigurationModule
+++ b/modules/network/src/main/resources/META-INF/services/org.apache.ignite.internal.configuration.ConfigurationModule
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-org.apache.ignite.network.configuration.NetworkConfigurationModule
+org.apache.ignite.internal.network.configuration.NetworkConfigurationModule
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/NettyServerTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/NettyServerTest.java
index 1dee96d4f6..bfad033576 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/NettyServerTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/NettyServerTest.java
@@ -39,9 +39,9 @@ import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.nio.NioSocketChannel;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
+import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
import org.apache.ignite.internal.network.handshake.HandshakeManager;
import org.apache.ignite.internal.network.serialization.SerializationService;
import org.apache.ignite.internal.network.serialization.UserObjectSerializationContext;
diff --git a/modules/network/src/test/java/org/apache/ignite/network/DefaultMessagingServiceTest.java b/modules/network/src/test/java/org/apache/ignite/network/DefaultMessagingServiceTest.java
index 2609603d5c..99e24d9eac 100644
--- a/modules/network/src/test/java/org/apache/ignite/network/DefaultMessagingServiceTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/network/DefaultMessagingServiceTest.java
@@ -27,11 +27,11 @@ import java.util.UUID;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.ignite.configuration.schemas.network.InboundView;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
-import org.apache.ignite.configuration.schemas.network.NetworkView;
-import org.apache.ignite.configuration.schemas.network.OutboundView;
import org.apache.ignite.internal.network.NetworkMessagesFactory;
+import org.apache.ignite.internal.network.configuration.InboundView;
+import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
+import org.apache.ignite.internal.network.configuration.NetworkView;
+import org.apache.ignite.internal.network.configuration.OutboundView;
import org.apache.ignite.internal.network.messages.TestMessage;
import org.apache.ignite.internal.network.messages.TestMessageSerializationFactory;
import org.apache.ignite.internal.network.messages.TestMessageTypes;
diff --git a/modules/network/src/testFixtures/java/org/apache/ignite/network/scalecube/TestScaleCubeClusterServiceFactory.java b/modules/network/src/testFixtures/java/org/apache/ignite/network/scalecube/TestScaleCubeClusterServiceFactory.java
index 7c7d61ebb3..19d94766df 100644
--- a/modules/network/src/testFixtures/java/org/apache/ignite/network/scalecube/TestScaleCubeClusterServiceFactory.java
+++ b/modules/network/src/testFixtures/java/org/apache/ignite/network/scalecube/TestScaleCubeClusterServiceFactory.java
@@ -18,7 +18,7 @@
package org.apache.ignite.network.scalecube;
import io.scalecube.cluster.ClusterConfig;
-import org.apache.ignite.configuration.schemas.network.ClusterMembershipView;
+import org.apache.ignite.internal.network.configuration.ClusterMembershipView;
/**
* Scalecube test factory. Provides fast detection time.
diff --git a/modules/network/src/testFixtures/java/org/apache/ignite/utils/ClusterServiceTestUtils.java b/modules/network/src/testFixtures/java/org/apache/ignite/utils/ClusterServiceTestUtils.java
index 52fe98b099..50e80187db 100644
--- a/modules/network/src/testFixtures/java/org/apache/ignite/utils/ClusterServiceTestUtils.java
+++ b/modules/network/src/testFixtures/java/org/apache/ignite/utils/ClusterServiceTestUtils.java
@@ -30,11 +30,11 @@ import java.util.List;
import java.util.Map;
import java.util.stream.IntStream;
import org.apache.ignite.configuration.annotation.ConfigurationType;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
-import org.apache.ignite.configuration.schemas.network.NodeFinderType;
import org.apache.ignite.internal.configuration.ConfigurationManager;
import org.apache.ignite.internal.configuration.storage.TestConfigurationStorage;
import org.apache.ignite.internal.network.NetworkMessagesSerializationRegistryInitializer;
+import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
+import org.apache.ignite.internal.network.configuration.NodeFinderType;
import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.MessageSerializationRegistryImpl;
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
index b9ae94b97a..a952cd39a5 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
@@ -38,7 +38,6 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.ignite.client.handler.configuration.ClientConnectorConfiguration;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
import org.apache.ignite.hlc.HybridClock;
import org.apache.ignite.internal.baseline.BaselineManager;
import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
@@ -51,6 +50,7 @@ import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.manager.IgniteComponent;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage;
+import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
import org.apache.ignite.internal.pagememory.configuration.schema.UnsafeMemoryAllocatorConfigurationSchema;
import org.apache.ignite.internal.raft.Loza;
import org.apache.ignite.internal.raft.configuration.RaftConfiguration;
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
index 87d1c17d27..cf47baecae 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
@@ -48,7 +48,6 @@ import java.util.function.IntFunction;
import java.util.stream.IntStream;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgnitionManager;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
import org.apache.ignite.hlc.HybridClock;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.baseline.BaselineManager;
@@ -68,6 +67,7 @@ import org.apache.ignite.internal.logger.IgniteLogger;
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.network.configuration.NetworkConfiguration;
import org.apache.ignite.internal.raft.Loza;
import org.apache.ignite.internal.raft.configuration.RaftConfiguration;
import org.apache.ignite.internal.raft.storage.impl.LocalLogStorageFactory;
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 178c16f26a..f8cf815bf1 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
@@ -33,7 +33,6 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgnitionManager;
import org.apache.ignite.client.handler.ClientHandlerModule;
import org.apache.ignite.compute.IgniteCompute;
-import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
import org.apache.ignite.hlc.HybridClock;
import org.apache.ignite.internal.baseline.BaselineManager;
import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
@@ -62,6 +61,8 @@ import org.apache.ignite.internal.metastorage.server.persistence.RocksDbKeyValue
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.network.configuration.NetworkConfiguration;
+import org.apache.ignite.internal.network.configuration.NetworkConfigurationSchema;
import org.apache.ignite.internal.raft.Loza;
import org.apache.ignite.internal.raft.configuration.RaftConfiguration;
import org.apache.ignite.internal.raft.storage.impl.VolatileLogStorageFactoryCreator;
@@ -449,7 +450,7 @@ public class IgniteImpl implements Ignite {
* REST endpoint is functional).
*
* @param cfg Optional node configuration based on
- * {@link org.apache.ignite.configuration.schemas.network.NetworkConfigurationSchema}. Following rules are used for applying the
+ * {@link NetworkConfigurationSchema}. Following rules are used for applying the
* configuration properties:
*
* <ol>