This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch IGNITE-25928 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit d697aa1113ce1af7b12e45141b91924a0eacb0e7 Author: Nikolay Izhikov <[email protected]> AuthorDate: Wed Jul 16 22:13:45 2025 +0300 IGNITE-25928 WIP --- .../ignite/jdbc/thin/JdbcThinConnectionSelfTest.java | 2 +- .../apache/ignite/internal/binary/BinaryContext.java | 13 ++++++++----- .../internal/client/thin/ClientBinaryMarshaller.java | 2 +- .../ignite/internal/client/thin/TcpClientChannel.java | 2 +- .../ignite/internal/jdbc/thin/JdbcThinConnection.java | 2 +- .../ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 2 +- .../cache/binary/CacheObjectBinaryProcessorImpl.java | 18 ++++++++++++------ .../processors/odbc/ClientListenerNioListener.java | 2 +- .../processors/platform/utils/PlatformUtils.java | 2 +- .../binary/BinaryContextPredefinedTypesTest.java | 2 +- .../internal/binary/BinaryFieldExtractionSelfTest.java | 2 +- .../internal/binary/BinaryFieldsAbstractSelfTest.java | 2 +- .../binary/BinaryFooterOffsetsAbstractSelfTest.java | 2 +- .../internal/binary/BinaryMarshallerSelfTest.java | 14 ++++++++++++-- .../GridBinaryMarshallerCtxDisabledSelfTest.java | 2 +- .../internal/binary/GridBinaryWildcardsSelfTest.java | 2 +- .../internal/binary/RawBinaryObjectExtractorTest.java | 2 +- .../binary/GridBinaryCacheEntryMemorySizeSelfTest.java | 2 +- .../ignite/platform/PlatformGetInternalCachesTask.java | 2 +- .../ignite/session/GridSessionCheckpointSelfTest.java | 7 ++++++- .../ignite/testframework/junits/GridAbstractTest.java | 7 ++++++- .../testframework/junits/GridTestBinaryMarshaller.java | 7 ++++++- .../apache/ignite/testframework/junits/IgniteMock.java | 7 ++++++- .../testframework/junits/IgniteTestResources.java | 2 +- 24 files changed, 73 insertions(+), 34 deletions(-) diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java index 6247a4dba1a..24a34d5b8a0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java @@ -2233,7 +2233,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest { marsh.setContext(getFakeMarshallerCtx()); - BinaryContext ctx = new BinaryContext(null, new NullLogger()); + BinaryContext ctx = new BinaryContext(null, null, new NullLogger()); ctx.configure(marsh); ctx.registerUserTypesSchema(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java index f23a56f53a7..edf10d7791c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java @@ -169,8 +169,8 @@ public class BinaryContext { /** */ private final IgniteConfiguration igniteCfg = null; - /** TODO: remove me */ - BinaryConfiguration bcfg = igniteCfg.getBinaryConfiguration(); + /** Binary configuration. */ + private final BinaryConfiguration bcfg; /** Logger. */ private IgniteLogger log; @@ -186,23 +186,26 @@ public class BinaryContext { /** * @param nodeName Ignite instance name. + * @param bcfg Binary configuration. * @param log Logger. */ - public BinaryContext(@Nullable String nodeName, IgniteLogger log) { - this(BinaryNoopMetadataHandler.instance(), nodeName, log); + public BinaryContext(@Nullable String nodeName, @Nullable BinaryConfiguration bcfg, IgniteLogger log) { + this(BinaryNoopMetadataHandler.instance(), nodeName, bcfg, log); } /** * @param metaHnd Meta data handler. * @param nodeName Ignite instance name. + * @param bcfg Binary configuration. * @param log Logger. */ - public BinaryContext(BinaryMetadataHandler metaHnd, @Nullable String nodeName, IgniteLogger log) { + public BinaryContext(BinaryMetadataHandler metaHnd, @Nullable String nodeName, @Nullable BinaryConfiguration bcfg, IgniteLogger log) { assert metaHnd != null; MarshallerUtils.setNodeName(optmMarsh, nodeName); this.metaHnd = metaHnd; + this.bcfg = bcfg; this.log = log; colTypes.put(ArrayList.class, GridBinaryMarshaller.ARR_LIST); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinaryMarshaller.java index f7862bc7782..89e6e84b5f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinaryMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinaryMarshaller.java @@ -108,7 +108,7 @@ class ClientBinaryMarshaller { igniteCfg.setBinaryConfiguration(binCfg); - BinaryContext ctx = new BinaryContext(metaHnd, null, NullLogger.INSTANCE); + BinaryContext ctx = new BinaryContext(metaHnd, null, null, NullLogger.INSTANCE); BinaryMarshaller marsh = new BinaryMarshaller(); 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 0d46506dc39..0c418f90934 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 @@ -839,7 +839,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 { - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null); + BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null, null); try (BinaryWriterEx writer = BinaryUtils.writer(ctx, BinaryStreams.outputStream(32), null)) { ProtocolContext protocolCtx = protocolContextFromVersion(proposedVer); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java index c48f82a1403..24070d51bd7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java @@ -325,7 +325,7 @@ public class JdbcThinConnection implements Connection { BinaryConfiguration binCfg = new BinaryConfiguration().setCompactFooter(true); - BinaryContext ctx = new BinaryContext(metaHnd, null, new NullLogger()); + BinaryContext ctx = new BinaryContext(metaHnd, null, null, new NullLogger()); ctx.configure(marsh, binCfg, CU.affinityFields(null)); 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 223f59bcc46..70ec0fa0f93 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 @@ -268,7 +268,7 @@ public class JdbcThinTcpIo { * @throws SQLException On connection reject. */ private HandshakeResult handshake(ClientListenerProtocolVersion ver) throws IOException, SQLException { - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null); + BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null, null); BinaryMarshaller marsh = new BinaryMarshaller(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index 07fc5541332..428efd825ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -50,6 +50,7 @@ import org.apache.ignite.cache.affinity.AffinityKeyMapper; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException; import org.apache.ignite.internal.IgniteInternalFuture; @@ -277,9 +278,14 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme } }; - binaryCtx = useTestBinaryCtx ? - new TestBinaryContext(metaHnd, ctx.config().getIgniteInstanceName(), ctx.log(BinaryContext.class)) : - new BinaryContext(metaHnd, ctx.config().getIgniteInstanceName(), ctx.log(BinaryContext.class)); + binaryCtx = useTestBinaryCtx + ? new TestBinaryContext(metaHnd, ctx.config(), ctx.log(BinaryContext.class)) + : new BinaryContext( + metaHnd, + ctx.config().getIgniteInstanceName(), + ctx.config().getBinaryConfiguration(), + ctx.log(BinaryContext.class) + ); transport = new BinaryMetadataTransport(metadataLocCache, metadataFileStore, binaryCtx, ctx, log); @@ -1632,12 +1638,12 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme /** * @param metaHnd Meta handler. - * @param nodeName Ignite instance name. + * @param cfg Ignite configuration. * @param log Logger. */ - public TestBinaryContext(BinaryMetadataHandler metaHnd, @Nullable String nodeName, + public TestBinaryContext(BinaryMetadataHandler metaHnd, IgniteConfiguration cfg, IgniteLogger log) { - super(metaHnd, nodeName, log); + super(metaHnd, cfg.getIgniteInstanceName(), cfg.getBinaryConfiguration(), log); } /** {@inheritDoc} */ 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 2b9b5fd5717..04828c92a4a 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 @@ -356,7 +356,7 @@ public class ClientListenerNioListener extends GridNioServerListenerAdapter<Clie * @param msg Message bytes. */ private void onHandshake(GridNioSession ses, ClientMessage msg) { - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null); + BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null, null); BinaryMarshaller marsh = new BinaryMarshaller(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java index e11c506dfce..a55055a184a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java @@ -883,7 +883,7 @@ public class PlatformUtils { */ public static GridBinaryMarshaller marshaller() { BinaryContext ctx = - new BinaryContext(null, new NullLogger()); + new BinaryContext(null, null, new NullLogger()); BinaryMarshaller marsh = new BinaryMarshaller(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryContextPredefinedTypesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryContextPredefinedTypesTest.java index ab8fc8f592d..e64f3efd099 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryContextPredefinedTypesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryContextPredefinedTypesTest.java @@ -29,7 +29,7 @@ public class BinaryContextPredefinedTypesTest extends GridCommonAbstractTest { */ @Test public void testDefaultConstructor() { - BinaryContext binCtx = new BinaryContext(null, log); + BinaryContext binCtx = new BinaryContext(null, null, log); for (BinaryClassDescriptor desc : binCtx.predefinedTypes()) { if (!desc.isBinary()) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java index 5d60d50649e..f443a5882fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java @@ -43,7 +43,7 @@ public class BinaryFieldExtractionSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ protected BinaryMarshaller createMarshaller() throws Exception { - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, + BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null, log()); BinaryMarshaller marsh = new BinaryMarshaller(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java index 22d0dc8889f..c27cf753c82 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java @@ -48,7 +48,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ protected BinaryMarshaller createMarshaller() throws Exception { - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, + BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null, new NullLogger()); BinaryMarshaller marsh = new BinaryMarshaller(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java index ed78ddb5b27..c88843495b7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java @@ -47,7 +47,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst @Override protected void beforeTest() throws Exception { super.beforeTest(); - ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, new NullLogger()); + ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null, new NullLogger()); marsh = new BinaryMarshaller(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java index 300f16154af..4910370573d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java @@ -4166,7 +4166,12 @@ public class BinaryMarshallerSelfTest extends AbstractBinaryArraysTest { }); iCfg.setSystemViewExporterSpi(new JmxSystemViewExporterSpi()); - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), iCfg.getIgniteInstanceName(), new NullLogger()); + BinaryContext ctx = new BinaryContext( + BinaryUtils.cachingMetadataHandler(), + iCfg.getIgniteInstanceName(), + iCfg.getBinaryConfiguration(), + new NullLogger() + ); BinaryMarshaller marsh = new BinaryMarshaller(); @@ -4227,7 +4232,12 @@ public class BinaryMarshallerSelfTest extends AbstractBinaryArraysTest { }); iCfg.setSystemViewExporterSpi(new JmxSystemViewExporterSpi()); - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), iCfg.getIgniteInstanceName(), new NullLogger()); + BinaryContext ctx = new BinaryContext( + BinaryUtils.cachingMetadataHandler(), + iCfg.getIgniteInstanceName(), + iCfg.getBinaryConfiguration(), + new NullLogger() + ); BinaryMarshaller marsh = new BinaryMarshaller(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java index 9ec41833054..1caf9750c19 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java @@ -47,7 +47,7 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends GridCommonAbstractT BinaryMarshaller marsh = new BinaryMarshaller(); marsh.setContext(new MarshallerContextWithNoStorage()); - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, new NullLogger()); + BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null, new NullLogger()); marsh.setBinaryContext(ctx, new IgniteConfiguration()); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java index 8c043bc422a..0230c309220 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java @@ -674,7 +674,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { iCfg.setBinaryConfiguration(bCfg); - BinaryContext ctx = new BinaryContext(iCfg.getIgniteInstanceName(), new NullLogger()); + BinaryContext ctx = new BinaryContext(iCfg.getIgniteInstanceName(), bCfg, new NullLogger()); BinaryMarshaller marsh = new BinaryMarshaller(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java index fe6e44cebaf..f8f90cf94c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java @@ -77,7 +77,7 @@ public class RawBinaryObjectExtractorTest extends GridCommonAbstractTest { /** */ public static BinaryContext createTestBinaryContext() { - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null); + BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null, null); BinaryMarshaller marsh = new BinaryMarshaller(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java index 6ad44516653..b7f532efdc8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java @@ -66,7 +66,7 @@ public class GridBinaryCacheEntryMemorySizeSelfTest extends GridCacheEntryMemory marsh.setContext(marshCtx); - BinaryContext pCtx = new BinaryContext(iCfg.getIgniteInstanceName(), new NullLogger()); + BinaryContext pCtx = new BinaryContext(iCfg.getIgniteInstanceName(), iCfg.getBinaryConfiguration(), new NullLogger()); marsh.setBinaryContext(pCtx, iCfg); 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 697b9d1ddfe..4e5ed516f6d 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; - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null); + BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null, null); try (BinaryWriterEx writer = BinaryUtils.writer(ctx, BinaryStreams.outputStream(512), null)) { diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java index e7e0665948a..012d53914e3 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java @@ -100,7 +100,12 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract BinaryMarshaller marsh = new BinaryMarshaller(); - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), cfg.getIgniteInstanceName(), new NullLogger()); + BinaryContext ctx = new BinaryContext( + BinaryUtils.cachingMetadataHandler(), + cfg.getIgniteInstanceName(), + cfg.getBinaryConfiguration(), + new NullLogger() + ); marsh.setContext(new MarshallerContextTestImpl(null)); diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 1f2d793e495..b17db911372 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -2024,7 +2024,12 @@ public abstract class GridAbstractTest extends JUnitAssertAware { protected BinaryMarshaller createStandaloneBinaryMarshaller(IgniteConfiguration cfg) throws IgniteCheckedException { BinaryMarshaller marsh = new BinaryMarshaller(); - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), cfg.getIgniteInstanceName(), new NullLogger()); + BinaryContext ctx = new BinaryContext( + BinaryUtils.cachingMetadataHandler(), + cfg.getIgniteInstanceName(), + cfg.getBinaryConfiguration(), + new NullLogger() + ); marsh.setContext(new MarshallerContextTestImpl()); diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java index 3750e4f402e..a99de4a0243 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java @@ -75,7 +75,12 @@ public class GridTestBinaryMarshaller { } }); - BinaryContext ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), iCfg.getIgniteInstanceName(), new NullLogger()); + BinaryContext ctx = new BinaryContext( + BinaryUtils.cachingMetadataHandler(), + iCfg.getIgniteInstanceName(), + iCfg.getBinaryConfiguration(), + new NullLogger() + ); MarshallerContextTestImpl marshCtx = new MarshallerContextTestImpl(); diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java index d729dc0710b..7fd56fe3058 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java @@ -443,7 +443,12 @@ public class IgniteMock implements IgniteEx { if (ctx == null) { /** {@inheritDoc} */ - ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), configuration().getIgniteInstanceName(), new NullLogger()) { + ctx = new BinaryContext( + BinaryUtils.cachingMetadataHandler(), + configuration().getIgniteInstanceName(), + configuration().getBinaryConfiguration(), + new NullLogger() + ) { @Override public int typeId(String typeName) { return typeName.hashCode(); } diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java index 90960808746..a358858cbde 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java @@ -251,7 +251,7 @@ public class IgniteTestResources { marsh.setContext(new MarshallerContextTestImpl()); marsh.setBinaryContext( - new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, new NullLogger()), + new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null, new NullLogger()), new IgniteConfiguration() );
