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 ed0eeab871d IGNITE-27550 Move BinaryEnumObjectImpl to binary-impl
(#12629)
ed0eeab871d is described below
commit ed0eeab871d64b23cafadc80f27a95fb353b63d5
Author: Nikolay <[email protected]>
AuthorDate: Wed Jan 14 12:11:18 2026 +0300
IGNITE-27550 Move BinaryEnumObjectImpl to binary-impl (#12629)
---
.../ignite/internal/binary/BinariesFactory.java | 35 +++++++++++++
.../internal/binary/BinaryClassDescriptor.java | 2 +-
.../ignite/internal/binary/BinaryContext.java | 7 +--
.../ignite/internal/binary/BinaryTypeImpl.java | 2 +-
.../apache/ignite/internal/binary/BinaryUtils.java | 57 ++--------------------
.../internal/binary/BinariesFactoryImpl.java | 51 +++++++++++++++++++
.../internal/binary/BinaryEnumObjectImpl.java | 2 +-
.../binary/builder/BinaryBuilderSerializer.java | 3 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 3 +-
.../calcite/exec/tracker/ObjectSizeCalculator.java | 2 +-
.../ignite/internal/client/thin/ClientBinary.java | 4 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 6 +--
12 files changed, 108 insertions(+), 66 deletions(-)
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinariesFactory.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinariesFactory.java
index 102154b3604..7afe2574ea3 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinariesFactory.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinariesFactory.java
@@ -18,6 +18,8 @@
package org.apache.ignite.internal.binary;
import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.function.ToIntFunction;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
import org.jetbrains.annotations.Nullable;
@@ -99,4 +101,37 @@ public interface BinariesFactory {
* @return Accessor.
*/
public BinaryFieldDescriptor create(Field field, int id);
+
+ /**
+ * Creates binary enum.
+ *
+ * @param typeId Type ID.
+ * @param clsName Class name.
+ * @param ord Ordinal.
+ * @param ctx Context.
+ */
+ public BinaryObjectEx binaryEnum(BinaryContext ctx, int typeId, @Nullable
String clsName, int ord);
+
+ /**
+ * Creates binary enum.
+ *
+ * @param ctx Context.
+ * @param arr Array.
+ */
+ public BinaryObjectEx binaryEnum(BinaryContext ctx, byte[] arr);
+
+ /**
+ * @return Binary enum class.
+ */
+ public Class<?> binaryEnumClass();
+
+ /**
+ * @return Map of predefined types.
+ */
+ public Map<Class<?>, Integer> predefinedTypes();
+
+ /**
+ * @return Map of function returning size of the object.
+ */
+ public Map<Class<?>, ToIntFunction<Object>> sizeProviders();
}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index b3ee81ffd78..4ba39fc0174 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -223,7 +223,7 @@ class BinaryClassDescriptor {
else if (useOptMarshaller)
mode = BinaryWriteMode.OPTIMIZED; // Will not be used anywhere.
else {
- if (cls == BinaryEnumObjectImpl.class)
+ if (cls == BinaryUtils.binariesFactory.binaryEnumClass())
mode = BinaryWriteMode.BINARY_ENUM;
else
mode = serializer != null ? BinaryWriteMode.BINARY :
BinaryUtils.mode(cls);
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 004593af1b3..de5b20fbec9 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
@@ -210,7 +210,7 @@ public class BinaryContext {
mapTypes.put(HashMap.class, GridBinaryMarshaller.HASH_MAP);
mapTypes.put(LinkedHashMap.class,
GridBinaryMarshaller.LINKED_HASH_MAP);
- // IDs range from [0..200] is used by Java SDK API and GridGain legacy
API
+ // IDs range from [0..200] is used by Java SDK API
registerPredefinedType(Object.class, GridBinaryMarshaller.OBJECT);
registerPredefinedType(Byte.class, GridBinaryMarshaller.BYTE);
@@ -260,11 +260,12 @@ public class BinaryContext {
registerPredefinedType(BinaryObjectImpl.class, 0);
registerPredefinedType(BinaryObjectOffheapImpl.class, 0);
registerPredefinedType(BinaryMetadata.class, 0);
- registerPredefinedType(BinaryEnumObjectImpl.class, 0);
registerPredefinedType(BinaryTreeMap.class, 0);
registerPredefinedType(BinaryArray.class, 0);
registerPredefinedType(BinaryEnumArray.class, 0);
+
BinaryUtils.binariesFactory.predefinedTypes().forEach(this::registerPredefinedType);
+
// BinaryUtils.FIELDS_SORTED_ORDER support, since it uses TreeMap at
BinaryMetadata.
registerBinarilizableSystemClass(BinaryTreeMap.class);
registerBinarilizableSystemClass(TreeMap.class);
@@ -1520,7 +1521,7 @@ public class BinaryContext {
// Interfaces and array not registered as binary types.
BinaryClassDescriptor desc = descriptorForClass(compCls);
- if (compCls.isEnum() || compCls == BinaryEnumObjectImpl.class) {
+ if (compCls.isEnum() || compCls ==
BinaryUtils.binariesFactory.binaryEnumClass()) {
return new BinaryEnumArray(
this,
desc.registered() ? desc.typeId() :
GridBinaryMarshaller.UNREGISTERED_TYPE_ID,
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
index 98f39978550..27d4f595f56 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
@@ -89,7 +89,7 @@ public class BinaryTypeImpl implements BinaryType {
ArrayList<BinaryObject> enumValues = new ArrayList<>(ordinals.size());
for (Integer ord: ordinals)
- enumValues.add(new BinaryEnumObjectImpl(ctx, typeId(), typeName(),
ord));
+ enumValues.add(BinaryUtils.binariesFactory.binaryEnum(ctx,
typeId(), typeName(), ord));
return enumValues;
}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 93f691dc121..6bfec8375eb 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -58,7 +58,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.function.Function;
import java.util.function.IntFunction;
-import java.util.function.ToIntFunction;
import java.util.stream.Collectors;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteCommonsSystemProperties;
@@ -74,7 +73,6 @@ import
org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
import org.apache.ignite.internal.processors.cache.CacheObjectValueContext;
import org.apache.ignite.internal.util.CommonUtils;
-import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.MutableSingletonList;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.T2;
@@ -89,7 +87,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.ignite.IgniteCommonsSystemProperties.DFLT_IGNITE_USE_BINARY_ARRAYS;
import static
org.apache.ignite.IgniteCommonsSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2;
import static
org.apache.ignite.IgniteCommonsSystemProperties.IGNITE_USE_BINARY_ARRAYS;
-import static org.apache.ignite.internal.util.GridUnsafe.align;
/**
* Binary utils.
@@ -1152,7 +1149,7 @@ public class BinaryUtils {
return BinaryWriteMode.MAP;
else if (CommonUtils.isEnum(cls))
return BinaryWriteMode.ENUM;
- else if (cls == BinaryEnumObjectImpl.class)
+ else if (cls == binariesFactory.binaryEnumClass())
return BinaryWriteMode.BINARY_ENUM;
else if (cls == Class.class)
return BinaryWriteMode.CLASS;
@@ -1676,28 +1673,9 @@ public class BinaryUtils {
* @param type Plain type.
* @return Enum.
*/
- static BinaryEnumObjectImpl doReadBinaryEnum(BinaryInputStream in,
BinaryContext ctx,
+ static BinaryObjectEx doReadBinaryEnum(BinaryInputStream in, BinaryContext
ctx,
EnumType type) {
- return new BinaryEnumObjectImpl(ctx, type.typeId, type.clsName,
in.readInt());
- }
-
- /**
- * Read binary enum.
- *
- * @param ord Ordinal.
- * @param ctx Context.
- * @param typeId Type ID.
- */
- public static BinaryObjectEx binaryEnum(int ord, BinaryContext ctx, int
typeId) {
- return new BinaryEnumObjectImpl(ctx, typeId, null, ord);
- }
-
- /**
- * @param ctx Context.
- * @param arr Array.
- */
- public static BinaryObjectEx binaryEnum(BinaryContext ctx, byte[] arr) {
- return new BinaryEnumObjectImpl(ctx, arr);
+ return binariesFactory.binaryEnum(ctx, type.typeId, type.clsName,
in.readInt());
}
/** */
@@ -1725,7 +1703,7 @@ public class BinaryUtils {
private static Object[] doReadBinaryEnumArray(BinaryInputStream in,
BinaryContext ctx) {
int len = in.readInt();
- Object[] arr = (Object[])Array.newInstance(BinaryEnumObjectImpl.class,
len);
+ Object[] arr =
(Object[])Array.newInstance(binariesFactory.binaryEnumClass(), len);
for (int i = 0; i < len; i++) {
byte flag = in.readByte();
@@ -2800,23 +2778,6 @@ public class BinaryUtils {
);
}
- /**
- * @return Map of function returning size of the object.
- */
- public static Map<Class<?>, ToIntFunction<Object>> sizeProviders() {
- return Map.of(
- BinaryObjectOffheapImpl.class, obj -> 0, // No extra heap memory.
- BinaryObjectImpl.class, new ToIntFunction<>() {
- private final long byteArrOffset =
GridUnsafe.arrayBaseOffset(byte[].class);
-
- @Override public int applyAsInt(Object bo) {
- return (int)align(byteArrOffset +
((BinaryObjectImpl)bo).bytes().length);
- }
- },
- BinaryEnumObjectImpl.class, bo -> ((BinaryObject)bo).size()
- );
- }
-
/**
* @param val Value to check.
* @return {@code True} if {@code val} instance of {@link BinaryEnumArray}.
@@ -2830,15 +2791,7 @@ public class BinaryUtils {
* @return {@code True} if {@code val} instance of binary Enum object.
*/
public static boolean isBinaryEnumObject(Object val) {
- return val instanceof BinaryEnumObjectImpl;
- }
-
- /**
- * @param cls Class to check.
- * @return {@code True} if {@code val} is assignable to binary Enum object.
- */
- public static boolean isAssignableToBinaryEnumObject(Class<?> cls) {
- return BinaryEnumObjectImpl.class.isAssignableFrom(cls);
+ return val != null && val.getClass() ==
binariesFactory.binaryEnumClass();
}
/**
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinariesFactoryImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinariesFactoryImpl.java
index 94021fb5ca6..e196d777560 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinariesFactoryImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinariesFactoryImpl.java
@@ -18,6 +18,10 @@
package org.apache.ignite.internal.binary;
import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.ToIntFunction;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
import org.apache.ignite.internal.binary.streams.BinaryStreams;
@@ -142,4 +146,51 @@ public class BinariesFactoryImpl implements
BinariesFactory {
return new BinaryFieldDescriptor(field, id, mode, -1L,
!CommonUtils.isFinal(field.getType()));
}
}
+
+ /** {@inheritDoc} */
+ @Override public BinaryObjectEx binaryEnum(BinaryContext ctx, int typeId,
@Nullable String clsName, int ord) {
+ return new BinaryEnumObjectImpl(ctx, typeId, clsName, ord);
+ }
+
+ /** {@inheritDoc} */
+ @Override public BinaryObjectEx binaryEnum(BinaryContext ctx, byte[] arr) {
+ return new BinaryEnumObjectImpl(ctx, arr);
+ }
+
+ /** {@inheritDoc} */
+ @Override public Class<?> binaryEnumClass() {
+ return BinaryEnumObjectImpl.class;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Map<Class<?>, Integer> predefinedTypes() {
+ Map<Class<?>, Integer> predefinedTypes = new HashMap<>();
+
+ predefinedTypes.put(BinaryEnumObjectImpl.class, 0);
+
+ return predefinedTypes;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Map<Class<?>, ToIntFunction<Object>> sizeProviders() {
+ return Map.of(
+ BinaryObjectOffheapImpl.class, obj -> 0, // No extra heap memory.
+ BinaryObjectImpl.class, new ToIntFunction<>() {
+ private final long byteArrOffset =
GridUnsafe.arrayBaseOffset(byte[].class);
+
+ @Override public int applyAsInt(Object bo) {
+ return (int)GridUnsafe.align(byteArrOffset +
((BinaryObjectImpl)bo).bytes().length);
+ }
+ },
+ BinaryEnumObjectImpl.class, bo -> ((BinaryObject)bo).size()
+ );
+ }
+
+ /**
+ * @param cls Class to check.
+ * @return {@code True} if {@code val} is assignable to binary Enum object.
+ */
+ public static boolean isAssignableToBinaryEnumObject(Class<?> cls) {
+ return BinaryEnumObjectImpl.class.isAssignableFrom(cls);
+ }
}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
similarity index 99%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
index d8655ed1277..d61cab738b4 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
@@ -55,7 +55,7 @@ class BinaryEnumObjectImpl implements BinaryObjectEx,
Externalizable, CacheObjec
private int typeId;
/** Raw data. */
- private String clsName;
+ private @Nullable String clsName;
/** Ordinal. */
private int ord;
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
index 63e52ffe1f2..c30f1daf9a9 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.IdentityHashMap;
import java.util.Map;
import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.internal.binary.BinariesFactoryImpl;
import org.apache.ignite.internal.binary.BinaryObjectEx;
import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.binary.BinaryWriterEx;
@@ -205,7 +206,7 @@ class BinaryBuilderSerializer {
int compTypeId = writer.context().typeId(compCls.getName());
- if (BinaryUtils.isAssignableToBinaryEnumObject(compCls) || val
instanceof BinaryBuilderEnum[]) {
+ if (BinariesFactoryImpl.isAssignableToBinaryEnumObject(compCls) ||
val instanceof BinaryBuilderEnum[]) {
writeArray(writer, GridBinaryMarshaller.ENUM_ARR,
(Object[])val, compTypeId);
return;
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
index fd43af92bd3..7f5dbc3f32c 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
@@ -30,6 +30,7 @@ import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.binary.BinaryType;
+import org.apache.ignite.internal.binary.BinariesFactoryImpl;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryFieldMetadata;
import org.apache.ignite.internal.binary.BinaryObjectEx;
@@ -373,7 +374,7 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
newFldTypeId = GridBinaryMarshaller.ENUM;
else if (newVal.getClass().isArray() &&
-
BinaryUtils.isAssignableToBinaryEnumObject(newVal.getClass().getComponentType()))
+
BinariesFactoryImpl.isAssignableToBinaryEnumObject(newVal.getClass().getComponentType()))
newFldTypeId = GridBinaryMarshaller.ENUM_ARR;
else if (newVal.getClass().isArray() &&
BinaryObject.class.isAssignableFrom(newVal.getClass().getComponentType()))
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/tracker/ObjectSizeCalculator.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/tracker/ObjectSizeCalculator.java
index 1486a1ed862..0bb3b1ba6a3 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/tracker/ObjectSizeCalculator.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/tracker/ObjectSizeCalculator.java
@@ -100,7 +100,7 @@ public class ObjectSizeCalculator<Row> {
// Assume objects is not deserialized.
BinaryUtils.unwrapFuncForSizeCalc().forEach((cls, unwrapFunc) ->
addSysClsSize(cls, (c, bo) -> c.sizeOf0(unwrapFunc.apply(bo),
true)));
- BinaryUtils.sizeProviders().forEach((cls, szFunc) ->
+ BinaryUtils.binariesFactory.sizeProviders().forEach((cls, szFunc) ->
addSysClsSize(cls, (c, bo) -> szFunc.applyAsInt(bo)));
// Other.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinary.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinary.java
index a613d113e0c..c15522b9435 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinary.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinary.java
@@ -115,7 +115,7 @@ public class ClientBinary implements IgniteBinary {
int typeId = ctx.typeId(typeName);
- return BinaryUtils.binaryEnum(ord, ctx, typeId);
+ return BinaryUtils.binariesFactory.binaryEnum(ctx, typeId, null, ord);
}
/** {@inheritDoc} */
@@ -147,7 +147,7 @@ public class ClientBinary implements IgniteBinary {
name
));
- return BinaryUtils.binaryEnum(ordinal, ctx, typeId);
+ return BinaryUtils.binariesFactory.binaryEnum(ctx, typeId, null,
ordinal);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index cc7a145ef88..7c52bb2473e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -982,7 +982,7 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
updateMetadata(typeId, typeName, null, null, true, null);
- return BinaryUtils.binaryEnum(ord, binaryCtx, typeId);
+ return BinaryUtils.binariesFactory.binaryEnum(binaryCtx, typeId, null,
ord);
}
/** {@inheritDoc} */
@@ -1006,7 +1006,7 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
throw new BinaryObjectException("Failed to resolve enum ordinal by
name [typeId=" +
typeId + ", typeName='" + typeName + "', name='" + name +
"']");
- return BinaryUtils.binaryEnum(ordinal, binaryCtx, typeId);
+ return BinaryUtils.binariesFactory.binaryEnum(binaryCtx, typeId, null,
ordinal);
}
/** {@inheritDoc} */
@@ -1275,7 +1275,7 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
: (CacheObject)BinaryUtils.binaryObject(binaryContext(),
bytes, coctx);
case CacheObject.TYPE_BINARY_ENUM:
- return (CacheObject)BinaryUtils.binaryEnum(binaryContext(),
bytes);
+ return
(CacheObject)BinaryUtils.binariesFactory.binaryEnum(binaryContext(), bytes);
case CacheObject.TYPE_BYTE_ARR:
return new CacheObjectByteArrayImpl(bytes);
