This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch IGNITE-27565-2 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 2263e3b4d8d29220e8ed6c9211407150dfa3585b Author: Nikolay Izhikov <[email protected]> AuthorDate: Thu Jan 15 00:05:21 2026 +0300 IGNITE-27558 Move BinaryObjectImpl to binary-impl --- .../src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java | 4 ++-- .../org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java | 2 +- .../ignite/internal/client/thin/ClientCacheAffinityContext.java | 2 +- .../ignite/internal/client/thin/ClientCacheAffinityMapping.java | 2 +- .../java/org/apache/ignite/internal/client/thin/ClientUtils.java | 4 ++-- .../java/org/apache/ignite/internal/client/thin/TcpClientCache.java | 2 +- .../org/apache/ignite/internal/client/thin/TcpClientChannel.java | 2 +- .../apache/ignite/internal/client/thin/TcpClientTransactions.java | 2 +- .../java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java | 2 +- .../java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 5 ++--- .../ignite/internal/processors/odbc/ClientListenerNioListener.java | 2 +- .../apache/ignite/internal/client/thin/events/FakeIgniteServer.java | 2 +- .../org/apache/ignite/platform/PlatformGetInternalCachesTask.java | 2 +- 13 files changed, 16 insertions(+), 17 deletions(-) diff --git a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java index dd1187dfdaf..78a4883c461 100644 --- a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java +++ b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java @@ -2813,8 +2813,8 @@ public class BinaryUtils { * @param out Output stream. * @return Writer instance. */ - public static BinaryWriterEx writer(BinaryContext ctx, BinaryOutputStream out, BinaryWriterSchemaHolder schema) { - return binariesFactory.writer(ctx, out, schema); + public static BinaryWriterEx writerWithoutSchemaHolder(BinaryContext ctx, BinaryOutputStream out) { + return binariesFactory.writer(ctx, out, null); } /** @return Instance of caching handler. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java index 50b76a9b4ac..9d0bf1784dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java @@ -134,7 +134,7 @@ public class ClientAtomicLongImpl implements ClientAtomicLong { * @param out Output channel. */ private void writeName(PayloadOutputChannel out) { - try (BinaryWriterEx w = BinaryUtils.writer(null, out.out(), null)) { + try (BinaryWriterEx w = BinaryUtils.writerWithoutSchemaHolder(null, out.out())) { w.writeString(name); w.writeString(groupName); } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java index 9ac655460ef..65109ae0eb4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java @@ -250,7 +250,7 @@ public class ClientCacheAffinityContext { * @param ch Payload output channel. */ public void writeDataCenterNodesRequest(PayloadOutputChannel ch) { - try (BinaryWriterEx w = BinaryUtils.writer(null, ch.out(), null)) { + try (BinaryWriterEx w = BinaryUtils.writerWithoutSchemaHolder(null, ch.out())) { w.writeString(dataCenterId); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java index 4a944e0c691..fdef497c822 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java @@ -174,7 +174,7 @@ public class ClientCacheAffinityMapping { out.writeBoolean(customMappingsRequired); if (ctx.isFeatureSupported(DC_AWARE)) { - try (BinaryWriterEx w = BinaryUtils.writer(null, out, null)) { + try (BinaryWriterEx w = BinaryUtils.writerWithoutSchemaHolder(null, out)) { w.writeString(dcId); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java index 880b8a49cd0..0dd763cde52 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java @@ -199,7 +199,7 @@ public final class ClientUtils { /** Serialize binary type metadata to stream. */ void binaryMetadata(BinaryMetadata meta, BinaryOutputStream out) { - try (BinaryWriterEx w = BinaryUtils.writer(marsh.context(), out, null)) { + try (BinaryWriterEx w = BinaryUtils.writerWithoutSchemaHolder(marsh.context(), out)) { w.writeInt(meta.typeId()); w.writeString(meta.typeName()); w.writeString(meta.affinityKeyFieldName()); @@ -244,7 +244,7 @@ public final class ClientUtils { /** Serialize configuration to stream. */ void cacheConfiguration(ClientCacheConfiguration cfg, boolean sql, BinaryOutputStream out, ProtocolContext protocolCtx) { - try (BinaryWriterEx writer = BinaryUtils.writer(marsh.context(), out, null)) { + try (BinaryWriterEx writer = BinaryUtils.writerWithoutSchemaHolder(marsh.context(), out)) { if (protocolCtx.isFeatureSupported(ProtocolBitmaskFeature.SQL_CACHE_CREATION)) out.writeBoolean(sql); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java index c9d6f10f13d..f0a5e7aa147 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java @@ -1287,7 +1287,7 @@ public class TcpClientCache<K, V> implements ClientCache<K, V> { BinaryOutputStream out = payloadCh.out(); - try (BinaryWriterEx w = BinaryUtils.writer(marsh.context(), out, null)) { + try (BinaryWriterEx w = BinaryUtils.writerWithoutSchemaHolder(marsh.context(), out)) { w.writeInt(qry.getPageSize()); w.writeBoolean(qry.isLocal()); w.writeInt(qry.getPartition() == null ? -1 : qry.getPartition()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java index f8316faf64c..cc5e30012ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java @@ -838,7 +838,7 @@ class TcpClientChannel implements ClientChannel, ClientMessageHandler, ClientCon /** Send handshake request. */ private void handshakeReq(ProtocolVersion proposedVer, String user, String pwd, Map<String, String> userAttrs) throws ClientConnectionException { - try (BinaryWriterEx writer = BinaryUtils.writer(U.binaryContext(null), BinaryStreams.outputStream(32), null)) { + try (BinaryWriterEx writer = BinaryUtils.writerWithoutSchemaHolder(U.binaryContext(null), BinaryStreams.outputStream(32))) { ProtocolContext protocolCtx = protocolContextFromVersion(proposedVer); writer.writeInt(0); // reserve an integer for the request size diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientTransactions.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientTransactions.java index 24446be7ca2..c97831c7955 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientTransactions.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientTransactions.java @@ -99,7 +99,7 @@ class TcpClientTransactions implements ClientTransactions { "protocol version %s, required version %s", protocolCtx.version(), TRANSACTIONS.verIntroduced())); } - try (BinaryWriterEx writer = BinaryUtils.writer(marsh.context(), req.out(), null)) { + try (BinaryWriterEx writer = BinaryUtils.writerWithoutSchemaHolder(marsh.context(), req.out())) { writer.writeByte((byte)(concurrency == null ? txCfg.getDefaultTxConcurrency() : concurrency).ordinal()); writer.writeByte((byte)(isolation == null ? txCfg.getDefaultTxIsolation() : isolation).ordinal()); writer.writeLong(timeout == null ? txCfg.getDefaultTxTimeout() : timeout); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java index 504f838aed6..839fa37494c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java @@ -556,7 +556,7 @@ public class TcpIgniteClient implements IgniteClient { /** Serialize string. */ private void writeString(String s, BinaryOutputStream out) { - try (BinaryWriterEx w = BinaryUtils.writer(marsh.context(), out, null)) { + try (BinaryWriterEx w = BinaryUtils.writerWithoutSchemaHolder(marsh.context(), out)) { w.writeString(s); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java index e1f1cf88c76..7c29ab34089 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java @@ -272,7 +272,7 @@ public class JdbcThinTcpIo { marsh.setContext(new MarshallerContextImpl(null, null)); - BinaryWriterEx writer = BinaryUtils.writer(U.binaryContext(marsh), BinaryStreams.outputStream(HANDSHAKE_MSG_SIZE), null); + BinaryWriterEx writer = BinaryUtils.writerWithoutSchemaHolder(U.binaryContext(marsh), BinaryStreams.outputStream(HANDSHAKE_MSG_SIZE)); writer.writeByte((byte)ClientListenerRequest.HANDSHAKE); @@ -432,8 +432,7 @@ public class JdbcThinTcpIo { * @throws SQLException On connection reject. */ private HandshakeResult handshake_2_1_0() throws IOException, SQLException { - BinaryWriterEx writer = BinaryUtils.writer(null, BinaryStreams.outputStream(HANDSHAKE_MSG_SIZE), - null); + BinaryWriterEx writer = BinaryUtils.writerWithoutSchemaHolder(null, BinaryStreams.outputStream(HANDSHAKE_MSG_SIZE)); writer.writeByte((byte)ClientListenerRequest.HANDSHAKE); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java index f56867a0eeb..ca01c20296e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java @@ -377,7 +377,7 @@ public class ClientListenerNioListener extends GridNioServerListenerAdapter<Clie ClientListenerProtocolVersion ver = ClientListenerProtocolVersion.create(verMajor, verMinor, verMaintenance); - BinaryWriterEx writer = BinaryUtils.writer(null, BinaryStreams.outputStream(8), null); + BinaryWriterEx writer = BinaryUtils.writerWithoutSchemaHolder(null, BinaryStreams.outputStream(8)); byte clientType = reader.readByte(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/events/FakeIgniteServer.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/events/FakeIgniteServer.java index 6288699c7b2..dcaafcc1861 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/events/FakeIgniteServer.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/events/FakeIgniteServer.java @@ -224,7 +224,7 @@ public class FakeIgniteServer extends JUnitAssertAware implements GridNioServerL /** */ private ByteBuffer createMessage(Consumer<BinaryRawWriter> writerAction) { - try (BinaryWriterEx writer = BinaryUtils.writer(null, BinaryStreams.outputStream(32), null)) { + try (BinaryWriterEx writer = BinaryUtils.writerWithoutSchemaHolder(null, BinaryStreams.outputStream(32))) { writer.writeInt(0); writerAction.accept(writer); diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformGetInternalCachesTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformGetInternalCachesTask.java index ee767453873..30c967bdfd0 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformGetInternalCachesTask.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformGetInternalCachesTask.java @@ -68,7 +68,7 @@ public class PlatformGetInternalCachesTask extends ComputeTaskAdapter<Object, by @Override public byte[] execute() { IgniteEx ign = (IgniteEx)ignite; - try (BinaryWriterEx writer = BinaryUtils.writer(U.binaryContext(null), BinaryStreams.outputStream(512), null)) { + try (BinaryWriterEx writer = BinaryUtils.writerWithoutSchemaHolder(U.binaryContext(null), BinaryStreams.outputStream(512))) { Collection<IgniteInternalCache<?, ?>> caches = ign.cachesx(); writer.writeInt(caches.size());
