This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new c0b14e28f89 IGNITE-25233 Make BinaryCachingMetadataHandler package
private (#12036)
c0b14e28f89 is described below
commit c0b14e28f890dcef628475cf9d5a083b49eb2d9e
Author: Nikolay <[email protected]>
AuthorDate: Thu Apr 24 10:46:49 2025 +0300
IGNITE-25233 Make BinaryCachingMetadataHandler package private (#12036)
---
.../ignite/internal/binary/BinaryCachingMetadataHandler.java | 4 ++--
.../main/java/org/apache/ignite/internal/binary/BinaryUtils.java | 7 +++++++
.../org/apache/ignite/internal/client/thin/TcpClientChannel.java | 4 ++--
.../org/apache/ignite/internal/client/thin/TcpIgniteClient.java | 5 ++---
.../org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java | 4 ++--
.../java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 3 +--
.../ignite/internal/processors/odbc/ClientListenerNioListener.java | 3 +--
.../ignite/internal/binary/BinaryFieldExtractionSelfTest.java | 2 +-
.../ignite/internal/binary/BinaryFieldsAbstractSelfTest.java | 2 +-
.../internal/binary/BinaryFooterOffsetsAbstractSelfTest.java | 2 +-
.../apache/ignite/internal/binary/BinaryMarshallerSelfTest.java | 4 ++--
.../internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java | 2 +-
.../ignite/internal/binary/RawBinaryObjectExtractorTest.java | 2 +-
.../org/apache/ignite/platform/PlatformGetInternalCachesTask.java | 4 ++--
.../org/apache/ignite/session/GridSessionCheckpointSelfTest.java | 4 ++--
.../org/apache/ignite/testframework/junits/GridAbstractTest.java | 3 +--
.../ignite/testframework/junits/GridTestBinaryMarshaller.java | 4 ++--
.../java/org/apache/ignite/testframework/junits/IgniteMock.java | 4 ++--
.../apache/ignite/testframework/junits/IgniteTestResources.java | 4 ++--
19 files changed, 35 insertions(+), 32 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryCachingMetadataHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryCachingMetadataHandler.java
index e15e64a820b..a76bb36ba2f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryCachingMetadataHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryCachingMetadataHandler.java
@@ -25,7 +25,7 @@ import org.apache.ignite.binary.BinaryType;
/**
* Simple caching metadata handler. Used mainly in tests.
*/
-public class BinaryCachingMetadataHandler implements BinaryMetadataHandler {
+class BinaryCachingMetadataHandler implements BinaryMetadataHandler {
/** Cached metadatas. */
private final HashMap<Integer, BinaryType> metas = new HashMap<>();
@@ -34,7 +34,7 @@ public class BinaryCachingMetadataHandler implements
BinaryMetadataHandler {
*
* @return New handler.
*/
- public static BinaryCachingMetadataHandler create() {
+ static BinaryCachingMetadataHandler create() {
return new BinaryCachingMetadataHandler();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 5e0ebf0f69e..10fd623734b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -2827,6 +2827,13 @@ public class BinaryUtils {
return new BinaryReaderExImpl(ctx, in, ldr, hnds, skipHdrCheck,
forUnmarshal);
}
+ /**
+ * @return Instance of caching handler.
+ */
+ public static BinaryMetadataHandler cachingMetadataHandler() {
+ return BinaryCachingMetadataHandler.create();
+ }
+
/**
* Enum type.
*/
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 3a58c91f5e2..0a5d12bb119 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
@@ -52,9 +52,9 @@ import org.apache.ignite.client.ClientReconnectedException;
import org.apache.ignite.client.events.ConnectionDescription;
import org.apache.ignite.configuration.ClientConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryReaderEx;
+import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
@@ -840,7 +840,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(BinaryCachingMetadataHandler.create(), new IgniteConfiguration(),
null);
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
null);
try (BinaryWriterExImpl writer = new BinaryWriterExImpl(ctx,
BinaryStreams.outputStream(32), null, null)) {
ProtocolContext protocolCtx =
protocolContextFromVersion(proposedVer);
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 40cbc82eabe..efaec485162 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
@@ -59,7 +59,6 @@ import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.ClientConfiguration;
import org.apache.ignite.configuration.ClientTransactionConfiguration;
import org.apache.ignite.internal.MarshallerPlatformIds;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryMetadata;
import org.apache.ignite.internal.binary.BinaryMetadataHandler;
import org.apache.ignite.internal.binary.BinaryRawWriterEx;
@@ -604,7 +603,7 @@ public class TcpIgniteClient implements IgniteClient {
*/
private class ClientBinaryMetadataHandler implements BinaryMetadataHandler
{
/** In-memory metadata cache. */
- private volatile BinaryMetadataHandler cache =
BinaryCachingMetadataHandler.create();
+ private volatile BinaryMetadataHandler cache =
BinaryUtils.cachingMetadataHandler();
/** {@inheritDoc} */
@Override public void addMeta(int typeId, BinaryType meta, boolean
failIfUnregistered)
@@ -747,7 +746,7 @@ public class TcpIgniteClient implements IgniteClient {
* Clear local cache on reconnect.
*/
void onReconnect() {
- cache = BinaryCachingMetadataHandler.create();
+ cache = BinaryUtils.cachingMetadataHandler();
}
}
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 1b25dc05b3a..b2ae2253864 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
@@ -77,12 +77,12 @@ import org.apache.ignite.client.ClientException;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.MarshallerPlatformIds;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.binary.BinaryMetadata;
import org.apache.ignite.internal.binary.BinaryMetadataHandler;
import org.apache.ignite.internal.binary.BinaryTypeImpl;
+import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.jdbc2.JdbcBlob;
import org.apache.ignite.internal.jdbc2.JdbcClob;
import org.apache.ignite.internal.jdbc2.JdbcUtils;
@@ -2473,7 +2473,7 @@ public class JdbcThinConnection implements Connection {
*/
private class JdbcBinaryMetadataHandler extends BlockingJdbcChannel
implements BinaryMetadataHandler {
/** In-memory metadata cache. */
- private final BinaryMetadataHandler cache =
BinaryCachingMetadataHandler.create();
+ private final BinaryMetadataHandler cache =
BinaryUtils.cachingMetadataHandler();
/** {@inheritDoc} */
@Override public void addMeta(int typeId, BinaryType meta, boolean
failIfUnregistered)
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 c4d0738e349..9b73cc111a8 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
@@ -39,7 +39,6 @@ import org.apache.ignite.cache.query.QueryCancelledException;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.MarshallerContextImpl;
import org.apache.ignite.internal.ThinProtocolFeature;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.binary.BinaryReaderEx;
@@ -270,7 +269,7 @@ public class JdbcThinTcpIo {
* @throws SQLException On connection reject.
*/
private HandshakeResult handshake(ClientListenerProtocolVersion ver)
throws IOException, SQLException {
- BinaryContext ctx = new
BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration(),
null);
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
null);
BinaryMarshaller marsh = new BinaryMarshaller();
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 6481aabba03..835247abcb4 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
@@ -29,7 +29,6 @@ import org.apache.ignite.failure.FailureContext;
import org.apache.ignite.failure.FailureType;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.MarshallerContextImpl;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.binary.BinaryReaderEx;
@@ -358,7 +357,7 @@ public class ClientListenerNioListener extends
GridNioServerListenerAdapter<Clie
* @param msg Message bytes.
*/
private void onHandshake(GridNioSession ses, ClientMessage msg) {
- BinaryContext ctx = new
BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration(),
null);
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
null);
BinaryMarshaller marsh = new BinaryMarshaller();
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 1288c687e6e..43dfa4f1c4b 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(BinaryCachingMetadataHandler.create(), new IgniteConfiguration(),
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
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 a9d5657a130..eca49bd53c3 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(BinaryCachingMetadataHandler.create(), new IgniteConfiguration(),
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
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 c338cddb43d..ebf80d30b28 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(BinaryCachingMetadataHandler.create(), new
IgniteConfiguration(), new NullLogger());
+ ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), new
IgniteConfiguration(), 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 82e7dd66082..a7d048f2c9a 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,7 @@ public class BinaryMarshallerSelfTest extends
AbstractBinaryArraysTest {
});
iCfg.setSystemViewExporterSpi(new JmxSystemViewExporterSpi());
- BinaryContext ctx = new
BinaryContext(BinaryCachingMetadataHandler.create(), iCfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), iCfg, new NullLogger());
BinaryMarshaller marsh = new BinaryMarshaller();
@@ -4227,7 +4227,7 @@ public class BinaryMarshallerSelfTest extends
AbstractBinaryArraysTest {
});
iCfg.setSystemViewExporterSpi(new JmxSystemViewExporterSpi());
- BinaryContext ctx = new
BinaryContext(BinaryCachingMetadataHandler.create(), iCfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), iCfg, 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 68638a50929..964d8b8ad2f 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
@@ -49,7 +49,7 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends
GridCommonAbstractT
IgniteConfiguration cfg = new IgniteConfiguration();
- BinaryContext ctx = new
BinaryContext(BinaryCachingMetadataHandler.create(), cfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), cfg, new NullLogger());
marsh.setBinaryContext(ctx, cfg);
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 8112d4ba9c6..e9365a0d4bb 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
@@ -78,7 +78,7 @@ public class RawBinaryObjectExtractorTest extends
GridCommonAbstractTest {
/** */
public static BinaryContext createTestBinaryContext() {
- BinaryContext ctx = new
BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration(),
null);
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
null);
BinaryMarshaller marsh = new BinaryMarshaller();
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 35b776cbc15..c7ce8b72710 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
@@ -29,8 +29,8 @@ import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeTaskAdapter;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
+import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.streams.BinaryStreams;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
@@ -69,7 +69,7 @@ public class PlatformGetInternalCachesTask extends
ComputeTaskAdapter<Object, by
@Override public byte[] execute() {
IgniteEx ign = (IgniteEx)ignite;
- BinaryContext ctx = new
BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration(),
null);
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
null);
try (BinaryWriterExImpl writer
= new BinaryWriterExImpl(ctx,
BinaryStreams.outputStream(512), null, 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 dc0a0aa80da..90fa43d26b4 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
@@ -19,9 +19,9 @@ package org.apache.ignite.session;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.spi.checkpoint.cache.CacheCheckpointSpi;
@@ -100,7 +100,7 @@ public class GridSessionCheckpointSelfTest extends
GridSessionCheckpointAbstract
BinaryMarshaller marsh = new BinaryMarshaller();
- BinaryContext ctx = new
BinaryContext(BinaryCachingMetadataHandler.create(), cfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), cfg, 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 1217af631ef..1695538f97d 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
@@ -82,7 +82,6 @@ import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.IgnitionEx;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.binary.BinaryUtils;
@@ -2025,7 +2024,7 @@ public abstract class GridAbstractTest extends
JUnitAssertAware {
protected BinaryMarshaller
createStandaloneBinaryMarshaller(IgniteConfiguration cfg) throws
IgniteCheckedException {
BinaryMarshaller marsh = new BinaryMarshaller();
- BinaryContext ctx = new
BinaryContext(BinaryCachingMetadataHandler.create(), cfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), cfg, 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 99997c37bf1..08387b580fa 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
@@ -23,10 +23,10 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.binary.BinaryObjectImpl;
+import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import
org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -76,7 +76,7 @@ public class GridTestBinaryMarshaller {
}
});
- BinaryContext ctx = new
BinaryContext(BinaryCachingMetadataHandler.create(), iCfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), iCfg, 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 c7da76ad64d..7a87fcd367e 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
@@ -62,9 +62,9 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.binary.builder.BinaryObjectBuilders;
import org.apache.ignite.internal.cluster.IgniteClusterEx;
import org.apache.ignite.internal.management.IgniteCommandRegistry;
@@ -442,7 +442,7 @@ public class IgniteMock implements IgniteEx {
if (ctx == null) {
/** {@inheritDoc} */
- ctx = new BinaryContext(BinaryCachingMetadataHandler.create(),
configuration(), new NullLogger()) {
+ ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(),
configuration(), 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 7a4f6e05a04..f91c062cb87 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
@@ -28,9 +28,9 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.SensitiveInfoTestLoggerProxy;
-import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.logger.NullLogger;
@@ -251,7 +251,7 @@ public class IgniteTestResources {
marsh.setContext(new MarshallerContextTestImpl());
marsh.setBinaryContext(
- new BinaryContext(BinaryCachingMetadataHandler.create(), new
IgniteConfiguration(), new NullLogger()),
+ new BinaryContext(BinaryUtils.cachingMetadataHandler(), new
IgniteConfiguration(), new NullLogger()),
new IgniteConfiguration()
);
