IGNITE-28763 Fixed BinaryObjectBuilder enum type mapping (#13229)

Author: NSAmelchev

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

@@ -607,7 +607,7 @@ public static byte typeByClass(Class<?> cls) {
         if (type != null)
             return type;
 
-        if (CommonUtils.isEnum(cls))
+        if (CommonUtils.isEnum(cls) || cls == Enum.class)
             return GridBinaryMarshaller.ENUM;
 
         if (cls.isArray())

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

@@ -822,6 +822,34 @@ public void testMetaData2() throws Exception {
         assertEquals("Object", meta.fieldTypeName("objectField"));
     }
 
+    /** */
+    @Test
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public void testSetBinaryEnumFieldWithEnumClass() {
+        IgniteBinary binary = binaries();
+
+        binary.registerEnum(BuilderEnum.class.getName(), F.asMap(
+            BuilderEnum.ONE.name(), BuilderEnum.ONE.ordinal(),
+            BuilderEnum.TWO.name(), BuilderEnum.TWO.ordinal()));
+
+        String typeName = "org.test.EnumMetaTest";
+        String fld = "enumField";
+
+        BinaryObject bo = builder(typeName)
+            .setField(fld, binary.buildEnum(BuilderEnum.class.getName(), BuilderEnum.ONE.name()))
+            .build();
+
+        assertEquals("Enum", bo.type().fieldTypeName(fld));
+        assertEquals(BuilderEnum.ONE.ordinal(), bo.<BinaryObject>field(fld).enumOrdinal());
+
+        bo = builder(typeName)
+            .setField(fld, binary.buildEnum(BuilderEnum.class.getName(), BuilderEnum.TWO.name()), (Class)Enum.class)
+            .build();
+
+        assertEquals("Enum", bo.type().fieldTypeName(fld));
+        assertEquals(BuilderEnum.TWO.ordinal(), bo.<BinaryObject>field(fld).enumOrdinal());
+    }
+
     /**
      * @param fullClsName Class name.
      * @return Expected type name according to configuration.
@@ -1077,6 +1105,15 @@ private static class CustomIdMapper {
         private int i = 10;
     }
 
+    /** */
+    private enum BuilderEnum {
+        /** */
+        ONE,
+
+        /** */
+        TWO
+    }
+
     /**
      */
     private static class Key {