This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 9bfb0553471 IGNITE-28970 Remove OptimizedMarshallerIdMapper (#13458)
9bfb0553471 is described below
commit 9bfb0553471a9e9c437bae623266157cd1c9612b
Author: Nikolay <[email protected]>
AuthorDate: Mon Aug 10 23:04:25 2026 +0300
IGNITE-28970 Remove OptimizedMarshallerIdMapper (#13458)
---
.../ignite/internal/binary/BinaryContext.java | 2 +-
.../optimized/OptimizedMarshallerIdMapper.java | 33 -------------
.../org/apache/ignite/marshaller/Marshallers.java | 15 +++---
.../ignite/marshaller/MarshallersFactory.java | 11 ++---
.../optimized/OptimizedClassDescriptor.java | 26 ++++------
.../optimized/OptimizedMarshallerImpl.java | 32 ++++---------
.../optimized/OptimizedMarshallerUtils.java | 56 +++++++---------------
.../optimized/OptimizedObjectInputStream.java | 17 ++-----
.../optimized/OptimizedObjectOutputStream.java | 18 ++-----
.../ignite/marshaller/MarshallersFactoryImpl.java | 8 ++--
.../optimized/GridClientOptimizedMarshaller.java | 4 +-
.../optimized/OptimizedMarshallerEnumSelfTest.java | 2 +-
.../optimized/OptimizedMarshallerSelfTest.java | 2 +-
...edMarshallerSerialPersistentFieldsSelfTest.java | 2 +-
.../optimized/OptimizedMarshallerTest.java | 2 +-
.../optimized/OptimizedObjectStreamSelfTest.java | 14 +++---
...rMetricsSnapshotSerializeCompatibilityTest.java | 2 +-
17 files changed, 75 insertions(+), 171 deletions(-)
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index a4a7de22b8b..6a9a941278f 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -148,7 +148,7 @@ public class BinaryContext {
private final IgniteLogger log;
/** */
- private final OptimizedMarshaller optmMarsh = Marshallers.optimized(false);
+ private final OptimizedMarshaller optmMarsh =
Marshallers.optimizedForAllClasses();
/** Compact footer flag. */
private final boolean compactFooter;
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerIdMapper.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerIdMapper.java
deleted file mode 100644
index b8cded5c686..00000000000
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerIdMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.marshaller.optimized;
-
-/**
- * ID mapper.
- */
-public interface OptimizedMarshallerIdMapper {
- /**
- * Gets type ID for provided class name.
- * <p>
- * If {@code 0} is returned, hash code of class name will be used.
- *
- * @param clsName Class name.
- * @return Type ID.
- */
- public int typeId(String clsName);
-}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/marshaller/Marshallers.java
b/modules/binary/api/src/main/java/org/apache/ignite/marshaller/Marshallers.java
index 211ac1fa508..cf0096b7d3f 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/marshaller/Marshallers.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/marshaller/Marshallers.java
@@ -60,20 +60,19 @@ public class Marshallers {
return factory.jdk();
}
- /** @return Optimized marshaller instance. */
- public static OptimizedMarshaller optimized() {
- return factory.optimized();
+ /** @return Optimized marshaller instance for classes implementing {@link
Serializable}, only. */
+ public static OptimizedMarshaller optimizedForSerializable() {
+ return factory.optimizedForSerializable();
}
/**
- * Creates new marshaller providing whether it should
- * require {@link Serializable} interface or not.
+ * Creates new marshaller with support of all classes.
+ * No {@code implements Serializable} required.
*
- * @param requireSer Whether to require {@link Serializable}.
* @return Optimized marshaller instance.
*/
- public static OptimizedMarshaller optimized(boolean requireSer) {
- return factory.optimized(requireSer);
+ public static OptimizedMarshaller optimizedForAllClasses() {
+ return factory.optimizedForAllClasses();
}
/**
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/marshaller/MarshallersFactory.java
b/modules/binary/api/src/main/java/org/apache/ignite/marshaller/MarshallersFactory.java
index 0a8564893ef..47f4438130e 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/marshaller/MarshallersFactory.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/marshaller/MarshallersFactory.java
@@ -34,15 +34,14 @@ public interface MarshallersFactory {
/** @return Default instance of {@link JdkMarshaller}. */
public JdkMarshaller jdk();
- /** @return Optimized marshaller instance. */
- public OptimizedMarshaller optimized();
+ /** @return Optimized marshaller instance for clasees implementing {@link
Serializable}, only. */
+ public OptimizedMarshaller optimizedForSerializable();
/**
- * Creates new marshaller providing whether it should
- * require {@link Serializable} interface or not.
+ * Creates new marshaller with support of all classes.
+ * No implements {@link Serializable} required.
*
- * @param requireSer Whether to require {@link Serializable}.
* @return Optimized marshaller instance.
*/
- public OptimizedMarshaller optimized(boolean requireSer);
+ public OptimizedMarshaller optimizedForAllClasses();
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
index 4dee1dff695..cf4cc501c90 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
@@ -102,10 +102,7 @@ class OptimizedClassDescriptor {
private final MarshallerContext ctx;
/** */
- private ConcurrentMap<Class, OptimizedClassDescriptor> clsMap;
-
- /** ID mapper. */
- private final OptimizedMarshallerIdMapper mapper;
+ private final ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap;
/** Class name. */
private final String name;
@@ -129,7 +126,7 @@ class OptimizedClassDescriptor {
private boolean isSerial;
/** Excluded flag. */
- private boolean excluded;
+ private final boolean excluded;
/** {@code True} if descriptor is for {@link Class}. */
private boolean isCls;
@@ -174,22 +171,19 @@ class OptimizedClassDescriptor {
* @param clsMap Class descriptors by class map.
* @param cls Class.
* @param ctx Context.
- * @param mapper ID mapper.
* @throws IOException In case of error.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
OptimizedClassDescriptor(Class<?> cls,
int typeId,
- ConcurrentMap<Class, OptimizedClassDescriptor> clsMap,
- MarshallerContext ctx,
- OptimizedMarshallerIdMapper mapper)
+ ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap,
+ MarshallerContext ctx)
throws IOException {
this(
cls,
typeId,
clsMap,
ctx,
- mapper,
MarshallerExclusions.isExcluded(cls)
);
}
@@ -201,22 +195,19 @@ class OptimizedClassDescriptor {
* @param clsMap Class descriptors by class map.
* @param cls Class.
* @param ctx Context.
- * @param mapper ID mapper.
* @throws IOException In case of error.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
OptimizedClassDescriptor(Class<?> cls,
int typeId,
- ConcurrentMap<Class, OptimizedClassDescriptor> clsMap,
+ ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap,
MarshallerContext ctx,
- OptimizedMarshallerIdMapper mapper,
boolean excluded)
throws IOException {
this.cls = cls;
this.typeId = typeId;
this.clsMap = clsMap;
this.ctx = ctx;
- this.mapper = mapper;
name = cls.getName();
@@ -725,8 +716,7 @@ class OptimizedClassDescriptor {
OptimizedClassDescriptor compDesc =
OptimizedMarshallerUtils.classDescriptor(clsMap,
obj.getClass().getComponentType(),
Marshallers.USE_CACHE.get(),
- ctx,
- mapper);
+ ctx);
compDesc.writeTypeData(out);
@@ -786,7 +776,7 @@ class OptimizedClassDescriptor {
case CLS:
OptimizedClassDescriptor clsDesc =
OptimizedMarshallerUtils.classDescriptor(
- clsMap, (Class<?>)obj, Marshallers.USE_CACHE.get(), ctx,
mapper);
+ clsMap, (Class<?>)obj, Marshallers.USE_CACHE.get(), ctx);
clsDesc.writeTypeData(out);
@@ -797,7 +787,7 @@ class OptimizedClassDescriptor {
for (Class<?> intf : proxyIntfs) {
OptimizedClassDescriptor intfDesc =
OptimizedMarshallerUtils.classDescriptor(
- clsMap, intf, Marshallers.USE_CACHE.get(), ctx,
mapper);
+ clsMap, intf, Marshallers.USE_CACHE.get(), ctx);
intfDesc.writeTypeData(out);
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerImpl.java
index af6f058d540..6a5c4e0d1cc 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerImpl.java
@@ -89,7 +89,7 @@ public class OptimizedMarshallerImpl extends
AbstractNodeNameAwareMarshaller imp
private final boolean requireSer;
/** Class descriptors by class. */
- private final ConcurrentMap<Class, OptimizedClassDescriptor> clsMap = new
ConcurrentHashMap<>();
+ private final ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap =
new ConcurrentHashMap<>();
/** */
private final OptimizedObjectSharedStreamRegistry registry = new
OptimizedObjectSharedStreamRegistry();
@@ -97,19 +97,6 @@ public class OptimizedMarshallerImpl extends
AbstractNodeNameAwareMarshaller imp
/** Non cached registry. */
private final OptimizedObjectSharedStreamRegistry nonCachedRegistry = new
OptimizedObjectSharedStreamRegistry();
- /**
- * Creates new marshaller will all defaults.
- *
- * @throws IgniteException If this marshaller is not supported on the
current JVM.
- */
- public OptimizedMarshallerImpl() {
- this.requireSer = true;
-
- if (!available())
- throw new IgniteException("Using OptimizedMarshaller on
unsupported JVM version (some of " +
- "JVM-private APIs required for the marshaller to work are
missing).");
- }
-
/**
* Creates new marshaller providing whether it should
* require {@link Serializable} interface or not.
@@ -118,6 +105,10 @@ public class OptimizedMarshallerImpl extends
AbstractNodeNameAwareMarshaller imp
*/
public OptimizedMarshallerImpl(boolean requireSer) {
this.requireSer = requireSer;
+
+ if (!available())
+ throw new IgniteException("Using OptimizedMarshaller on
unsupported JVM version (some of " +
+ "JVM-private APIs required for the marshaller to work are
missing).");
}
/** {@inheritDoc} */
@@ -129,7 +120,7 @@ public class OptimizedMarshallerImpl extends
AbstractNodeNameAwareMarshaller imp
try {
objOut = registry.out();
- objOut.context(clsMap, ctx, null, requireSer);
+ objOut.context(clsMap, ctx, requireSer);
objOut.out().outputStream(out);
@@ -150,7 +141,7 @@ public class OptimizedMarshallerImpl extends
AbstractNodeNameAwareMarshaller imp
try {
objOut = registry.out();
- objOut.context(clsMap, ctx, null, requireSer);
+ objOut.context(clsMap, ctx, requireSer);
objOut.writeObject(obj);
@@ -175,7 +166,7 @@ public class OptimizedMarshallerImpl extends
AbstractNodeNameAwareMarshaller imp
try {
objIn = !useCache ? nonCachedRegistry.in() : registry.in();
- objIn.context(clsMap, ctx, null, clsLdr != null ? clsLdr :
dfltClsLdr);
+ objIn.context(clsMap, ctx, clsLdr != null ? clsLdr : dfltClsLdr);
objIn.in().inputStream(in);
@@ -208,7 +199,7 @@ public class OptimizedMarshallerImpl extends
AbstractNodeNameAwareMarshaller imp
try {
objIn = registry.in();
- objIn.context(clsMap, ctx, null, clsLdr != null ? clsLdr :
dfltClsLdr);
+ objIn.context(clsMap, ctx, clsLdr != null ? clsLdr : dfltClsLdr);
objIn.in().bytes(arr, arr.length);
@@ -248,10 +239,7 @@ public class OptimizedMarshallerImpl extends
AbstractNodeNameAwareMarshaller imp
return true;
}
- catch (Exception ignored) {
- return false;
- }
- catch (NoClassDefFoundError ignored) {
+ catch (Exception | NoClassDefFoundError ignored) {
return false;
}
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java
index c514d7293f4..649ba814690 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java
@@ -186,25 +186,22 @@ class OptimizedMarshallerUtils {
* @param cls Class.
* @param useCache True if class loader cache will be used, false
otherwise.
* @param ctx Context.
- * @param mapper ID mapper.
* @return Descriptor.
* @throws IOException In case of error.
*/
static OptimizedClassDescriptor classDescriptor(
- ConcurrentMap<Class, OptimizedClassDescriptor> clsMap,
+ ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap,
Class cls,
boolean useCache,
- MarshallerContext ctx,
- OptimizedMarshallerIdMapper mapper
+ MarshallerContext ctx
) throws IOException {
OptimizedClassDescriptor desc = clsMap.get(cls);
if (desc == null && !useCache) {
- desc = new OptimizedClassDescriptor(cls,
resolveTypeId(cls.getName(),
- mapper), clsMap, ctx, mapper, false);
+ desc = new OptimizedClassDescriptor(cls,
resolveTypeId(cls.getName()), clsMap, ctx, false);
}
else if (desc == null) {
- int typeId = resolveTypeId(cls.getName(), mapper);
+ int typeId = resolveTypeId(cls.getName());
boolean registered;
@@ -215,7 +212,7 @@ class OptimizedMarshallerUtils {
throw new IOException("Failed to register class: " +
cls.getName(), e);
}
- desc = new OptimizedClassDescriptor(cls, registered ? typeId : 0,
clsMap, ctx, mapper);
+ desc = new OptimizedClassDescriptor(cls, registered ? typeId : 0,
clsMap, ctx);
if (registered) {
OptimizedClassDescriptor old = clsMap.putIfAbsent(cls, desc);
@@ -230,22 +227,10 @@ class OptimizedMarshallerUtils {
/**
* @param clsName Class name.
- * @param mapper Mapper.
* @return Type ID.
*/
- private static int resolveTypeId(String clsName,
OptimizedMarshallerIdMapper mapper) {
- int typeId;
-
- if (mapper != null) {
- typeId = mapper.typeId(clsName);
-
- if (typeId == 0)
- typeId = clsName.hashCode();
- }
- else
- typeId = clsName.hashCode();
-
- return typeId;
+ private static int resolveTypeId(String clsName) {
+ return clsName.hashCode();
}
/**
@@ -256,24 +241,22 @@ class OptimizedMarshallerUtils {
* @param ldr Class loader.
* @param useCache True if class loader cache will be used, false
otherwise.
* @param ctx Context.
- * @param mapper ID mapper.
* @return Descriptor.
* @throws IOException In case of error.
* @throws ClassNotFoundException If class was not found.
*/
static OptimizedClassDescriptor classDescriptor(
- ConcurrentMap<Class, OptimizedClassDescriptor> clsMap,
+ ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap,
int typeId,
ClassLoader ldr,
boolean useCache,
- MarshallerContext ctx,
- OptimizedMarshallerIdMapper mapper) throws IOException,
ClassNotFoundException {
+ MarshallerContext ctx) throws IOException, ClassNotFoundException {
OptimizedClassDescriptor desc;
if (useCache)
- desc = descriptorFromCache(clsMap, typeId, ldr, ctx, mapper);
+ desc = descriptorFromCache(clsMap, typeId, ldr, ctx);
else
- desc = descriptorWithoutCache(clsMap, typeId, ldr, ctx, mapper);
+ desc = descriptorWithoutCache(clsMap, typeId, ldr, ctx);
return desc;
}
@@ -283,12 +266,10 @@ class OptimizedMarshallerUtils {
* @param typeId Type id.
* @param ldr Loader.
* @param ctx Context.
- * @param mapper Mapper.
*/
@NotNull
- private static OptimizedClassDescriptor
descriptorWithoutCache(ConcurrentMap<Class, OptimizedClassDescriptor> clsMap,
- int typeId, ClassLoader ldr, MarshallerContext ctx,
- OptimizedMarshallerIdMapper mapper) throws ClassNotFoundException,
IOException {
+ private static OptimizedClassDescriptor
descriptorWithoutCache(ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap,
+ int typeId, ClassLoader ldr, MarshallerContext ctx) throws
ClassNotFoundException, IOException {
String clsName;
try {
@@ -306,8 +287,7 @@ class OptimizedMarshallerUtils {
OptimizedClassDescriptor desc = clsMap.get(cls);
if (desc == null)
- desc = new OptimizedClassDescriptor(cls,
resolveTypeId(cls.getName(),
- mapper), clsMap, ctx, mapper, false);
+ desc = new OptimizedClassDescriptor(cls,
resolveTypeId(cls.getName()), clsMap, ctx, false);
return desc;
}
@@ -317,12 +297,10 @@ class OptimizedMarshallerUtils {
* @param typeId Type id.
* @param ldr Loader.
* @param ctx Context.
- * @param mapper Mapper.
*/
@NotNull
- private static OptimizedClassDescriptor
descriptorFromCache(ConcurrentMap<Class, OptimizedClassDescriptor> clsMap,
- int typeId, ClassLoader ldr, MarshallerContext ctx,
- OptimizedMarshallerIdMapper mapper) throws ClassNotFoundException,
IOException {
+ private static OptimizedClassDescriptor
descriptorFromCache(ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap,
+ int typeId, ClassLoader ldr, MarshallerContext ctx) throws
ClassNotFoundException, IOException {
Class cls;
try {
@@ -336,7 +314,7 @@ class OptimizedMarshallerUtils {
if (desc == null) {
OptimizedClassDescriptor old = clsMap.putIfAbsent(cls,
- desc = new OptimizedClassDescriptor(cls,
resolveTypeId(cls.getName(), mapper), clsMap, ctx, mapper));
+ desc = new OptimizedClassDescriptor(cls,
resolveTypeId(cls.getName()), clsMap, ctx));
if (old != null)
desc = old;
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
index efa48690525..e1a41bda6ba 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
@@ -110,9 +110,6 @@ class OptimizedObjectInputStream extends ObjectInputStream {
/** */
private MarshallerContext ctx;
- /** */
- private OptimizedMarshallerIdMapper mapper;
-
/** */
private ClassLoader clsLdr;
@@ -129,7 +126,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
private Class<?> curCls;
/** */
- private ConcurrentMap<Class, OptimizedClassDescriptor> clsMap;
+ private ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap;
/** The flag shown, the reader uses class loader cache used or not. */
private boolean useCache;
@@ -146,18 +143,15 @@ class OptimizedObjectInputStream extends
ObjectInputStream {
/**
* @param clsMap Class descriptors by class map.
* @param ctx Context.
- * @param mapper ID mapper.
* @param clsLdr Class loader.
*/
void context(
- ConcurrentMap<Class, OptimizedClassDescriptor> clsMap,
+ ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap,
MarshallerContext ctx,
- OptimizedMarshallerIdMapper mapper,
ClassLoader clsLdr
) {
this.clsMap = clsMap;
this.ctx = ctx;
- this.mapper = mapper;
this.clsLdr = clsLdr;
this.useCache = Marshallers.USE_CACHE.get();
}
@@ -348,9 +342,8 @@ class OptimizedObjectInputStream extends ObjectInputStream {
clsMap,
ClassLoaderUtils.forName(readUTF(), clsLdr, useCache),
useCache,
- ctx,
- mapper)
- : classDescriptor(clsMap, typeId, clsLdr, useCache, ctx,
mapper);
+ ctx)
+ : classDescriptor(clsMap, typeId, clsLdr, useCache, ctx);
curCls = desc.describedClass();
@@ -386,7 +379,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
int compTypeId = readInt();
return compTypeId == 0 ? ClassLoaderUtils.forName(readUTF(), clsLdr,
useCache) :
- classDescriptor(clsMap, compTypeId, clsLdr, useCache, ctx,
mapper).describedClass();
+ classDescriptor(clsMap, compTypeId, clsLdr, useCache,
ctx).describedClass();
}
/**
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java
index 86e29e16298..c9232554d7d 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java
@@ -74,9 +74,6 @@ public class OptimizedObjectOutputStream extends
ObjectOutputStream {
/** */
private MarshallerContext ctx;
- /** */
- private OptimizedMarshallerIdMapper mapper;
-
/** */
private boolean requireSer;
@@ -90,7 +87,7 @@ public class OptimizedObjectOutputStream extends
ObjectOutputStream {
private PutFieldImpl curPut;
/** */
- private ConcurrentMap<Class, OptimizedClassDescriptor> clsMap;
+ private ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap;
/**
* @param out Output.
@@ -103,16 +100,11 @@ public class OptimizedObjectOutputStream extends
ObjectOutputStream {
/**
* @param clsMap Class descriptors by class map.
* @param ctx Context.
- * @param mapper ID mapper.
* @param requireSer Require {@link Serializable} flag.
*/
- void context(ConcurrentMap<Class, OptimizedClassDescriptor> clsMap,
- MarshallerContext ctx,
- OptimizedMarshallerIdMapper mapper,
- boolean requireSer) {
+ void context(ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap,
MarshallerContext ctx, boolean requireSer) {
this.clsMap = clsMap;
this.ctx = ctx;
- this.mapper = mapper;
this.requireSer = requireSer;
}
@@ -203,8 +195,7 @@ public class OptimizedObjectOutputStream extends
ObjectOutputStream {
clsMap,
obj instanceof Object[] ? Object[].class : obj.getClass(),
Marshallers.USE_CACHE.get(),
- ctx,
- mapper);
+ ctx);
if (desc.excluded()) {
writeByte(NULL);
@@ -231,8 +222,7 @@ public class OptimizedObjectOutputStream extends
ObjectOutputStream {
desc = classDescriptor(clsMap,
obj instanceof Object[] ? Object[].class :
obj.getClass(),
Marshallers.USE_CACHE.get(),
- ctx,
- mapper);
+ ctx);
}
try {
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/marshaller/MarshallersFactoryImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/marshaller/MarshallersFactoryImpl.java
index f44d85134ec..2e2aaaa7727 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/marshaller/MarshallersFactoryImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/marshaller/MarshallersFactoryImpl.java
@@ -32,12 +32,12 @@ public class MarshallersFactoryImpl implements
MarshallersFactory {
}
/** {@inheritDoc} */
- @Override public OptimizedMarshaller optimized() {
- return new OptimizedMarshallerImpl();
+ @Override public OptimizedMarshaller optimizedForSerializable() {
+ return new OptimizedMarshallerImpl(true);
}
/** {@inheritDoc} */
- @Override public OptimizedMarshaller optimized(boolean requireSer) {
- return new OptimizedMarshallerImpl(requireSer);
+ @Override public OptimizedMarshaller optimizedForAllClasses() {
+ return new OptimizedMarshallerImpl(false);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
index 6ec84c1f552..b097c989319 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
@@ -45,7 +45,7 @@ public class GridClientOptimizedMarshaller implements
GridClientMarshaller {
* Default constructor.
*/
public GridClientOptimizedMarshaller() {
- opMarsh = Marshallers.optimized();
+ opMarsh = Marshallers.optimizedForSerializable();
opMarsh.setContext(new MarshallerContextImpl(null));
}
@@ -56,7 +56,7 @@ public class GridClientOptimizedMarshaller implements
GridClientMarshaller {
* @param plugins Plugins.
*/
public GridClientOptimizedMarshaller(@Nullable List<PluginProvider>
plugins) {
- opMarsh = Marshallers.optimized();
+ opMarsh = Marshallers.optimizedForSerializable();
opMarsh.setContext(new MarshallerContextImpl(plugins));
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
index dc15eedb27c..64c14addf7a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
@@ -32,7 +32,7 @@ public class OptimizedMarshallerEnumSelfTest extends
GridCommonAbstractTest {
*/
@Test
public void testEnumSerialisation() throws Exception {
- Marshaller marsh = initTestMarshallerContext(Marshallers.optimized());
+ Marshaller marsh =
initTestMarshallerContext(Marshallers.optimizedForSerializable());
byte[] bytes = marsh.marshal(TestEnum.Bond);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSelfTest.java
index 0e95b8c5bda..c5855144fbe 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSelfTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
public class OptimizedMarshallerSelfTest extends GridMarshallerAbstractTest {
/** {@inheritDoc} */
@Override protected Marshaller marshaller() throws IgniteCheckedException {
- return initTestMarshallerContext(Marshallers.optimized(false));
+ return initTestMarshallerContext(Marshallers.optimizedForAllClasses());
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
index 3522c95aa1c..23589887cbd 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
public class OptimizedMarshallerSerialPersistentFieldsSelfTest extends
GridMarshallerAbstractTest {
/** {@inheritDoc} */
@Override protected Marshaller marshaller() throws IgniteCheckedException {
- return initTestMarshallerContext(Marshallers.optimized(false));
+ return initTestMarshallerContext(Marshallers.optimizedForAllClasses());
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
index 290faf2f33f..ca3d18bc1ca 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
@@ -62,7 +62,7 @@ public class OptimizedMarshallerTest extends
GridCommonAbstractTest {
private OptimizedMarshaller marshaller(boolean requireSer) {
ClassLoaderUtils.clearClassCache();
- OptimizedMarshaller marsh = Marshallers.optimized(requireSer);
+ OptimizedMarshaller marsh = requireSer ?
Marshallers.optimizedForSerializable() : Marshallers.optimizedForAllClasses();
marsh.setContext(new MarshallerContextTestImpl());
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
index fab7a38ac75..4f9d3e87df7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
@@ -82,7 +82,7 @@ public class OptimizedObjectStreamSelfTest extends
GridCommonAbstractTest {
private static final MarshallerContext CTX = new
MarshallerContextTestImpl();
/** */
- private ConcurrentMap<Class, OptimizedClassDescriptor> clsMap = new
ConcurrentHashMap<>();
+ private ConcurrentMap<Class<?>, OptimizedClassDescriptor> clsMap = new
ConcurrentHashMap<>();
/**
* @throws Exception If failed.
@@ -276,7 +276,7 @@ public class OptimizedObjectStreamSelfTest extends
GridCommonAbstractTest {
@Test
public void testRequireSerializable() throws Exception {
try {
- OptimizedMarshaller marsh = Marshallers.optimized(true);
+ OptimizedMarshaller marsh = Marshallers.optimizedForSerializable();
marsh.setContext(CTX);
@@ -299,7 +299,7 @@ public class OptimizedObjectStreamSelfTest extends
GridCommonAbstractTest {
*/
@Test
public void testFailedUnmarshallingLogging() throws Exception {
- OptimizedMarshaller marsh = Marshallers.optimized(true);
+ OptimizedMarshaller marsh = Marshallers.optimizedForSerializable();
marsh.setContext(CTX);
@@ -321,7 +321,7 @@ public class OptimizedObjectStreamSelfTest extends
GridCommonAbstractTest {
*/
@Test
public void testFailedMarshallingLogging() throws Exception {
- OptimizedMarshaller marsh = Marshallers.optimized(true);
+ OptimizedMarshaller marsh = Marshallers.optimizedForSerializable();
marsh.setContext(CTX);
@@ -351,7 +351,7 @@ public class OptimizedObjectStreamSelfTest extends
GridCommonAbstractTest {
Arrays.fill(obj.longArr, 100L);
Arrays.fill(obj.doubleArr, 100.0d);
- final OptimizedMarshaller marsh = Marshallers.optimized();
+ final OptimizedMarshaller marsh =
Marshallers.optimizedForSerializable();
marsh.setContext(CTX);
multithreaded(new Callable<Object>() {
@@ -1178,7 +1178,7 @@ public class OptimizedObjectStreamSelfTest extends
GridCommonAbstractTest {
try {
out = reg.out();
- out.context(clsMap, CTX, null, true);
+ out.context(clsMap, CTX, true);
out.writeObject(obj);
@@ -1186,7 +1186,7 @@ public class OptimizedObjectStreamSelfTest extends
GridCommonAbstractTest {
in = reg.in();
- in.context(clsMap, CTX, null, getClass().getClassLoader());
+ in.context(clsMap, CTX, getClass().getClassLoader());
in.in().bytes(arr, arr.length);
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeCompatibilityTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeCompatibilityTest.java
index 4c428f8d05e..1ab1885c02c 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeCompatibilityTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeCompatibilityTest.java
@@ -84,7 +84,7 @@ public class ClusterMetricsSnapshotSerializeCompatibilityTest
extends GridCommon
private OptimizedMarshaller marshaller() {
ClassLoaderUtils.clearClassCache();
- OptimizedMarshaller marsh = Marshallers.optimized();
+ OptimizedMarshaller marsh = Marshallers.optimizedForSerializable();
marsh.setContext(new MarshallerContextTestImpl());
