IGNITE-26863 Fixed broken Binary Object size calculation for enum objects (#12482)

Author: petrov-mg

modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java

@@ -323,12 +323,7 @@ private <T> T uncachedValue(Class<?> cls) throws BinaryObjectException {
 
     /** {@inheritDoc} */
     @Override public byte[] valueBytes(CacheObjectValueContext cacheCtx) throws IgniteCheckedException {
-        if (valBytes != null)
-            return valBytes;
-
-        valBytes = Marshallers.marshal(ctx.marshaller(), this);
-
-        return valBytes;
+        return valueBytes();
     }
 
     /** {@inheritDoc} */
@@ -382,15 +377,21 @@ private <T> T uncachedValue(Class<?> cls) throws BinaryObjectException {
 
     /** {@inheritDoc} */
     @Override public int size() {
-        if (valBytes == null) {
-            try {
-                valBytes = Marshallers.marshal(ctx.marshaller(), this);
-            }
-            catch (IgniteCheckedException e) {
-                throw CommonUtils.convertException(e);
-            }
+        try {
+            return valueBytes().length;
+        }
+        catch (IgniteCheckedException e) {
+            throw CommonUtils.convertException(e);
         }
+    }
+
+    /** */
+    private byte[] valueBytes() throws IgniteCheckedException {
+        if (valBytes != null)
+            return valBytes;
+
+        valBytes = Marshallers.marshal(ctx.marshaller(), this);
 
-        return BinaryPrimitives.readInt(valBytes, ord + GridBinaryMarshaller.TOTAL_LEN_POS);
+        return valBytes;
     }
 }

modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java

@@ -32,7 +32,6 @@
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.marshaller.Marshaller;
@@ -227,8 +226,7 @@ public void testNestedBuilderNotRegistered() throws Exception {
     public void testInstanceFromBytes() throws Exception {
         startUp(true);
 
-        BinaryContext binCtx =
-            ((CacheObjectBinaryProcessorImpl)((IgniteKernal)node1).context().cacheObjects()).binaryContext();
+        BinaryContext binCtx = ((IgniteEx)node1).context().cacheObjects().binaryContext();
 
         int ord = EnumType.ONE.ordinal();
 
@@ -256,6 +254,7 @@ private void checkInstanceFromBytes(BinaryContext binCtx, int ord, int typeId, S
 
         BinaryEnumObjectImpl binEnum = new BinaryEnumObjectImpl(binCtx, bytes);
 
+        assertEquals(bytes.length, srcBinEnum.size());
         assertEquals(srcBinEnum.size(), binEnum.size());
         assertEquals(clsName, binEnum.enumClassName());
         assertEquals(typeId, binEnum.typeId());