IGNITE-15803 Remove setMarshaller from tests (#11938)

Author: nizhikov

modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java

@@ -60,7 +60,6 @@
 import org.apache.ignite.cache.store.jdbc.dialect.OracleDialect;
 import org.apache.ignite.cache.store.jdbc.dialect.SQLServerDialect;
 import org.apache.ignite.internal.binary.BinaryEnumObjectImpl;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.typedef.C1;
 import org.apache.ignite.internal.util.typedef.F;
@@ -543,33 +542,13 @@ private void checkTypeConfiguration(@Nullable String cacheName, TypeKind kind, S
 
     /**
      * @param type Type name to check.
-     * @param binarySupported True if binary marshaller enable.
      * @return {@code True} if class not found.
      */
-    protected TypeKind kindForName(String type, boolean binarySupported) {
+    protected TypeKind kindForName(String type) {
         if (BUILT_IN_TYPES.contains(type))
             return TypeKind.BUILT_IN;
 
-        if (binarySupported)
-            return TypeKind.BINARY;
-
-        try {
-            Class.forName(type);
-
-            return TypeKind.POJO;
-        }
-        catch (ClassNotFoundException e) {
-            throw new CacheException("Failed to find class " + type +
-                " (make sure the class is present in classPath or use BinaryMarshaller)", e);
-        }
-    }
-
-    /**
-     * @param type Type name to check.
-     * @return {@code True} if class not found.
-     */
-    protected TypeKind kindForName(String type) {
-        return kindForName(type, ignite.configuration().getMarshaller() instanceof BinaryMarshaller);
+        return TypeKind.BINARY;
     }
 
     /**
@@ -600,13 +579,11 @@ private Map<Object, EntryMapping> getOrCreateCacheMappings(@Nullable String cach
             entryMappings = U.newHashMap(cacheTypes.size());
 
             if (!cacheTypes.isEmpty()) {
-                boolean binarySupported = ignite.configuration().getMarshaller() instanceof BinaryMarshaller;
-
                 for (JdbcType type : cacheTypes) {
                     String keyType = type.getKeyType();
                     String valType = type.getValueType();
 
-                    TypeKind keyKind = kindForName(keyType, binarySupported);
+                    TypeKind keyKind = kindForName(keyType);
 
                     checkTypeConfiguration(cacheName, keyKind, keyType, type.getKeyFields());
 
@@ -616,7 +593,7 @@ private Map<Object, EntryMapping> getOrCreateCacheMappings(@Nullable String cach
                         throw new CacheException("Key type must be unique in type metadata [cache=" +
                             U.maskName(cacheName) + ", type=" + keyType + "]");
 
-                    TypeKind valKind = kindForName(valType, binarySupported);
+                    TypeKind valKind = kindForName(valType);
 
                     checkTypeConfiguration(cacheName, valKind, valType, type.getValueFields());
 

modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/JavaObjectKeySerializer.java

@@ -38,8 +38,18 @@ public class JavaObjectKeySerializer {
      * @param cfg Ignite configuration.
      */
     public JavaObjectKeySerializer(IgniteConfiguration cfg) {
-        marshaller = cfg.getMarshaller();
-        clsLdr = U.resolveClassLoader(cfg);
+        this(U.resolveClassLoader(cfg), cfg.getMarshaller());
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param marshaller Marshaller.
+     * @param clsLdr Class loader.
+     */
+    public JavaObjectKeySerializer(ClassLoader clsLdr, Marshaller marshaller) {
+        this.clsLdr = clsLdr;
+        this.marshaller = marshaller;
     }
 
     /** */

modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java

@@ -30,7 +30,6 @@
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -229,10 +228,7 @@ public SharedFsCheckpointSpi setDirectoryPaths(Collection<String> dirPaths) {
 
         this.igniteInstanceName = igniteInstanceName;
 
-        if (ignite.configuration().getMarshaller() instanceof BinaryMarshaller)
-            marsh = ((IgniteEx)ignite).context().marshallerContext().jdkMarshaller();
-        else
-            marsh = ignite.configuration().getMarshaller();
+        marsh = ((IgniteEx)ignite).context().marshallerContext().jdkMarshaller();
 
         folder = getNextSharedPath();
 

modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java

@@ -23,7 +23,6 @@
 import org.apache.ignite.configuration.ConnectorConfiguration;
 import org.apache.ignite.configuration.ConnectorMessageInterceptor;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.lifecycle.LifecycleAware;
 import org.apache.ignite.lifecycle.LifecycleBean;
 import org.apache.ignite.lifecycle.LifecycleEventType;
@@ -102,30 +101,6 @@ private static class TestLifecycleBean extends TestLifecycleAware implements Lif
         }
     }
 
-    /**
-     */
-    private static class TestMarshaller extends BinaryMarshaller implements LifecycleAware {
-        /** */
-        private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(null);
-
-        /** {@inheritDoc} */
-        @Override public void start() {
-            lifecycleAware.start();
-        }
-
-        /** {@inheritDoc} */
-        @Override public void stop() {
-            lifecycleAware.stop();
-        }
-
-        /**
-         * @return Lifecycle aware.
-         */
-        TestLifecycleAware lifecycleAware() {
-            return lifecycleAware;
-        }
-    }
-
     /**
      */
     private static class TestLogger extends JavaLogger implements LifecycleAware {
@@ -182,12 +157,6 @@ TestLifecycleAware lifecycleAware() {
 
         lifecycleAwares.add(lifecycleBean);
 
-        TestMarshaller marshaller = new TestMarshaller();
-
-        cfg.setMarshaller(marshaller);
-
-        lifecycleAwares.add(marshaller.lifecycleAware());
-
         TestLogger testLog = new TestLogger();
 
         cfg.setGridLogger(testLog);

modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySimpleNameTestPropertySelfTest.java

@@ -20,8 +20,6 @@
 import org.apache.ignite.IgniteBinary;
 import org.apache.ignite.binary.BinaryObject;
 import org.apache.ignite.binary.BinaryObjectBuilder;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.marshaller.jdk.JdkMarshaller;
 import org.apache.ignite.testframework.config.GridTestProperties;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
@@ -32,19 +30,6 @@
  * Tests testing framewrok, epecially BINARY_MARSHALLER_USE_SIMPLE_NAME_MAPPER test property.
  */
 public class BinarySimpleNameTestPropertySelfTest extends GridCommonAbstractTest {
-    /**
-     * flag for facade disabled test. As we use binary marshaller by default al
-     */
-    private boolean enableJdkMarshaller;
-
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
-        final IgniteConfiguration configuration = super.getConfiguration(igniteInstanceName);
-        if (enableJdkMarshaller)
-            configuration.setMarshaller(new JdkMarshaller());
-        return configuration;
-    }
-
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         super.afterTest();
@@ -77,16 +62,6 @@ public void testPropertyDisabled() throws Exception {
         checkProperty("org.ignite.test.TestClass");
     }
 
-    /**
-     * Check if Binary facade is disabled test. Test uses JDK marshaller to provide warranty facade is not available
-     * @throws Exception If failed.
-     */
-    @Test
-    public void testBinaryDisabled() throws Exception {
-        enableJdkMarshaller = true;
-        assertNull(startGrid().binary());
-    }
-
     /**
      * @param expTypeName Type name.
      * @throws Exception If failed.

modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java

@@ -28,7 +28,6 @@
 import org.apache.ignite.internal.GridTopic;
 import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.marshaller.jdk.JdkMarshaller;
 import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageReader;
 import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -72,7 +71,6 @@ public GridIoManagerSelfTest() throws IgniteCheckedException {
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         ctx.config().setCommunicationSpi(new TcpCommunicationSpi());
-        ctx.config().setMarshaller(new JdkMarshaller());
 
         // Turn off peer class loading to simplify mocking.
         ctx.config().setPeerClassLoadingEnabled(false);

modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java

@@ -21,7 +21,6 @@
 import org.apache.ignite.internal.GridComponent;
 import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
 import org.apache.ignite.lang.IgniteFuture;
-import org.apache.ignite.marshaller.jdk.JdkMarshaller;
 import org.apache.ignite.spi.IgniteSpiContext;
 import org.apache.ignite.spi.IgniteSpiException;
 import org.apache.ignite.spi.deployment.DeploymentListener;
@@ -46,7 +45,6 @@ public void testOnKernalStop() throws Exception {
 
         GridTestKernalContext ctx = newContext();
 
-        ctx.config().setMarshaller(new JdkMarshaller());
         ctx.config().setDeploymentSpi(spi);
 
         GridResourceProcessor resProc = new GridResourceProcessor(ctx);

modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java

@@ -17,42 +17,21 @@
 
 package org.apache.ignite.internal.marshaller.optimized;
 
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.MarshallerContextTestImpl;
-import org.apache.ignite.testframework.junits.GridTestKernalContext;
-import org.apache.ignite.testframework.junits.logger.GridTestLog4jLogger;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-
 /**
  *
  */
-public class OptimizedMarshallerEnumSelfTest {
-    /** */
-    private String igniteHome = System.getProperty("user.dir");
-
-    /** */
-    private final IgniteLogger rootLog = new GridTestLog4jLogger(false);
+public class OptimizedMarshallerEnumSelfTest extends GridCommonAbstractTest {
 
     /**
      * @throws Exception If failed.
      */
     @Test
     public void testEnumSerialisation() throws Exception {
-        OptimizedMarshaller marsh = new OptimizedMarshaller();
-
-        MarshallerContextTestImpl ctx = new MarshallerContextTestImpl();
-
-        ctx.setMarshallerMappingFileStoreDir(new SharedFileTree(U.defaultWorkDirectory()).marshaller());
-        ctx.onMarshallerProcessorStarted(newContext(), null);
-
-        marsh.setContext(ctx);
+        Marshaller marsh = initTestMarshallerContext(new OptimizedMarshaller());
 
         byte[] bytes = marsh.marshal(TestEnum.Bond);
 
@@ -62,16 +41,6 @@ public void testEnumSerialisation() throws Exception {
         assertEquals(TestEnum.Bond.desc, unmarshalled.desc);
     }
 
-    /** */
-    private GridKernalContext newContext() throws IgniteCheckedException {
-        IgniteConfiguration cfg = new IgniteConfiguration();
-
-        cfg.setIgniteHome(igniteHome);
-        cfg.setClientMode(false);
-
-        return new GridTestKernalContext(rootLog.getLogger(OptimizedMarshallerEnumSelfTest.class), cfg);
-    }
-
     /** */
     private enum TestEnum {
         /** */