IGNITE-27177 Remove BinaryWriter#typeId seter

Author: nizhikov

modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/binary/JmhMapSerdesBenchmark.java

@@ -61,30 +61,30 @@ class BinaryWriterExImpl implements BinaryWriterEx {
     /** Schema. */
     private final BinaryWriterSchemaHolder schema;
 
-    /** */
-    private final boolean failIfUnregistered;
-
     /** */
     private int typeId;
 
     /** */
-    private int start;
+    private final int start;
 
     /** Raw offset position. */
     private int rawOffPos;
 
+    /** Handles. */
+    private BinaryWriterHandles handles;
+
     /** Schema ID. */
     private int schemaId = BinaryUtils.schemaInitialId();
 
     /** Amount of written fields. */
     private int fieldCnt;
 
-    /** Handles. */
-    private BinaryWriterHandles handles;
-
     /** */
     private BinaryInternalMapper mapper;
 
+    /** */
+    private final boolean failIfUnregistered;
+
     /**
      * @param ctx Context.
      * @param out Output stream.
@@ -847,29 +847,16 @@ void writeBooleanField(@Nullable Boolean val) {
         if (obj == null)
             out.writeByte(GridBinaryMarshaller.NULL);
         else {
-            int typeId0 = this.typeId;
-            int start0 = this.start;
-            int rawOffPos0 = this.rawOffPos;
-            int schemaId0 = this.schemaId;
-            int fieldCnt0 = this.fieldCnt;
-            BinaryInternalMapper mapper0 = this.mapper;
-
-            this.typeId = 0;
-            this.start = out.position();
-            this.rawOffPos = 0;
-            this.schemaId = BinaryUtils.schemaInitialId();
-            this.fieldCnt = 0;
-            this.mapper = null;
-            // Handles not cleared, because, in this mode it shared down to hierarchy.
-
-            marshal(obj);
-
-            this.typeId = typeId0;
-            this.start = start0;
-            this.rawOffPos = rawOffPos0;
-            this.schemaId = schemaId0;
-            this.fieldCnt = fieldCnt0;
-            this.mapper = mapper0;
+            BinaryWriterExImpl writer = new BinaryWriterExImpl(
+                ctx,
+                out,
+                schema,
+                handles(),
+                failIfUnregistered,
+                GridBinaryMarshaller.UNREGISTERED_TYPE_ID
+            );
+
+            writer.marshal(obj);
         }
     }
 
@@ -878,32 +865,16 @@ void writeBooleanField(@Nullable Boolean val) {
         if (obj == null)
             out.writeByte(GridBinaryMarshaller.NULL);
         else {
-            int typeId0 = this.typeId;
-            int start0 = this.start;
-            int rawOffPos0 = this.rawOffPos;
-            int schemaId0 = this.schemaId;
-            int fieldCnt0 = this.fieldCnt;
-            BinaryInternalMapper mapper0 = this.mapper;
-            BinaryWriterHandles handles0 = this.handles;
-
-            this.typeId = 0;
-            this.start = out.position();
-            this.rawOffPos = 0;
-            this.schemaId = BinaryUtils.schemaInitialId();
-            this.fieldCnt = 0;
-            this.mapper = null;
-            // Handles cleared, because, in this mode it NOT shared down to hierarchy.
-            this.handles = null;
-
-            marshal(obj);
-
-            this.typeId = typeId0;
-            this.start = start0;
-            this.rawOffPos = rawOffPos0;
-            this.schemaId = schemaId0;
-            this.fieldCnt = fieldCnt0;
-            this.mapper = mapper0;
-            this.handles = handles0;
+            BinaryWriterExImpl writer = new BinaryWriterExImpl(
+                ctx,
+                out,
+                schema,
+                null,
+                failIfUnregistered,
+                GridBinaryMarshaller.UNREGISTERED_TYPE_ID
+            );
+
+            writer.marshal(obj);
         }
     }
 

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

@@ -110,7 +110,6 @@
 import org.junit.Test;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UNREGISTERED_TYPE_ID;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertNotEquals;
 
@@ -3020,7 +3019,7 @@ public void testThreadLocalArrayReleased() throws Exception {
 
         BinaryMarshaller marsh = binaryMarshaller();
 
-        try (BinaryWriterEx writer = BinaryUtils.writer(binaryContext(marsh), false, UNREGISTERED_TYPE_ID)) {
+        try (BinaryWriterEx writer = BinaryUtils.writer(binaryContext(marsh), false, GridBinaryMarshaller.UNREGISTERED_TYPE_ID)) {
             assertEquals(true, BinaryStreamsTestUtils.threadLocalIsAcquired());
 
             writer.writeString("Thread local test");
@@ -3310,7 +3309,7 @@ public void testPredefinedTypeIds() throws Exception {
         for (Map.Entry<String, Integer> entry : map.entrySet()) {
             int id = entry.getValue();
 
-            if (id == UNREGISTERED_TYPE_ID)
+            if (id == GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
                 continue;
 
             BinaryClassDescriptor desc = bCtx.descriptorForTypeId(false, entry.getValue(), null, true);