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/09/26 18:15:39 UTC
[ignite-3] branch main updated: IGNITE-17464 Minor fixes in NetworkMessage annotation processor (#1122)
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 533fa65f86 IGNITE-17464 Minor fixes in NetworkMessage annotation processor (#1122)
533fa65f86 is described below
commit 533fa65f863f10c9292d0fc2596d1ef430538879
Author: Alexander Polovtcev <al...@gmail.com>
AuthorDate: Mon Sep 26 21:15:34 2022 +0300
IGNITE-17464 Minor fixes in NetworkMessage annotation processor (#1122)
---
.../internal/network/processor/MessageClass.java | 12 ++---
.../network/netty/ItConnectionManagerTest.java | 6 +--
.../scalecube/ItScaleCubeNetworkMessagingTest.java | 6 +--
.../internal/network/AllTypesMessageGenerator.java | 5 +-
.../internal/network/AllTypesMessageTest.java | 1 +
.../network/SerializationMicroBenchmark.java | 1 +
.../network/{ => messages}/AllTypesMessage.java | 3 +-
.../{processor => messages}/EmptyMessage.java | 3 +-
.../{processor => messages}/InheritedMessage.java | 3 +-
.../MessageWithMarshallable.java | 4 +-
.../{ => messages}/NestedMessageMessage.java | 3 +-
.../{processor => messages}/NetworkMessage1.java | 2 +-
.../{processor => messages}/NetworkMessage2.java | 2 +-
.../SerializationOrderMessage.java | 3 +-
.../network/messages}/TestMessage.java | 3 +-
.../network/messages}/TestMessageTypes.java | 5 +-
.../internal/network/netty/InboundDecoderTest.java | 14 +++---
.../network/netty/RecoveryHandshakeTest.java | 6 +--
.../network/processor/EmptyMessageTest.java | 4 +-
.../network/processor/InMemoryJavaFileManager.java | 0
.../network/processor/InheritedMessageTest.java | 4 +-
.../network/processor/SerializationOrderTest.java | 4 +-
...ransferableObjectProcessorIncrementalTest.java} | 46 +++++++++---------
.../TransferableObjectProcessorTest.java} | 31 +++++++++----
.../network/serialization/MarshallableTest.java | 5 +-
.../network/AbstractMessagingServiceTest.java | 1 +
.../MessageSerializationRegistryImplTest.java | 9 ++--
.../TestMessageSerializationRegistryImpl.java | 5 +-
.../network/processor/AllTypesMessage.java | 54 ++++++++++++----------
.../network/processor/ConflictingTypeMessage.java | 1 +
.../network/processor/InheritedMessageClash.java | 0
.../processor/InvalidAnnotatedTypeMessage.java | 0
.../processor/InvalidParameterGetterMessage.java | 0
.../processor/InvalidReturnTypeGetterMessage.java | 0
.../internal/network/processor/SecondGroup.java | 0
.../network/processor/TestMessageGroup.java} | 2 +-
.../network/processor/TransitiveMessage.java | 0
.../processor/UnmarshallableTypeMessage.java | 0
.../UnmarshallableTypeNonSerializableMessage.java | 0
39 files changed, 134 insertions(+), 114 deletions(-)
diff --git a/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/MessageClass.java b/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/MessageClass.java
index 7c9e114dcd..6977c03fb1 100644
--- a/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/MessageClass.java
+++ b/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/MessageClass.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
+import java.util.function.Function;
import java.util.stream.Collectors;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.ElementKind;
@@ -81,16 +82,13 @@ public class MessageClass {
.filter(e -> !typeUtils.isSameType(e.asType(), NetworkMessage.class))
.flatMap(e -> e.getEnclosedElements().stream())
.filter(e -> e.getKind() == ElementKind.METHOD)
- .filter(e -> !((ExecutableElement) e).isDefault())
+ .map(ExecutableElement.class::cast)
+ .filter(e -> !e.isDefault())
// use a tree map to sort getters by name and remove duplicates
.collect(Collectors.toMap(
e -> e.getSimpleName().toString(),
- ExecutableElement.class::cast,
- (e1, e2) -> {
- throw new ProcessingException(
- String.format("Getter with name '%s' is already defined", e2.getSimpleName()), null, e2
- );
- },
+ Function.identity(),
+ (e1, e2) -> e1,
TreeMap::new
));
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 ffe70d5b39..2300e76d0a 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
@@ -46,6 +46,8 @@ 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.messages.TestMessage;
+import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.apache.ignite.internal.network.serialization.SerializationService;
import org.apache.ignite.internal.network.serialization.UserObjectSerializationContext;
import org.apache.ignite.lang.IgniteBiTuple;
@@ -53,10 +55,8 @@ import org.apache.ignite.lang.IgniteInternalException;
import org.apache.ignite.network.NettyBootstrapFactory;
import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.OutNetworkObject;
-import org.apache.ignite.network.TestMessage;
-import org.apache.ignite.network.TestMessageSerializationRegistryImpl;
-import org.apache.ignite.network.TestMessagesFactory;
import org.apache.ignite.network.serialization.MessageSerializationRegistry;
+import org.apache.ignite.network.serialization.TestMessageSerializationRegistryImpl;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItScaleCubeNetworkMessagingTest.java b/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItScaleCubeNetworkMessagingTest.java
index 153cffb588..9ca5961d41 100644
--- a/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItScaleCubeNetworkMessagingTest.java
+++ b/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItScaleCubeNetworkMessagingTest.java
@@ -45,6 +45,9 @@ import java.util.stream.Collectors;
import org.apache.ignite.internal.network.NetworkMessageTypes;
import org.apache.ignite.internal.network.NetworkMessagesFactory;
import org.apache.ignite.internal.network.message.FieldDescriptorMessage;
+import org.apache.ignite.internal.network.messages.TestMessage;
+import org.apache.ignite.internal.network.messages.TestMessageTypes;
+import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.apache.ignite.lang.NodeStoppingException;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.ClusterService;
@@ -52,9 +55,6 @@ import org.apache.ignite.network.NetworkAddress;
import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.NodeFinder;
import org.apache.ignite.network.StaticNodeFinder;
-import org.apache.ignite.network.TestMessage;
-import org.apache.ignite.network.TestMessageTypes;
-import org.apache.ignite.network.TestMessagesFactory;
import org.apache.ignite.network.TopologyEventHandler;
import org.apache.ignite.utils.ClusterServiceTestUtils;
import org.junit.jupiter.api.AfterEach;
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessageGenerator.java b/modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessageGenerator.java
index a0f8713191..c19dc440b8 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessageGenerator.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessageGenerator.java
@@ -25,10 +25,13 @@ import java.util.BitSet;
import java.util.Random;
import java.util.UUID;
import java.util.stream.IntStream;
+import org.apache.ignite.internal.network.messages.AllTypesMessage;
+import org.apache.ignite.internal.network.messages.AllTypesMessageBuilder;
+import org.apache.ignite.internal.network.messages.AllTypesMessageImpl;
+import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.lang.IgniteUuidGenerator;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.TestMessagesFactory;
import org.jetbrains.annotations.Nullable;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessageTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessageTest.java
index 8d43968335..d38bfe1a19 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessageTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessageTest.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.ignite.internal.network.messages.AllTypesMessage;
import org.junit.jupiter.api.Test;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/SerializationMicroBenchmark.java b/modules/network/src/test/java/org/apache/ignite/internal/network/SerializationMicroBenchmark.java
index 0923ed87db..32122c8c9a 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/SerializationMicroBenchmark.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/SerializationMicroBenchmark.java
@@ -27,6 +27,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.concurrent.TimeUnit;
+import org.apache.ignite.internal.network.messages.AllTypesMessage;
import org.apache.ignite.internal.network.serialization.ClassDescriptorFactory;
import org.apache.ignite.internal.network.serialization.ClassDescriptorRegistry;
import org.apache.ignite.internal.network.serialization.marshal.DefaultUserObjectMarshaller;
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessage.java b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/AllTypesMessage.java
similarity index 95%
rename from modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessage.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/messages/AllTypesMessage.java
index ee68cb5524..03793fc685 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/AllTypesMessage.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/AllTypesMessage.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.network;
+package org.apache.ignite.internal.network.messages;
import java.io.Serializable;
import java.util.BitSet;
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.TestMessageTypes;
import org.apache.ignite.network.annotations.Transferable;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/EmptyMessage.java b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/EmptyMessage.java
similarity index 91%
rename from modules/network/src/test/java/org/apache/ignite/internal/network/processor/EmptyMessage.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/messages/EmptyMessage.java
index 4ff1a6351a..041d91cd15 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/EmptyMessage.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/EmptyMessage.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.network.processor;
+package org.apache.ignite.internal.network.messages;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.TestMessageTypes;
import org.apache.ignite.network.annotations.Transferable;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessage.java b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/InheritedMessage.java
similarity index 91%
rename from modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessage.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/messages/InheritedMessage.java
index 4a2604807f..43d5fec5d9 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessage.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/InheritedMessage.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.network.processor;
+package org.apache.ignite.internal.network.messages;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.TestMessageTypes;
import org.apache.ignite.network.annotations.Transferable;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MessageWithMarshallable.java b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/MessageWithMarshallable.java
similarity index 90%
rename from modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MessageWithMarshallable.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/messages/MessageWithMarshallable.java
index e650b96f6a..7b98310b58 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MessageWithMarshallable.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/MessageWithMarshallable.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.network.serialization;
+package org.apache.ignite.internal.network.messages;
import java.util.Map;
+import org.apache.ignite.internal.network.serialization.SimpleSerializableObject;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.TestMessageTypes;
import org.apache.ignite.network.annotations.Marshallable;
import org.apache.ignite.network.annotations.Transferable;
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/NestedMessageMessage.java b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/NestedMessageMessage.java
similarity index 92%
rename from modules/network/src/test/java/org/apache/ignite/internal/network/NestedMessageMessage.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/messages/NestedMessageMessage.java
index 72a9210ef8..aeda395fbc 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/NestedMessageMessage.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/NestedMessageMessage.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.network;
+package org.apache.ignite.internal.network.messages;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.TestMessageTypes;
import org.apache.ignite.network.annotations.Transferable;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/NetworkMessage1.java b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/NetworkMessage1.java
similarity index 94%
rename from modules/network/src/test/java/org/apache/ignite/internal/network/processor/NetworkMessage1.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/messages/NetworkMessage1.java
index b35b2b990a..6dc691e957 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/NetworkMessage1.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/NetworkMessage1.java
@@ -16,7 +16,7 @@
*/
-package org.apache.ignite.internal.network.processor;
+package org.apache.ignite.internal.network.messages;
import org.apache.ignite.network.NetworkMessage;
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/NetworkMessage2.java b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/NetworkMessage2.java
similarity index 94%
rename from modules/network/src/test/java/org/apache/ignite/internal/network/processor/NetworkMessage2.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/messages/NetworkMessage2.java
index 0e1d3e8957..37b04f4ecb 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/NetworkMessage2.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/NetworkMessage2.java
@@ -16,7 +16,7 @@
*/
-package org.apache.ignite.internal.network.processor;
+package org.apache.ignite.internal.network.messages;
import java.io.Serializable;
import org.apache.ignite.network.NetworkMessage;
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderMessage.java b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/SerializationOrderMessage.java
similarity index 91%
rename from modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderMessage.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/messages/SerializationOrderMessage.java
index 021a49b9d5..3243517064 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderMessage.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/SerializationOrderMessage.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.network.processor;
+package org.apache.ignite.internal.network.messages;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.TestMessageTypes;
import org.apache.ignite.network.annotations.Transferable;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/network/TestMessage.java b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/TestMessage.java
similarity index 91%
rename from modules/network/src/test/java/org/apache/ignite/network/TestMessage.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/messages/TestMessage.java
index 78987b54ba..fdac96ceec 100644
--- a/modules/network/src/test/java/org/apache/ignite/network/TestMessage.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/TestMessage.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.network;
+package org.apache.ignite.internal.network.messages;
import java.io.Serializable;
import java.util.Map;
+import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.annotations.Transferable;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/network/TestMessageTypes.java b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/TestMessageTypes.java
similarity index 85%
rename from modules/network/src/test/java/org/apache/ignite/network/TestMessageTypes.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/messages/TestMessageTypes.java
index 8033b8280c..f11ba648f3 100644
--- a/modules/network/src/test/java/org/apache/ignite/network/TestMessageTypes.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/messages/TestMessageTypes.java
@@ -15,11 +15,8 @@
* limitations under the License.
*/
-package org.apache.ignite.network;
+package org.apache.ignite.internal.network.messages;
-import org.apache.ignite.internal.network.processor.EmptyMessage;
-import org.apache.ignite.internal.network.processor.InheritedMessage;
-import org.apache.ignite.internal.network.processor.SerializationOrderMessage;
import org.apache.ignite.network.annotations.MessageGroup;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/InboundDecoderTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/InboundDecoderTest.java
index 070a98eb08..1291f8d5bb 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/InboundDecoderTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/InboundDecoderTest.java
@@ -34,19 +34,19 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
import java.util.stream.LongStream;
-import org.apache.ignite.internal.network.AllTypesMessage;
import org.apache.ignite.internal.network.AllTypesMessageGenerator;
-import org.apache.ignite.internal.network.NestedMessageMessage;
import org.apache.ignite.internal.network.direct.DirectMessageWriter;
+import org.apache.ignite.internal.network.messages.AllTypesMessage;
+import org.apache.ignite.internal.network.messages.NestedMessageMessage;
+import org.apache.ignite.internal.network.messages.TestMessage;
+import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.apache.ignite.internal.network.serialization.PerSessionSerializationService;
import org.apache.ignite.internal.network.serialization.SerializationService;
import org.apache.ignite.internal.network.serialization.UserObjectSerializationContext;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.TestMessage;
-import org.apache.ignite.network.TestMessageSerializationRegistryImpl;
-import org.apache.ignite.network.TestMessagesFactory;
import org.apache.ignite.network.serialization.MessageSerializationRegistry;
import org.apache.ignite.network.serialization.MessageSerializer;
+import org.apache.ignite.network.serialization.TestMessageSerializationRegistryImpl;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -158,8 +158,8 @@ public class InboundDecoderTest {
}
/**
- * Tests that an {@link InboundDecoder} can handle a {@link ByteBuf} where reader index is not {@code 0} at the start of the {@link
- * InboundDecoder#decode}.
+ * Tests that an {@link InboundDecoder} can handle a {@link ByteBuf} where reader index is not {@code 0} at the start of the
+ * {@link InboundDecoder#decode}.
*
* @throws Exception If failed.
*/
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java
index 772005c2aa..7933e5c040 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java
@@ -35,6 +35,8 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import org.apache.ignite.internal.network.NetworkMessagesFactory;
import org.apache.ignite.internal.network.handshake.HandshakeManager;
+import org.apache.ignite.internal.network.messages.TestMessage;
+import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.apache.ignite.internal.network.recovery.RecoveryClientHandshakeManager;
import org.apache.ignite.internal.network.recovery.RecoveryDescriptor;
import org.apache.ignite.internal.network.recovery.RecoveryDescriptorProvider;
@@ -47,10 +49,8 @@ import org.apache.ignite.internal.network.serialization.UserObjectSerializationC
import org.apache.ignite.internal.network.serialization.marshal.DefaultUserObjectMarshaller;
import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.OutNetworkObject;
-import org.apache.ignite.network.TestMessage;
-import org.apache.ignite.network.TestMessageSerializationRegistryImpl;
-import org.apache.ignite.network.TestMessagesFactory;
import org.apache.ignite.network.serialization.MessageSerializationRegistry;
+import org.apache.ignite.network.serialization.TestMessageSerializationRegistryImpl;
import org.junit.jupiter.api.Test;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/EmptyMessageTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/EmptyMessageTest.java
index 6103cf124a..57e577dd44 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/EmptyMessageTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/EmptyMessageTest.java
@@ -20,7 +20,9 @@ package org.apache.ignite.internal.network.processor;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import org.apache.ignite.network.TestMessagesFactory;
+import org.apache.ignite.internal.network.messages.EmptyMessage;
+import org.apache.ignite.internal.network.messages.EmptyMessageImpl;
+import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.junit.jupiter.api.Test;
/**
diff --git a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/processor/InMemoryJavaFileManager.java b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InMemoryJavaFileManager.java
similarity index 100%
rename from modules/network/src/integrationTest/java/org/apache/ignite/internal/network/processor/InMemoryJavaFileManager.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/processor/InMemoryJavaFileManager.java
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessageTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessageTest.java
index 3571cf0983..2b4cede65a 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessageTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessageTest.java
@@ -24,7 +24,9 @@ import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.ignite.network.TestMessagesFactory;
+import org.apache.ignite.internal.network.messages.InheritedMessage;
+import org.apache.ignite.internal.network.messages.InheritedMessageSerializationFactory;
+import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.apache.ignite.network.serialization.MessageDeserializer;
import org.apache.ignite.network.serialization.MessageReader;
import org.apache.ignite.network.serialization.MessageSerializer;
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderTest.java
index 5ec76c0d1b..71dacd236e 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderTest.java
@@ -24,7 +24,9 @@ import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.ignite.network.TestMessagesFactory;
+import org.apache.ignite.internal.network.messages.SerializationOrderMessage;
+import org.apache.ignite.internal.network.messages.SerializationOrderMessageSerializationFactory;
+import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.apache.ignite.network.serialization.MessageDeserializer;
import org.apache.ignite.network.serialization.MessageReader;
import org.apache.ignite.network.serialization.MessageSerializer;
diff --git a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/processor/ItTransferableObjectProcessorIncrementalTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/TransferableObjectProcessorIncrementalTest.java
similarity index 90%
rename from modules/network/src/integrationTest/java/org/apache/ignite/internal/network/processor/ItTransferableObjectProcessorIncrementalTest.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/processor/TransferableObjectProcessorIncrementalTest.java
index c2ba339d82..a3f68da756 100644
--- a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/processor/ItTransferableObjectProcessorIncrementalTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/TransferableObjectProcessorIncrementalTest.java
@@ -56,10 +56,10 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
/**
- * Integration tests for the {@link TransferableObjectProcessor} incremental compilation.
+ * Tests for the {@link TransferableObjectProcessor} incremental compilation.
*/
@ExtendWith(MockitoExtension.class)
-public class ItTransferableObjectProcessorIncrementalTest {
+public class TransferableObjectProcessorIncrementalTest {
/**
* Package name of the test sources.
*/
@@ -255,38 +255,38 @@ public class ItTransferableObjectProcessorIncrementalTest {
private JavaFileObject createTransferable(String className, int msgId) {
@Language("JAVA") String code =
"package " + RESOURCE_PACKAGE_NAME + ";\n"
- + "import org.apache.ignite.network.NetworkMessage;\n"
- + "import org.apache.ignite.network.annotations.Transferable;\n"
- + "\n"
- + "\n"
- + "@Transferable(value = " + msgId + ")\n"
- + "public interface " + className + " extends NetworkMessage {\n"
- + " String foo();\n"
- + "}\n";
+ + "import org.apache.ignite.network.NetworkMessage;\n"
+ + "import org.apache.ignite.network.annotations.Transferable;\n"
+ + "\n"
+ + "\n"
+ + "@Transferable(value = " + msgId + ")\n"
+ + "public interface " + className + " extends NetworkMessage {\n"
+ + " String foo();\n"
+ + "}\n";
return JavaFileObjects.forSourceString(className, code);
}
private JavaFileObject createMessageGroup(String className, String groupName) {
@Language("JAVA") String code =
"package " + RESOURCE_PACKAGE_NAME + ";\n"
- + "\n"
- + " import org.apache.ignite.network.annotations.MessageGroup;\n"
- + "\n"
- + "@MessageGroup(groupType = 1, groupName = \"" + groupName + "\")\n"
- + "public class " + className + " {\n"
- + "}\n";
+ + "\n"
+ + " import org.apache.ignite.network.annotations.MessageGroup;\n"
+ + "\n"
+ + "@MessageGroup(groupType = 1, groupName = \"" + groupName + "\")\n"
+ + "public class " + className + " {\n"
+ + "}\n";
return JavaFileObjects.forSourceString(className, code);
}
private JavaFileObject createNonTransferable(String className) {
@Language("JAVA") String code =
- "package " + RESOURCE_PACKAGE_NAME + ";\n"
- + "import org.apache.ignite.network.NetworkMessage;\n"
- + "\n"
- + "\n"
- + "public interface " + className + " extends NetworkMessage {\n"
- + " String foo();\n"
- + "}\n";
+ "package " + RESOURCE_PACKAGE_NAME + ";\n"
+ + "import org.apache.ignite.network.NetworkMessage;\n"
+ + "\n"
+ + "\n"
+ + "public interface " + className + " extends NetworkMessage {\n"
+ + " String foo();\n"
+ + "}\n";
return JavaFileObjects.forSourceString(className, code);
}
diff --git a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/processor/ItTransferableObjectProcessorTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/TransferableObjectProcessorTest.java
similarity index 87%
rename from modules/network/src/integrationTest/java/org/apache/ignite/internal/network/processor/ItTransferableObjectProcessorTest.java
rename to modules/network/src/test/java/org/apache/ignite/internal/network/processor/TransferableObjectProcessorTest.java
index 819752052a..ec119c6ab5 100644
--- a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/processor/ItTransferableObjectProcessorTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/TransferableObjectProcessorTest.java
@@ -33,9 +33,9 @@ import org.apache.ignite.network.annotations.Transferable;
import org.junit.jupiter.api.Test;
/**
- * Integration tests for the {@link TransferableObjectProcessor}.
+ * Tests for the {@link TransferableObjectProcessor}.
*/
-public class ItTransferableObjectProcessorTest {
+public class TransferableObjectProcessorTest {
/**
* Package name of the test sources.
*/
@@ -94,7 +94,7 @@ public class ItTransferableObjectProcessorTest {
@Test
void testCompileMultipleMessage() {
Compilation compilation = compiler.compile(
- sources("AllTypesMessage", "TransitiveMessage", "ItTestMessageGroup")
+ sources("AllTypesMessage", "TransitiveMessage", "TestMessageGroup")
);
assertThat(compilation).succeededWithoutWarnings();
@@ -182,12 +182,12 @@ public class ItTransferableObjectProcessorTest {
@Test
void testMultipleMessageGroups() {
Compilation compilation = compiler.compile(
- sources("AllTypesMessage", "ConflictingTypeMessage", "ItTestMessageGroup", "SecondGroup")
+ sources("AllTypesMessage", "ConflictingTypeMessage", "TestMessageGroup", "SecondGroup")
);
assertThat(compilation).hadErrorContaining(String.format(
"Invalid number of message groups (classes annotated with @%s), "
- + "only one can be present in a compilation unit: [%s.ItTestMessageGroup, %s.SecondGroup]",
+ + "only one can be present in a compilation unit: [%s.SecondGroup, %s.TestMessageGroup]",
MessageGroup.class.getSimpleName(),
RESOURCE_PACKAGE_NAME,
RESOURCE_PACKAGE_NAME
@@ -212,7 +212,7 @@ public class ItTransferableObjectProcessorTest {
assertThrows(
AssertionError.class,
() -> assertThat(compilation)
- .generatedSourceFile(fileName("UnmarshallableTypeNonSerializableMessageSerializer"))
+ .generatedSourceFile(fileName("UnmarshallableTypeNonSerializableMessageSerializer"))
);
}
@@ -222,27 +222,38 @@ public class ItTransferableObjectProcessorTest {
@Test
void testConflictingMessageTypes() {
Compilation compilation = compiler.compile(
- sources("AllTypesMessage", "ConflictingTypeMessage", "ItTestMessageGroup")
+ sources("AllTypesMessage", "ConflictingTypeMessage", "TestMessageGroup")
);
assertThat(compilation).hadErrorContaining("message with type 1 already exists");
}
/**
- * Tests that if a message getter clashes with a getter in a superinterface, an appropriate error is displayed.
+ * Tests that compilation is successful in case a message getter clashes with a getter in a superinterface.
*/
@Test
void testInheritedMessageClash() {
Compilation compilation = compile("InheritedMessageClash");
- assertThat(compilation).hadErrorContaining("Getter with name 'x' is already defined");
+ assertThat(compilation).succeededWithoutWarnings();
+
+ assertThat(compilation).generatedSourceFile(fileName("InheritedMessageClashBuilder"));
+ assertThat(compilation).generatedSourceFile(fileName("InheritedMessageClashImpl"));
+ assertThat(compilation).generatedSourceFile(fileName("NetworkMessageProcessorTestFactory"));
+
+ assertThat(compilation).generatedSourceFile(fileName("InheritedMessageClashSerializer"));
+ assertThat(compilation).generatedSourceFile(fileName("InheritedMessageClashDeserializer"));
+ assertThat(compilation).generatedSourceFile(fileName("InheritedMessageClashSerializationFactory"));
+ assertThat(compilation).generatedSourceFile(
+ fileName("NetworkMessageProcessorTestSerializationRegistryInitializer")
+ );
}
/**
* Compiles the given network message.
*/
private Compilation compile(String messageSource) {
- return compiler.compile(sources(messageSource, "ItTestMessageGroup"));
+ return compiler.compile(sources(messageSource, "TestMessageGroup"));
}
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MarshallableTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MarshallableTest.java
index 950d6d63fe..f010ed6bad 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MarshallableTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MarshallableTest.java
@@ -44,6 +44,8 @@ import java.util.List;
import java.util.Map;
import org.apache.ignite.internal.network.direct.DirectMessageWriter;
import org.apache.ignite.internal.network.message.ClassDescriptorMessage;
+import org.apache.ignite.internal.network.messages.MessageWithMarshallable;
+import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.apache.ignite.internal.network.netty.ConnectionManager;
import org.apache.ignite.internal.network.netty.InboundDecoder;
import org.apache.ignite.internal.network.netty.OutboundEncoder;
@@ -52,10 +54,9 @@ import org.apache.ignite.internal.network.serialization.marshal.MarshalledObject
import org.apache.ignite.internal.network.serialization.marshal.UserObjectMarshaller;
import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.OutNetworkObject;
-import org.apache.ignite.network.TestMessageSerializationRegistryImpl;
-import org.apache.ignite.network.TestMessagesFactory;
import org.apache.ignite.network.serialization.MessageSerializationRegistry;
import org.apache.ignite.network.serialization.MessageSerializer;
+import org.apache.ignite.network.serialization.TestMessageSerializationRegistryImpl;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
diff --git a/modules/network/src/test/java/org/apache/ignite/network/AbstractMessagingServiceTest.java b/modules/network/src/test/java/org/apache/ignite/network/AbstractMessagingServiceTest.java
index 5b392c1e74..9ce9563c43 100644
--- a/modules/network/src/test/java/org/apache/ignite/network/AbstractMessagingServiceTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/network/AbstractMessagingServiceTest.java
@@ -28,6 +28,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.util.List;
import java.util.concurrent.atomic.AtomicReferenceArray;
+import org.apache.ignite.internal.network.messages.TestMessageTypes;
import org.apache.ignite.network.annotations.MessageGroup;
import org.junit.jupiter.api.Test;
diff --git a/modules/network/src/test/java/org/apache/ignite/network/MessageSerializationRegistryImplTest.java b/modules/network/src/test/java/org/apache/ignite/network/serialization/MessageSerializationRegistryImplTest.java
similarity index 94%
rename from modules/network/src/test/java/org/apache/ignite/network/MessageSerializationRegistryImplTest.java
rename to modules/network/src/test/java/org/apache/ignite/network/serialization/MessageSerializationRegistryImplTest.java
index 6d736bdab0..f25bebc898 100644
--- a/modules/network/src/test/java/org/apache/ignite/network/MessageSerializationRegistryImplTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/network/serialization/MessageSerializationRegistryImplTest.java
@@ -15,16 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.network;
+package org.apache.ignite.network.serialization;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
-import org.apache.ignite.network.serialization.MessageDeserializer;
-import org.apache.ignite.network.serialization.MessageSerializationFactory;
-import org.apache.ignite.network.serialization.MessageSerializationRegistry;
-import org.apache.ignite.network.serialization.MessageSerializer;
+import org.apache.ignite.network.MessageSerializationRegistryImpl;
+import org.apache.ignite.network.NetworkConfigurationException;
+import org.apache.ignite.network.NetworkMessage;
import org.junit.jupiter.api.Test;
/**
diff --git a/modules/network/src/test/java/org/apache/ignite/network/TestMessageSerializationRegistryImpl.java b/modules/network/src/test/java/org/apache/ignite/network/serialization/TestMessageSerializationRegistryImpl.java
similarity index 84%
rename from modules/network/src/test/java/org/apache/ignite/network/TestMessageSerializationRegistryImpl.java
rename to modules/network/src/test/java/org/apache/ignite/network/serialization/TestMessageSerializationRegistryImpl.java
index f1c20365bb..57764393ac 100644
--- a/modules/network/src/test/java/org/apache/ignite/network/TestMessageSerializationRegistryImpl.java
+++ b/modules/network/src/test/java/org/apache/ignite/network/serialization/TestMessageSerializationRegistryImpl.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.network;
+package org.apache.ignite.network.serialization;
-import org.apache.ignite.network.serialization.MessageSerializationRegistry;
+import org.apache.ignite.internal.network.messages.TestMessagesSerializationRegistryInitializer;
+import org.apache.ignite.network.MessageSerializationRegistryImpl;
/**
* Implementation of a {@link MessageSerializationRegistry} for tests.
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/AllTypesMessage.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/AllTypesMessage.java
similarity index 60%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/AllTypesMessage.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/AllTypesMessage.java
index 99b42a3dcb..b0a494b50d 100644
--- a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/AllTypesMessage.java
+++ b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/AllTypesMessage.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.network.processor;
+import java.io.Serializable;
import java.util.BitSet;
import java.util.Collection;
import java.util.Map;
@@ -25,53 +26,56 @@ import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.annotations.Transferable;
+/**
+ * {@link NetworkMessage} implementation.
+ */
@Transferable(1)
-public interface AllTypesMessage extends NetworkMessage {
- byte a();
+public interface AllTypesMessage extends NetworkMessage, Serializable {
+ byte byteA();
- short b();
+ short shortB();
- int c();
+ int intC();
- long d();
+ long longD();
- float e();
+ float floatE();
- double f();
+ double doubleF();
- char g();
+ char charG();
- boolean h();
+ boolean booleanH();
- byte[] i();
+ byte[] byteArrI();
- short[] j();
+ short[] shortArrJ();
- int[] k();
+ int[] intArrK();
- long[] l();
+ long[] longArrL();
- float[] m();
+ float[] floatArrM();
- double[] n();
+ double[] doubleArrN();
- char[] o();
+ char[] charArrO();
- boolean[] p();
+ boolean[] booleanArrP();
- String q();
+ String strQ();
- BitSet r();
+ BitSet bitSetR();
- UUID s();
+ UUID uuidS();
- IgniteUuid t();
+ IgniteUuid igniteUuidT();
- NetworkMessage u();
+ NetworkMessage netMsgU();
- NetworkMessage[] v();
+ NetworkMessage[] netMsgArrV();
- Collection<NetworkMessage> w();
+ Collection<NetworkMessage> netMsgCollW();
- Map<String, NetworkMessage> x();
+ Map<String, NetworkMessage> newMsgMapX();
}
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/ConflictingTypeMessage.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/ConflictingTypeMessage.java
similarity index 97%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/ConflictingTypeMessage.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/ConflictingTypeMessage.java
index 41ee78fee8..0857e2e778 100644
--- a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/ConflictingTypeMessage.java
+++ b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/ConflictingTypeMessage.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.network.processor;
+import java.util.Collection;
import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.annotations.Transferable;
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/InheritedMessageClash.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/InheritedMessageClash.java
similarity index 100%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/InheritedMessageClash.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/InheritedMessageClash.java
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/InvalidAnnotatedTypeMessage.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/InvalidAnnotatedTypeMessage.java
similarity index 100%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/InvalidAnnotatedTypeMessage.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/InvalidAnnotatedTypeMessage.java
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/InvalidParameterGetterMessage.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/InvalidParameterGetterMessage.java
similarity index 100%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/InvalidParameterGetterMessage.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/InvalidParameterGetterMessage.java
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/InvalidReturnTypeGetterMessage.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/InvalidReturnTypeGetterMessage.java
similarity index 100%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/InvalidReturnTypeGetterMessage.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/InvalidReturnTypeGetterMessage.java
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/SecondGroup.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/SecondGroup.java
similarity index 100%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/SecondGroup.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/SecondGroup.java
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/ItTestMessageGroup.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/TestMessageGroup.java
similarity index 96%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/ItTestMessageGroup.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/TestMessageGroup.java
index f217afc3d9..cd0f46da19 100644
--- a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/ItTestMessageGroup.java
+++ b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/TestMessageGroup.java
@@ -20,5 +20,5 @@ package org.apache.ignite.internal.network.processor;
import org.apache.ignite.network.annotations.MessageGroup;
@MessageGroup(groupType = 1, groupName = "NetworkMessageProcessorTest")
-public class ItTestMessageGroup {
+public class TestMessageGroup {
}
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/TransitiveMessage.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/TransitiveMessage.java
similarity index 100%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/TransitiveMessage.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/TransitiveMessage.java
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/UnmarshallableTypeMessage.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/UnmarshallableTypeMessage.java
similarity index 100%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/UnmarshallableTypeMessage.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/UnmarshallableTypeMessage.java
diff --git a/modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/UnmarshallableTypeNonSerializableMessage.java b/modules/network/src/test/resources/org/apache/ignite/internal/network/processor/UnmarshallableTypeNonSerializableMessage.java
similarity index 100%
rename from modules/network/src/integrationTest/resources/org/apache/ignite/internal/network/processor/UnmarshallableTypeNonSerializableMessage.java
rename to modules/network/src/test/resources/org/apache/ignite/internal/network/processor/UnmarshallableTypeNonSerializableMessage.java