IGNITE-27565 Remove unsafe dependency from binary-api (#12635)

Author: nizhikov

modules/binary/api/pom.xml

@@ -41,13 +41,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- TODO: remove me after extraction of implementation -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ignite-grid-unsafe</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

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

@@ -168,4 +168,7 @@ public BinaryReaderEx reader(BinaryContext ctx,
 
     /** Creates new instance of binary object. */
     public BinaryObject binaryObject(BinaryContext ctx, byte[] valBytes, CacheObjectValueContext coCtx);
+
+    /** */
+    public BinaryIdentityResolver arrayIdentityResolver();
 }

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

@@ -361,7 +361,7 @@ private void configure(
                 BinaryIdMapper idMapper = CommonUtils.firstNotNull(typeCfg.getIdMapper(), globalIdMapper);
                 BinaryNameMapper nameMapper = CommonUtils.firstNotNull(typeCfg.getNameMapper(), globalNameMapper);
                 BinarySerializer serializer = CommonUtils.firstNotNull(typeCfg.getSerializer(), globalSerializer);
-                BinaryIdentityResolver identity = BinaryArrayIdentityResolver.instance();
+                BinaryIdentityResolver identity = BinaryUtils.binariesFactory.arrayIdentityResolver();
 
                 BinaryInternalMapper mapper = resolveMapper(nameMapper, idMapper);
 
@@ -1338,7 +1338,7 @@ public String affinityKeyFieldName(int typeId) {
     public BinaryIdentityResolver identity(int typeId) {
         BinaryIdentityResolver rslvr = identities.get(typeId);
 
-        return rslvr != null ? rslvr : BinaryArrayIdentityResolver.instance();
+        return rslvr != null ? rslvr : BinaryUtils.binariesFactory.arrayIdentityResolver();
     }
 
     /**

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

@@ -132,4 +132,13 @@ public default BinaryObjectEx detach(boolean checkCrossObjReferences) {
     public default void detachAllowed(boolean detachAllowed) {
         // No-op.
     }
+
+    /**
+     * Check if object graph has circular references.
+     *
+     * @return {@code true} if object has circular references.
+     */
+    public default boolean hasCircularReferences() {
+        return false;
+    }
 }

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

@@ -367,12 +367,8 @@ private static void handleOverflow(SB buf, int size) {
             buf.a("... and ").a(overflow).a(" more");
     }
 
-    /**
-     * Check if object graph has circular references.
-     *
-     * @return {@code true} if object has circular references.
-     */
-    public boolean hasCircularReferences() {
+    /** {@inheritDoc} */
+    @Override public boolean hasCircularReferences() {
         try {
             BinaryReaderHandles ctx = new BinaryReaderHandles();
 

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

@@ -3057,6 +3057,16 @@ public static BinaryMetadata binaryMetadata(
         return new BinaryMetadata(typeId, typeName, fields, affKeyFieldName, schemas, isEnum, enumMap);
     }
 
+    /** */
+    public static int hashCode(byte[] data, int startPos, int endPos) {
+        int hash = 1;
+
+        for (int i = startPos; i < endPos; i++)
+            hash = 31 * hash + data[i];
+
+        return hash;
+    }
+
     /**
      * Enum type.
      */

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

@@ -461,7 +461,7 @@ public boolean mustDeserialize(Object obj) {
      * @return Writer.
      */
     public BinaryWriterEx writer(BinaryOutputStream out) {
-        return BinaryUtils.writer(ctx, out, BinaryThreadLocalContext.get().schemaHolder());
+        return BinaryUtils.writer(ctx, out);
     }
 
     /**

modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinariesFactoryImpl.java

@@ -219,6 +219,11 @@ public class BinariesFactoryImpl implements BinariesFactory {
         return new BinaryObjectImpl(ctx, valBytes, coCtx);
     }
 
+    /** {@inheritDoc} */
+    @Override public BinaryIdentityResolver arrayIdentityResolver() {
+        return BinaryArrayIdentityResolver.instance();
+    }
+
     /**
      * @param cls Class to check.
      * @return {@code True} if {@code val} is assignable to binary Enum object.

…nary/BinaryAbstractIdentityResolver.java …nary/BinaryAbstractIdentityResolver.javamodules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryAbstractIdentityResolver.java renamed to modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryAbstractIdentityResolver.java modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryAbstractIdentityResolver.java renamed to modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryAbstractIdentityResolver.java

@@ -57,7 +57,7 @@ private BinaryArrayIdentityResolver() {
             int end = ex.footerStartOffset();
 
             if (ex.hasBytes())
-                return hashCode(ex.bytes(), start, end);
+                return BinaryUtils.hashCode(ex.bytes(), start, end);
             else {
                 // Handle offheap object.
                 int hash = 1;
@@ -88,16 +88,6 @@ else if (BinaryUtils.isBinaryEnumObject(obj)) {
                 "implementation: " + obj.getClass().getName());
     }
 
-    /** */
-    public int hashCode(byte[] data, int startPos, int endPos) {
-        int hash = 1;
-
-        for (int i = startPos; i < endPos; i++)
-            hash = 31 * hash + data[i];
-
-        return hash;
-    }
-
     /** {@inheritDoc} */
     @Override protected boolean equals0(BinaryObject o1, BinaryObject o2) {
         if (o1 instanceof BinaryObjectEx && o2 instanceof BinaryObjectEx) {