IGNITE-15083 Remove explicit call of setMarshaller for binary marshal…

…ler (apache#11750)
luchnikovbsk · Jan 31, 2025 · 4c148f3 · 4c148f3
1 parent 738907c
commit 4c148f3
Show file tree

Hide file tree

Showing 93 changed files with 5 additions and 464 deletions.
diff --git a/...st/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java b/...st/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java
@@ -18,8 +18,6 @@
 package org.apache.ignite.internal.jdbc2;
 
 import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 
 /**
  * JDBC test of INSERT statement w/binary marshaller - no nodes know about classes.
@@ -30,11 +28,6 @@ public class JdbcBinaryMarshallerInsertStatementSelfTest extends JdbcInsertState
         return BASE_URL_BIN;
     }
 
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
-        return super.getConfiguration(igniteInstanceName).setMarshaller(new BinaryMarshaller());
-    }
-
     /** {@inheritDoc} */
     @Override CacheConfiguration cacheConfig() {
         return binaryCacheConfig();

diff --git a/...est/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java b/...est/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java
@@ -18,8 +18,6 @@
 package org.apache.ignite.internal.jdbc2;
 
 import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 
 /**
  * JDBC test of MERGE statement w/binary marshaller - no nodes know about classes.
@@ -30,11 +28,6 @@ public class JdbcBinaryMarshallerMergeStatementSelfTest extends JdbcMergeStateme
         return BASE_URL_BIN;
     }
 
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
-        return super.getConfiguration(igniteInstanceName).setMarshaller(new BinaryMarshaller());
-    }
-
     /** {@inheritDoc} */
     @Override CacheConfiguration cacheConfig() {
         return binaryCacheConfig();

diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java
@@ -23,7 +23,6 @@
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import javax.sql.DataSource;
-import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteComponentType;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.IgniteKernal;
@@ -47,15 +46,6 @@ public class JdbcSpringSelfTest extends JdbcConnectionSelfTest {
         return "modules/clients/src/test/config/jdbc-config-cache-store.xml";
     }
 
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-        cfg.setMarshaller(null); // In this test we are using default Marshaller.
-
-        return cfg;
-    }
-
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsWithSpringCtx(GRID_CNT, false, configURL());

diff --git a/...ients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java b/...ients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
@@ -30,7 +30,6 @@
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.ConnectorConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.F;
 
 import static java.nio.charset.StandardCharsets.UTF_16;
@@ -106,8 +105,6 @@ private IgniteConfiguration getConfiguration0(String igniteInstanceName) throws
     IgniteConfiguration getBinaryConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = getConfiguration0(igniteInstanceName);
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         CacheConfiguration ccfg = cfg.getCacheConfiguration()[0];
 
         ccfg.getQueryEntities().clear();

diff --git a/...nts/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java b/...nts/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java
@@ -25,7 +25,6 @@
 import org.apache.ignite.configuration.DataRegionConfiguration;
 import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.junit.Test;
@@ -46,8 +45,6 @@ public class JdbcThinAuthenticateConnectionSelfTest extends JdbcThinAbstractSelf
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         cfg.setAuthenticationEnabled(true);
 
         cfg.setDataStorageConfiguration(new DataStorageConfiguration()

diff --git a/...s/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionAdditionalSecurityTest.java b/...s/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionAdditionalSecurityTest.java
@@ -28,7 +28,6 @@
 import javax.net.ssl.SSLContext;
 import org.apache.ignite.configuration.ClientConnectorConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.processors.security.impl.TestAdditionalSecurityPluginProvider;
 import org.apache.ignite.internal.processors.security.impl.TestSecurityData;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -72,8 +71,6 @@ public class JdbcThinConnectionAdditionalSecurityTest extends JdbcThinAbstractSe
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         cfg.setPluginProviders(new TestAdditionalSecurityPluginProvider("srv_" + igniteInstanceName, null, ALL_PERMISSIONS,
             false, true, clientData()));
 

diff --git a/...ts/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionMultipleAddressesTest.java b/...ts/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionMultipleAddressesTest.java
@@ -29,7 +29,6 @@
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.ClientConnectorConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.jdbc.thin.JdbcThinConnection;
 import org.apache.ignite.internal.processors.odbc.ClientListenerProcessor;
 import org.apache.ignite.internal.util.lang.GridAbsPredicate;
@@ -72,8 +71,6 @@ private static String url() {
 
         cfg.setCacheConfiguration(cacheConfiguration(DEFAULT_CACHE_NAME));
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         cfg.setClientConnectorConfiguration(
             new ClientConnectorConfiguration()
                 .setPort(jdbcPorts.get(getTestIgniteInstanceIndex(name))));

diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSSLTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSSLTest.java
@@ -30,7 +30,6 @@
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.configuration.ClientConnectorConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.ssl.SslContextFactory;
 import org.apache.ignite.testframework.GridTestUtils;
@@ -85,8 +84,6 @@ public class JdbcThinConnectionSSLTest extends JdbcThinAbstractSelfTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         cfg.setClientConnectorConfiguration(
             new ClientConnectorConfiguration()
                 .setSslEnabled(true)

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
@@ -110,9 +110,6 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setCacheConfiguration(cacheConfiguration(DEFAULT_CACHE_NAME));
-
-        cfg.setMarshaller(new BinaryMarshaller());
-
         cfg.setGridLogger(new GridStringLogger());
 
         return cfg;

diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
@@ -39,11 +39,11 @@
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.ClientConnectorConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.jdbc.thin.JdbcThinConnection;
 import org.apache.ignite.internal.jdbc.thin.JdbcThinTcpIo;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.junit.Test;
+
 import static org.apache.ignite.cache.query.SqlFieldsQuery.DFLT_LAZY;
 
 /**
@@ -58,8 +58,6 @@ public class JdbcThinDataSourceSelfTest extends JdbcThinAbstractSelfTest {
 
         cfg.setCacheConfiguration(cacheConfiguration(DEFAULT_CACHE_NAME));
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         return cfg;
     }
 

diff --git a/.../src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java b/.../src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java
@@ -37,9 +37,7 @@
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.ConnectorConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
@@ -153,19 +151,12 @@ protected Connection getConnection() throws SQLException {
 
         cfg.setCacheConfiguration(cacheConfiguration());
 
-        cfg.setMarshaller(marshaller());
-
         ConnectorConfiguration connCfg = new ConnectorConfiguration();
         cfg.setConnectorConfiguration(connCfg);
 
         return cfg;
     }
 
-    /**
-     * @return Marshaller to be used in test.
-     */
-    protected abstract Marshaller marshaller();
-
     /**
      * @return Types to be used in test.
      */
@@ -486,8 +477,6 @@ public void testLoadCachePrimitiveKeysTx() throws Exception {
      * @throws Exception If failed.
      */
     private void checkPutRemove() throws Exception {
-        boolean binaryMarshaller = marshaller() instanceof BinaryMarshaller || marshaller() == null;
-
         IgniteCache<Object, Person> c1 = grid().cache(CACHE_NAME);
 
         Connection conn = getConnection();
@@ -521,8 +510,7 @@ private void checkPutRemove() throws Exception {
             assertEquals(testDate, rs.getDate(3));
             assertEquals("Person-to-test-put-insert", rs.getString(4));
 
-            assertEquals(testGender.toString(),
-                binaryMarshaller ? Gender.values()[rs.getInt(5)].toString() : rs.getString(5));
+            assertEquals(testGender.toString(), Gender.values()[rs.getInt(5)].toString());
 
             assertFalse("Unexpected more data in result set", rs.next());
 
@@ -542,8 +530,7 @@ private void checkPutRemove() throws Exception {
             assertEquals(testDate, rs.getDate(3));
             assertEquals("Person-to-test-put-update", rs.getString(4));
 
-            assertEquals(testGender.toString(),
-                binaryMarshaller ? Gender.values()[rs.getInt(5)].toString() : rs.getString(5));
+            assertEquals(testGender.toString(), Gender.values()[rs.getInt(5)].toString());
 
             assertFalse("Unexpected more data in result set", rs.next());
 

diff --git a/...t/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreBinaryMarshallerSelfTest.java b/...t/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreBinaryMarshallerSelfTest.java
@@ -17,19 +17,12 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.internal.binary.BinaryMarshaller;
-import org.apache.ignite.marshaller.Marshaller;
 import org.junit.Test;
 
 /**
  * Test for {@link CacheJdbcPojoStore} with binary marshaller.
  */
 public class CacheJdbcPojoStoreBinaryMarshallerSelfTest extends CacheJdbcPojoStoreAbstractSelfTest {
-    /** {@inheritDoc} */
-    @Override protected Marshaller marshaller() {
-        return new BinaryMarshaller();
-    }
-
     /**
      * @throws Exception If failed.
      */

diff --git a/...rc/test/java/org/apache/ignite/internal/GridComputationBinarylizableClosuresSelfTest.java b/...rc/test/java/org/apache/ignite/internal/GridComputationBinarylizableClosuresSelfTest.java
@@ -27,8 +27,6 @@
 import org.apache.ignite.binary.Binarylizable;
 import org.apache.ignite.compute.ComputeJobMasterLeaveAware;
 import org.apache.ignite.compute.ComputeTaskSession;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.lang.IgniteCallable;
 import org.apache.ignite.lang.IgniteClosure;
 import org.apache.ignite.lang.IgniteRunnable;
@@ -39,14 +37,6 @@
  * Test ensuring that correct closures are serialized.
  */
 public class GridComputationBinarylizableClosuresSelfTest extends GridCommonAbstractTest {
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
-        cfg.setMarshaller(new BinaryMarshaller());
-
-        return cfg;
-    }
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {

diff --git a/.../src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java b/.../src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
@@ -63,8 +63,6 @@ public class BinaryArrayIdentityResolverSelfTest extends GridCommonAbstractTest
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         BinaryConfiguration binCfg = new BinaryConfiguration();
 
         BinaryTypeConfiguration binTypCfg1 = new BinaryTypeConfiguration();

diff --git a/...c/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java b/...c/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java
@@ -46,8 +46,6 @@ public class BinaryConfigurationConsistencySelfTest extends GridCommonAbstractTe
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         cfg.setBinaryConfiguration(binaryCfg);
 
         return cfg;

diff --git a/...t/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java b/...t/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
@@ -52,8 +52,6 @@ public class BinaryConfigurationCustomSerializerSelfTest extends GridCommonAbstr
 
         cfg.setConnectorConfiguration(new ConnectorConfiguration());
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         BinaryConfiguration binaryCfg = new BinaryConfiguration();
 
         BinaryTypeConfiguration btc = new BinaryTypeConfiguration("org.MyClass");

diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
@@ -112,8 +112,6 @@ public class BinaryEnumsSelfTest extends AbstractBinaryArraysTest {
             cfg.setBinaryConfiguration(bCfg);
         }
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
         ccfg.setName(CACHE_NAME);
         ccfg.setCacheMode(CacheMode.PARTITIONED);

diff --git a/...rc/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java b/...rc/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
@@ -97,8 +97,6 @@ public class BinaryObjectBuilderAdditionalSelfTest extends AbstractBinaryArraysT
 
         bCfg.setClassNames(Arrays.asList("org.apache.ignite.internal.binary.mutabletest.*"));
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         return cfg;
     }
 

diff --git a/...est/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java b/...est/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
@@ -88,8 +88,6 @@ public class BinaryObjectBuilderDefaultMappersSelfTest extends AbstractBinaryArr
 
         cfg.setBinaryConfiguration(bCfg);
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         this.cfg = cfg;
 
         return cfg;

diff --git a/...s/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java b/...s/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
@@ -48,8 +48,6 @@ public class BinaryObjectExceptionSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        cfg.setMarshaller(new BinaryMarshaller());
-
         cfg.setCacheConfiguration(
             new CacheConfiguration(cacheName)
                 .setCopyOnRead(true)

diff --git a/...es/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectToStringSelfTest.java b/...es/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectToStringSelfTest.java
@@ -25,7 +25,6 @@
 import java.util.Map;
 import org.apache.ignite.IgniteSystemProperties;
 import org.apache.ignite.binary.BinaryObject;
-import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
@@ -35,15 +34,6 @@
  * Tests for {@code BinaryObject.toString()}.
  */
 public class BinaryObjectToStringSelfTest extends GridCommonAbstractTest {
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
-        cfg.setMarshaller(new BinaryMarshaller());
-
-        return cfg;
-    }
-
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         startGrid();

diff --git a/...c/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java b/...c/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
@@ -24,7 +24,6 @@
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.ignite.binary.BinaryObjectBuilder;
-import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.util.GridConcurrentHashSet;
 import org.apache.ignite.internal.util.GridUnsafe;
 import org.apache.ignite.internal.util.typedef.F;
@@ -66,15 +65,6 @@ public class BinarySerialiedFieldComparatorSelfTest extends GridCommonAbstractTe
         super.afterTest();
     }
 
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
-        cfg.setMarshaller(new BinaryMarshaller());
-
-        return cfg;
-    }
-
     /**
      * Test byte fields.
      *
-Original file line number
+Diff line change
@@ Expand Up @@
             bCfg.setClassNames(Arrays.asList("org.apache.ignite.internal.binary.mutabletest.*"));
-            cfg.setMarshaller(new BinaryMarshaller());
             return cfg;
         }
@@ Expand Down @@