IGNITE-27177 Remove BinaryWriter#typeId setter (#12534)

Author: nizhikov

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

@@ -608,8 +608,6 @@ void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
             assert writer != null;
             assert mode != BinaryWriteMode.OPTIMIZED : "OptimizedMarshaller should not be used here: " + cls.getName();
 
-            writer.typeId(typeId);
-
             switch (mode) {
                 case P_BYTE:
                 case BYTE:

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

@@ -2922,17 +2922,19 @@ static BinaryReaderEx reader(BinaryContext ctx,
     /**
      * @param ctx Context.
      * @param failIfUnregistered Flag to fail while writing object of unregistered type.
+     * @param typeId Type id.
      * @return Writer instance.
      */
-    public static BinaryWriterEx writer(BinaryContext ctx, boolean failIfUnregistered) {
+    public static BinaryWriterEx writer(BinaryContext ctx, boolean failIfUnregistered, int typeId) {
         BinaryThreadLocalContext locCtx = BinaryThreadLocalContext.get();
 
         return new BinaryWriterExImpl(
             ctx,
             BinaryStreams.outputStream((int)CommonUtils.KB, locCtx.chunk()),
             locCtx.schemaHolder(),
             null,
-            failIfUnregistered
+            failIfUnregistered,
+            typeId
         );
     }
 
@@ -2942,7 +2944,14 @@ public static BinaryWriterEx writer(BinaryContext ctx, boolean failIfUnregistere
      * @return Writer instance.
      */
     public static BinaryWriterEx writer(BinaryContext ctx, BinaryOutputStream out) {
-        return new BinaryWriterExImpl(ctx, out, BinaryThreadLocalContext.get().schemaHolder(), null, false);
+        return new BinaryWriterExImpl(
+            ctx,
+            out,
+            BinaryThreadLocalContext.get().schemaHolder(),
+            null,
+            false,
+            GridBinaryMarshaller.UNREGISTERED_TYPE_ID
+        );
     }
 
     /**
@@ -2951,7 +2960,7 @@ public static BinaryWriterEx writer(BinaryContext ctx, BinaryOutputStream out) {
      * @return Writer instance.
      */
     public static BinaryWriterEx writer(BinaryContext ctx, BinaryOutputStream out, BinaryWriterSchemaHolder schema) {
-        return new BinaryWriterExImpl(ctx, out, schema, null, false);
+        return new BinaryWriterExImpl(ctx, out, schema, null, false, GridBinaryMarshaller.UNREGISTERED_TYPE_ID);
     }
 
     /** @return Instance of caching handler. */

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

@@ -72,11 +72,6 @@ public interface BinaryWriterEx extends BinaryWriter, BinaryRawWriter, ObjectOut
      */
     void marshal(Object obj) throws BinaryObjectException;
 
-    /**
-     * @param typeId Type ID.
-     */
-    public void typeId(int typeId);
-
     /**
      * @return Array.
      */

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

@@ -90,19 +90,22 @@ class BinaryWriterExImpl implements BinaryWriterEx {
      * @param out Output stream.
      * @param handles Handles.
      * @param failIfUnregistered Flag to fail while writing object of unregistered type.
+     * @param typeId Type id.
      */
     public BinaryWriterExImpl(
         BinaryContext ctx,
         BinaryOutputStream out,
         BinaryWriterSchemaHolder schema,
         BinaryWriterHandles handles,
-        boolean failIfUnregistered
+        boolean failIfUnregistered,
+        int typeId
     ) {
         this.ctx = ctx;
         this.out = out;
         this.schema = schema;
         this.handles = handles;
         this.failIfUnregistered = failIfUnregistered;
+        this.typeId = typeId;
 
         start = out.position();
     }
@@ -112,11 +115,6 @@ public BinaryWriterExImpl(
         return failIfUnregistered;
     }
 
-    /** {@inheritDoc} */
-    @Override public void typeId(int typeId) {
-        this.typeId = typeId;
-    }
-
     /** {@inheritDoc} */
     @Override public void close() {
         out.close();
@@ -132,7 +130,7 @@ public BinaryWriterExImpl(
      * @param enableReplace Object replacing enabled flag.
      * @throws org.apache.ignite.binary.BinaryObjectException In case of error.
      */
-    void marshal(Object obj, boolean enableReplace) throws BinaryObjectException {
+    private void marshal(Object obj, boolean enableReplace) throws BinaryObjectException {
         String newName = ctx.igniteInstanceName();
         String oldName = CommonUtils.setCurrentIgniteName(newName);
 
@@ -204,6 +202,8 @@ private void marshal0(Object obj, boolean enableReplace) throws BinaryObjectExce
             return;
         }
 
+        this.typeId = desc.typeId();
+
         desc.write(obj, this);
     }
 
@@ -219,15 +219,6 @@ int position() {
         return out.position();
     }
 
-    /**
-     * Sets new position.
-     *
-     * @param pos Position.
-     */
-    void position(int pos) {
-        out.position(pos);
-    }
-
     /** {@inheritDoc} */
     @Override public void preWrite(@Nullable String clsName) {
         out.position(out.position() + GridBinaryMarshaller.DFLT_HDR_LEN);
@@ -847,7 +838,14 @@ void writeBooleanField(@Nullable Boolean val) {
         if (obj == null)
             out.writeByte(GridBinaryMarshaller.NULL);
         else {
-            BinaryWriterExImpl writer = new BinaryWriterExImpl(ctx, out, schema, handles(), failIfUnregistered);
+            BinaryWriterExImpl writer = new BinaryWriterExImpl(
+                ctx,
+                out,
+                schema,
+                handles(),
+                failIfUnregistered,
+                GridBinaryMarshaller.UNREGISTERED_TYPE_ID
+            );
 
             writer.marshal(obj);
         }
@@ -858,7 +856,14 @@ void writeBooleanField(@Nullable Boolean val) {
         if (obj == null)
             out.writeByte(GridBinaryMarshaller.NULL);
         else {
-            BinaryWriterExImpl writer = new BinaryWriterExImpl(ctx, out, schema, null, failIfUnregistered);
+            BinaryWriterExImpl writer = new BinaryWriterExImpl(
+                ctx,
+                out,
+                schema,
+                null,
+                failIfUnregistered,
+                GridBinaryMarshaller.UNREGISTERED_TYPE_ID
+            );
 
             writer.marshal(obj);
         }
@@ -1537,11 +1542,7 @@ boolean tryWriteAsHandle(Object obj) {
 
     /** {@inheritDoc} */
     @Override public BinaryWriterEx newWriter(int typeId) {
-        BinaryWriterExImpl res = new BinaryWriterExImpl(ctx, out, schema, handles(), failIfUnregistered);
-
-        res.typeId(typeId);
-
-        return res;
+        return new BinaryWriterExImpl(ctx, out, schema, handles(), failIfUnregistered, typeId);
     }
 
     /** {@inheritDoc} */

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

@@ -250,7 +250,7 @@ public byte[] marshal(@Nullable Object obj, boolean failIfUnregistered) throws B
         if (obj == null)
             return new byte[] { NULL };
 
-        try (BinaryWriterEx writer = BinaryUtils.writer(ctx, failIfUnregistered)) {
+        try (BinaryWriterEx writer = BinaryUtils.writer(ctx, failIfUnregistered, UNREGISTERED_TYPE_ID)) {
             writer.marshal(obj);
 
             return writer.array();

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

@@ -176,10 +176,9 @@ public BinaryObjectBuilderImpl(BinaryObjectEx obj) {
 
         try (BinaryWriterEx writer = BinaryUtils.writer(
             ctx,
-            curThread instanceof IgniteThread && ((IgniteThread)curThread).isForbiddenToRequestBinaryMetadata())
+            curThread instanceof IgniteThread && ((IgniteThread)curThread).isForbiddenToRequestBinaryMetadata(),
+            typeId)
         ) {
-            writer.typeId(typeId);
-
             BinaryBuilderSerializer serializationCtx = new BinaryBuilderSerializer();
 
             serializationCtx.registerObjectWriting(this, 0);

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

@@ -3019,7 +3019,7 @@ public void testThreadLocalArrayReleased() throws Exception {
 
         BinaryMarshaller marsh = binaryMarshaller();
 
-        try (BinaryWriterEx writer = BinaryUtils.writer(binaryContext(marsh), false)) {
+        try (BinaryWriterEx writer = BinaryUtils.writer(binaryContext(marsh), false, GridBinaryMarshaller.UNREGISTERED_TYPE_ID)) {
             assertEquals(true, BinaryStreamsTestUtils.threadLocalIsAcquired());
 
             writer.writeString("Thread local test");

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

@@ -38,6 +38,8 @@
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
+import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UNREGISTERED_TYPE_ID;
+
 /** */
 public class RawBinaryObjectExtractorTest extends GridCommonAbstractTest {
     /** */
@@ -49,7 +51,7 @@ public void test() throws Exception {
 
         byte[] serializedTestObjectsBytes;
 
-        try (BinaryWriterEx writer = BinaryUtils.writer(ctx, false)) {
+        try (BinaryWriterEx writer = BinaryUtils.writer(ctx, false, UNREGISTERED_TYPE_ID)) {
             testObjects.forEach(writer::writeObject);
 
             serializedTestObjectsBytes = writer.array();