You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ib...@apache.org on 2022/10/05 09:08:44 UTC
[ignite-3] branch main updated: IGNITE-17827 Some API classes moved from "network" to "network-api" (#1164)
This is an automated email from the ASF dual-hosted git repository.
ibessonov 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 098f16b68c IGNITE-17827 Some API classes moved from "network" to "network-api" (#1164)
098f16b68c is described below
commit 098f16b68cbe363f76d4c40c69ab7471d72aa857
Author: Ivan Bessonov <be...@gmail.com>
AuthorDate: Wed Oct 5 12:08:38 2022 +0300
IGNITE-17827 Some API classes moved from "network" to "network-api" (#1164)
---
.../network/processor/messages/MessageImplGenerator.java | 13 +++++--------
.../network/serialization/marshal/MarshalException.java | 0
.../network/serialization/marshal/MarshalledObject.java | 0
.../network/serialization/marshal/UnmarshalException.java | 0
.../network/serialization/marshal/UserObjectMarshaller.java | 3 +--
.../serialization/marshal/DefaultUserObjectMarshaller.java | 7 +++----
.../internal/network/serialization/MarshallableTest.java | 3 +--
7 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/messages/MessageImplGenerator.java b/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/messages/MessageImplGenerator.java
index 57aeca800c..e36d2d8faa 100644
--- a/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/messages/MessageImplGenerator.java
+++ b/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/messages/MessageImplGenerator.java
@@ -321,12 +321,9 @@ public class MessageImplGenerator {
.addParameter(Object.class, "descriptorsObj");
String uosPackage = "org.apache.ignite.internal.network.serialization.marshal";
- String registryPackage = "org.apache.ignite.internal.network.serialization";
ClassName marshallerClass = ClassName.get(uosPackage, "UserObjectMarshaller");
- ClassName descriptorRegistryClass = ClassName.get(registryPackage, "DescriptorRegistry");
unmarshal.addStatement("$T marshaller = ($T) marshallerObj", marshallerClass, marshallerClass);
- unmarshal.addStatement("$T descriptorRegistry = ($T) descriptorsObj", descriptorRegistryClass, descriptorRegistryClass);
for (ExecutableElement executableElement : message.getters()) {
TypeMirror type = executableElement.getReturnType();
@@ -336,7 +333,7 @@ public class MessageImplGenerator {
isNeeded = true;
String baName = getByteArrayFieldName(objectName);
- unmarshal.addStatement("$N = marshaller.unmarshal($N, descriptorRegistry)", objectName, baName);
+ unmarshal.addStatement("$N = marshaller.unmarshal($N, descriptorsObj)", objectName, baName);
unmarshal.addStatement("$N = null", baName);
} else {
Optional<MaybeMessageType> objectType = resolveType(type);
@@ -348,19 +345,19 @@ public class MessageImplGenerator {
switch (objectType.get()) {
case OBJECT_ARRAY:
isNeeded = generateObjectArrayHandler((ArrayType) type, unmarshal, objectName,
- "unmarshal(marshaller, descriptorRegistry)") || isNeeded;
+ "unmarshal(marshaller, descriptorsObj)") || isNeeded;
break;
case COLLECTION:
isNeeded = generateCollectionHandler((DeclaredType) type, unmarshal, objectName,
- "unmarshal(marshaller, descriptorRegistry)") || isNeeded;
+ "unmarshal(marshaller, descriptorsObj)") || isNeeded;
break;
case MESSAGE:
isNeeded = generateMessageHandler(unmarshal, objectName,
- "unmarshal(marshaller, descriptorRegistry)") || isNeeded;
+ "unmarshal(marshaller, descriptorsObj)") || isNeeded;
break;
case MAP:
isNeeded = generateMapHandler(unmarshal, (DeclaredType) type, objectName,
- "unmarshal(marshaller, descriptorRegistry)") || isNeeded;
+ "unmarshal(marshaller, descriptorsObj)") || isNeeded;
break;
default:
break;
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/MarshalException.java b/modules/network-api/src/main/java/org/apache/ignite/internal/network/serialization/marshal/MarshalException.java
similarity index 100%
rename from modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/MarshalException.java
rename to modules/network-api/src/main/java/org/apache/ignite/internal/network/serialization/marshal/MarshalException.java
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/MarshalledObject.java b/modules/network-api/src/main/java/org/apache/ignite/internal/network/serialization/marshal/MarshalledObject.java
similarity index 100%
rename from modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/MarshalledObject.java
rename to modules/network-api/src/main/java/org/apache/ignite/internal/network/serialization/marshal/MarshalledObject.java
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/UnmarshalException.java b/modules/network-api/src/main/java/org/apache/ignite/internal/network/serialization/marshal/UnmarshalException.java
similarity index 100%
rename from modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/UnmarshalException.java
rename to modules/network-api/src/main/java/org/apache/ignite/internal/network/serialization/marshal/UnmarshalException.java
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/UserObjectMarshaller.java b/modules/network-api/src/main/java/org/apache/ignite/internal/network/serialization/marshal/UserObjectMarshaller.java
similarity index 91%
rename from modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/UserObjectMarshaller.java
rename to modules/network-api/src/main/java/org/apache/ignite/internal/network/serialization/marshal/UserObjectMarshaller.java
index adfd062c40..83b044de9d 100644
--- a/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/UserObjectMarshaller.java
+++ b/modules/network-api/src/main/java/org/apache/ignite/internal/network/serialization/marshal/UserObjectMarshaller.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.network.serialization.marshal;
-import org.apache.ignite.internal.network.serialization.DescriptorRegistry;
import org.jetbrains.annotations.Nullable;
/**
@@ -46,5 +45,5 @@ public interface UserObjectMarshaller {
* @throws UnmarshalException if unmarshalling fails
*/
@Nullable
- <T> T unmarshal(byte[] bytes, DescriptorRegistry mergedDescriptors) throws UnmarshalException;
+ <T> T unmarshal(byte[] bytes, Object mergedDescriptors) throws UnmarshalException;
}
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshaller.java b/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshaller.java
index e6fcc020d8..606908ae37 100644
--- a/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshaller.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshaller.java
@@ -271,11 +271,11 @@ public class DefaultUserObjectMarshaller implements UserObjectMarshaller, Schema
/** {@inheritDoc} */
@Override
@Nullable
- public <T> T unmarshal(byte[] bytes, DescriptorRegistry mergedDescriptors) throws UnmarshalException {
+ public <T> T unmarshal(byte[] bytes, Object mergedDescriptors) throws UnmarshalException {
var input = new IgniteUnsafeDataInput(bytes);
try {
- UnmarshallingContext context = new UnmarshallingContext(input, mergedDescriptors, classLoader);
+ UnmarshallingContext context = new UnmarshallingContext(input, (DescriptorRegistry) mergedDescriptors, classLoader);
T result = unmarshalShared(input, context);
throwIfNotDrained(input);
@@ -318,8 +318,7 @@ public class DefaultUserObjectMarshaller implements UserObjectMarshaller, Schema
Object readObject = readObject(input, context, remoteDescriptor, unshared);
- @SuppressWarnings("unchecked") T resolvedObject = (T) readResolver.applyReadResolveIfNeeded(readObject, remoteDescriptor);
- return resolvedObject;
+ return (T) readResolver.applyReadResolveIfNeeded(readObject, remoteDescriptor);
}
private ClassDescriptor resolveDescriptor(IgniteDataInput input, @Nullable DeclaredType declaredType, UnmarshallingContext context)
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 f010ed6bad..baca7682ab 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
@@ -236,9 +236,8 @@ public class MarshallableTest {
}
}
- @SuppressWarnings("unchecked")
@Override
- public <T> @Nullable T unmarshal(byte[] bytes, DescriptorRegistry mergedDescriptors) {
+ public <T> @Nullable T unmarshal(byte[] bytes, Object mergedDescriptors) {
try (var bais = new ByteArrayInputStream(bytes); var ois = new ObjectInputStream(bais)) {
return (T) ois.readObject();
} catch (Exception e) {