IGNITE-15803 Remove most of BinaryMarshaller from tests

modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java

@@ -47,6 +47,7 @@
 import org.apache.ignite.events.Event;
 import org.apache.ignite.events.EventType;
 import org.apache.ignite.failure.FailureHandler;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
 import org.apache.ignite.internal.processors.odbc.ClientListenerProcessor;
 import org.apache.ignite.internal.util.typedef.internal.A;
@@ -333,7 +334,7 @@ public class IgniteConfiguration {
     private UUID nodeId;
 
     /** Marshaller. */
-    private Marshaller marsh;
+    private Marshaller marsh = new BinaryMarshaller();
 
     /** Marshal local jobs. */
     private boolean marshLocJobs = DFLT_MARSHAL_LOCAL_JOBS;
@@ -1417,8 +1418,6 @@ public Marshaller getMarshaller() {
      */
     @Deprecated
     public IgniteConfiguration setMarshaller(Marshaller marsh) {
-        this.marsh = marsh;
-
         return this;
     }
 

modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java

@@ -1521,21 +1521,17 @@ private void checkPhysicalRam() {
 
     /** */
     private void initializeMarshaller() {
-        Marshaller marsh = ctx.config().getMarshaller();
-
-        if (marsh == null) {
-            if (!BinaryMarshaller.available()) {
-                U.warn(log, "Standard BinaryMarshaller can't be used on this JVM. " +
-                    "Switch to HotSpot JVM or reach out Apache Ignite community for recommendations.");
+        if (!BinaryMarshaller.available()) {
+            String errMsg = "Standard BinaryMarshaller can't be used on this JVM. " +
+                "Switch to HotSpot JVM or reach out Apache Ignite community for recommendations.";
 
-                marsh = ctx.marshallerContext().jdkMarshaller();
-            }
-            else
-                marsh = new BinaryMarshaller();
+            U.warn(log, errMsg);
 
-            ctx.config().setMarshaller(marsh);
+            throw new IgniteException(errMsg);
         }
 
+        Marshaller marsh = ctx.config().getMarshaller();
+
         marsh.setContext(ctx.marshallerContext());
 
         MarshallerUtils.setNodeName(marsh, ctx.igniteInstanceName());
@@ -1558,9 +1554,6 @@ private void suggestOptimizations(IgniteConfiguration cfg) {
 
         if (cfg.getIncludeEventTypes() != null && cfg.getIncludeEventTypes().length != 0)
             perf.add("Disable grid events (remove 'includeEventTypes' from configuration)");
-
-        if (BinaryMarshaller.available() && (cfg.getMarshaller() != null && !(cfg.getMarshaller() instanceof BinaryMarshaller)))
-            perf.add("Use default binary marshaller (do not set 'marshaller' explicitly)");
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java

@@ -39,7 +39,6 @@
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.LongJVMPauseDetector;
 import org.apache.ignite.internal.MarshallerContextImpl;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.cache.query.index.IndexProcessor;
 import org.apache.ignite.internal.cache.transform.CacheObjectTransformerProcessor;
 import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager;
@@ -102,7 +101,6 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.worker.WorkersRegistry;
 import org.apache.ignite.maintenance.MaintenanceRegistry;
-import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.marshaller.MarshallerUtils;
 import org.apache.ignite.plugin.PluginNotFoundException;
 import org.apache.ignite.plugin.PluginProvider;
@@ -256,17 +254,14 @@ protected IgniteConfiguration prepareIgniteConfiguration() {
         cfg.setDiscoverySpi(new StandaloneNoopDiscoverySpi());
         cfg.setCommunicationSpi(new StandaloneNoopCommunicationSpi());
 
-        final Marshaller marshaller = new BinaryMarshaller();
-        cfg.setMarshaller(marshaller);
-
         final DataStorageConfiguration pstCfg = new DataStorageConfiguration();
         final DataRegionConfiguration regCfg = new DataRegionConfiguration();
         regCfg.setPersistenceEnabled(true);
         pstCfg.setDefaultDataRegionConfiguration(regCfg);
 
         cfg.setDataStorageConfiguration(pstCfg);
 
-        marshaller.setContext(marshallerCtx);
+        cfg.getMarshaller().setContext(marshallerCtx);
 
         cfg.setMetricExporterSpi(new NoopMetricExporterSpi());
         cfg.setSystemViewExporterSpi(new JmxSystemViewExporterSpi());

modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java

@@ -73,15 +73,7 @@ public PlatformCppConfigurationClosure(long envPtr) {
         // Check marshaller
         Marshaller marsh = igniteCfg.getMarshaller();
 
-        if (marsh == null) {
-            igniteCfg.setMarshaller(new BinaryMarshaller());
-
-            cppCfg0.warnings(Collections.singleton("Marshaller is automatically set to " +
-                BinaryMarshaller.class.getName() + " (other nodes must have the same marshaller type)."));
-        }
-        else if (!(marsh instanceof BinaryMarshaller))
-            throw new IgniteException("Unsupported marshaller (only " + BinaryMarshaller.class.getName() +
-                " can be used when running Apache Ignite C++): " + marsh.getClass().getName());
+        assert marsh != null;
 
         BinaryConfiguration bCfg = igniteCfg.getBinaryConfiguration();
 

modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java

@@ -18,14 +18,11 @@
 package org.apache.ignite.internal.processors.platform.dotnet;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import org.apache.ignite.IgniteException;
-import org.apache.ignite.configuration.BinaryConfiguration;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.PlatformConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.binary.BinaryRawWriterEx;
 import org.apache.ignite.internal.binary.BinaryReaderExImpl;
 import org.apache.ignite.internal.binary.GridBinaryMarshaller;
@@ -39,7 +36,6 @@
 import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lifecycle.LifecycleBean;
-import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.platform.dotnet.PlatformDotNetAffinityFunction;
 import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration;
 import org.apache.ignite.platform.dotnet.PlatformDotNetLifecycleBean;
@@ -108,32 +104,6 @@ public PlatformDotNetConfigurationClosure(long envPtr, boolean useLogger) {
 
         // Callback to .Net.
         prepare(igniteCfg, dotNetCfg0);
-
-        // Make sure binary config is right.
-        setBinaryConfiguration(igniteCfg, dotNetCfg0);
-    }
-
-    /**
-     * Sets binary config.
-     *
-     * @param igniteCfg Ignite config.
-     * @param dotNetCfg .NET config.
-     */
-    private void setBinaryConfiguration(IgniteConfiguration igniteCfg, PlatformDotNetConfigurationEx dotNetCfg) {
-        // Check marshaller.
-        Marshaller marsh = igniteCfg.getMarshaller();
-
-        if (marsh == null) {
-            igniteCfg.setMarshaller(new BinaryMarshaller());
-
-            dotNetCfg.warnings(Collections.singleton("Marshaller is automatically set to " +
-                BinaryMarshaller.class.getName() + " (other nodes must have the same marshaller type)."));
-        }
-        else if (!(marsh instanceof BinaryMarshaller))
-            throw new IgniteException("Unsupported marshaller (only " + BinaryMarshaller.class.getName() +
-                " can be used when running Apache Ignite.NET): " + marsh.getClass().getName());
-
-        BinaryConfiguration bCfg = igniteCfg.getBinaryConfiguration();
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java

@@ -30,41 +30,8 @@
  * <p>
  * Ignite provides the following {@code Marshaller} implementations:
  * <ul>
- * <li>Default binary marshaller. Will be used when no other marshaller is explicitly set to the
- * configuration. For more information, see {@link IgniteBinary}.</li>
- * <li>{@link org.apache.ignite.marshaller.jdk.JdkMarshaller}</li>
+ * <li>Default binary marshaller. For more information, see {@link IgniteBinary}.</li>
  * </ul>
- * <p>
- * Below are examples of marshaller configuration, usage, and injection into tasks, jobs,
- * and SPI's.
- * <h2 class="header">Java Example</h2>
- * {@code Marshaller} can be explicitly configured in code.
- * <pre name="code" class="java">
- * JdkMarshaller marshaller = new JdkMarshaller();
- *
- * IgniteConfiguration cfg = new IgniteConfiguration();
- *
- * // Override marshaller.
- * cfg.setMarshaller(marshaller);
- *
- * // Starts grid.
- * G.start(cfg);
- * </pre>
- * <h2 class="header">Spring Example</h2>
- * Marshaller can be configured from Spring XML configuration file:
- * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
- *     ...
- *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.apache.ignite.marshaller.jdk.JdkMarshaller"/&gt;
- *     &lt;/property&gt;
- *     ...
- * &lt;/bean&gt;
- * </pre>
- * <p>
- * <img src="http://ignite.apache.org/images/spring-small.png">
- * <br>
- * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
  */
 public interface Marshaller {
     /**

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/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java → modules/core/src/test/java/org/apache/ignite/internal/NodeFailoverTest.java

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.internal.marshaller.optimized;
+package org.apache.ignite.internal;
 
-import java.io.File;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
@@ -26,9 +25,6 @@
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
@@ -39,21 +35,14 @@
 /**
  *
  */
-public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest {
+public class NodeFailoverTest extends GridCommonAbstractTest {
     /** */
     private boolean cache;
 
-    /** */
-    private String workDir;
-
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        cfg.setMarshaller(new OptimizedMarshaller());
-
-        cfg.setWorkDirectory(workDir);
-
         if (cache) {
             CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
 
@@ -128,63 +117,6 @@ private void classCacheUpdateFailover(boolean stopSrv) throws Exception {
         assertNotNull(ignite.cache(DEFAULT_CACHE_NAME));
     }
 
-    /**
-     * @throws Exception If failed.
-     */
-    @Test
-    public void testRestartAllNodes() throws Exception {
-        cache = true;
-
-        String home = U.getIgniteHome();
-
-        String[] workDirs = new String[3];
-
-        for (int i = 0; i < 3; i++) {
-            workDirs[i] = home + "/work/marshallerTestNode_" + i;
-
-            File file = new File(workDirs[i]);
-
-            if (file.exists())
-                assert U.delete(file);
-        }
-
-        try {
-            for (int i = 0; i < workDirs.length; i++) {
-                workDir = workDirs[i];
-
-                startGrid(i);
-            }
-
-            Marshaller marsh = ignite(0).configuration().getMarshaller();
-
-            TestClass1 obj = new TestClass1();
-
-            obj.val = 111;
-
-            byte[] bytes = marsh.marshal(obj);
-
-            stopAllGrids();
-
-            for (int i = 0; i < workDirs.length; i++) {
-                workDir = workDirs[i];
-
-                startGrid(i);
-            }
-
-            for (int i = 0; i < 3; i++) {
-                marsh = ignite(i).configuration().getMarshaller();
-
-                TestClass1 obj0 = marsh.unmarshal(bytes, null);
-
-                assertEquals(111, obj0.val);
-            }
-        }
-        finally {
-            for (String dir : workDirs)
-                assert U.delete(new File(dir));
-        }
-    }
-
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         super.afterTest();