Repository: ignite Updated Branches: refs/heads/ignite-5075-pds bd7fde5a2 -> ebfbd994f
http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java index 3b45977..c4e29c5 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java @@ -35,6 +35,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.util.lang.GridTuple; import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.CIX1; @@ -43,7 +44,6 @@ import org.apache.ignite.internal.util.typedef.COX; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.lang.IgniteOutClosure; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -115,11 +115,7 @@ public class GridMarshallerPerformanceTest extends GridCommonAbstractTest { public void testGridMarshaller() throws Exception { final GridTuple<byte[]> tuple = new GridTuple<>(); - // Test marshaller context. - final MarshallerContext marshCtx = new MarshallerContextTestImpl(); - - final OptimizedMarshaller marsh = new OptimizedMarshaller(); - marsh.setContext(marshCtx); + final BinaryMarshaller marsh = createStandaloneBinaryMarshaller(); IgniteInClosure<TestObject> writer = new CIX1<TestObject>() { @Override public void applyx(TestObject obj) throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java index 0df7933..b96728f 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java @@ -27,9 +27,9 @@ import org.apache.ignite.IgniteMessaging; import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -54,7 +54,7 @@ public class IgniteMessagingWithClientTest extends GridCommonAbstractTest implem @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - cfg.setMarshaller(new OptimizedMarshaller(false)); + cfg.setMarshaller(new BinaryMarshaller()); if (igniteInstanceName.equals(getTestIgniteInstanceName(2))) { cfg.setClientMode(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java index eb011b4..1a88b11 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java @@ -19,8 +19,8 @@ package org.apache.ignite.spi.discovery.tcp; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.marshaller.jdk.JdkMarshaller; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -42,7 +42,7 @@ public class TcpClientDiscoveryMarshallerCheckSelfTest extends GridCommonAbstrac else { cfg.setClientMode(true); - cfg.setMarshaller(new OptimizedMarshaller()); + cfg.setMarshaller(new BinaryMarshaller()); } cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder)); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java index dd43cbc..696225c 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java @@ -19,8 +19,8 @@ package org.apache.ignite.spi.discovery.tcp; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.marshaller.jdk.JdkMarshaller; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -54,7 +54,7 @@ public class TcpDiscoveryMarshallerCheckSelfTest extends GridCommonAbstractTest if (flag) cfg.setMarshaller(new JdkMarshaller()); else - cfg.setMarshaller(sameMarsh ? new JdkMarshaller() : new OptimizedMarshaller()); + cfg.setMarshaller(sameMarsh ? new JdkMarshaller() : new BinaryMarshaller()); // Flip flag. flag = !flag; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java index d13f117..6d1c3e6 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java @@ -28,6 +28,7 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.ignite.binary.BinaryBasicNameMapper; import org.apache.ignite.testframework.GridTestUtils; import org.apache.log4j.xml.DOMConfigurator; import org.jetbrains.annotations.Nullable; @@ -78,7 +79,7 @@ public final class GridTestProperties { /** Binary marshaller compact footers property. */ public static final String BINARY_COMPACT_FOOTERS = "binary.marshaller.compact.footers"; - /** */ + /** Enables {@link BinaryBasicNameMapper} with usage of simple (w/o package) name of class. */ public static final String BINARY_MARSHALLER_USE_SIMPLE_NAME_MAPPER = "binary.marshaller.use.simple.name.mapper"; /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java index d38eb14..8e7e554 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java @@ -84,7 +84,7 @@ public class ConfigVariations { /** */ @SuppressWarnings("unchecked") private static final ConfigParameter<IgniteConfiguration>[][] BASIC_IGNITE_SET = new ConfigParameter[][] { - Parameters.objectParameters("setMarshaller", Parameters.factory(BinaryMarshaller.class), optimizedMarshallerFactory()), + Parameters.objectParameters("setMarshaller", Parameters.factory(BinaryMarshaller.class), binaryMarshallerFactory()), Parameters.booleanParameters("setPeerClassLoadingEnabled"), }; @@ -183,14 +183,10 @@ public class ConfigVariations { /** * @return Marshaller. */ - public static Factory<OptimizedMarshaller> optimizedMarshallerFactory() { - return new Factory<OptimizedMarshaller>() { - @Override public OptimizedMarshaller create() { - OptimizedMarshaller marsh = new OptimizedMarshaller(true); - - marsh.setRequireSerializable(false); - - return marsh; + public static Factory<BinaryMarshaller> binaryMarshallerFactory() { + return new Factory<BinaryMarshaller>() { + @Override public BinaryMarshaller create() { + return new BinaryMarshaller(); } }; } http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- 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 8603d77..29c6396 100644 --- 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 @@ -63,6 +63,8 @@ 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.BinaryEnumCache; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; @@ -70,6 +72,7 @@ import org.apache.ignite.internal.processors.resource.GridSpringResourceContext; import org.apache.ignite.internal.util.GridClassLoaderCache; import org.apache.ignite.internal.util.GridTestClockTimer; import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.G; @@ -78,7 +81,9 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.lang.IgniteClosure; +import org.apache.ignite.logger.NullLogger; import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.marshaller.MarshallerContextTestImpl; import org.apache.ignite.marshaller.MarshallerExclusions; import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.resources.IgniteInstanceResource; @@ -1376,6 +1381,34 @@ public abstract class GridAbstractTest extends TestCase { } /** + * Create instance of {@link BinaryMarshaller} suitable for use + * without starting a grid upon an empty {@link IgniteConfiguration}. + * @return Binary marshaller. + * @throws IgniteCheckedException if failed. + */ + protected BinaryMarshaller createStandaloneBinaryMarshaller() throws IgniteCheckedException { + return createStandaloneBinaryMarshaller(new IgniteConfiguration()); + } + + /** + * Create instance of {@link BinaryMarshaller} suitable for use + * without starting a grid upon given {@link IgniteConfiguration}. + * @return Binary marshaller. + * @throws IgniteCheckedException if failed. + */ + protected BinaryMarshaller createStandaloneBinaryMarshaller(IgniteConfiguration cfg) throws IgniteCheckedException { + BinaryMarshaller marsh = new BinaryMarshaller(); + + BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), cfg, new NullLogger()); + + marsh.setContext(new MarshallerContextTestImpl()); + + IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, cfg); + + return marsh; + } + + /** * @return Generated unique test Ignite instance name. */ public String getTestIgniteInstanceName() { http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java ---------------------------------------------------------------------- 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 f8494da..2c7d597 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,15 +28,14 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.binary.BinaryCachingMetadataHandler; -import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.binary.BinaryContext; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.resource.GridResourceProcessor; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.logger.NullLogger; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.resources.LoggerResource; import org.apache.ignite.testframework.config.GridTestProperties; @@ -244,7 +243,7 @@ public class IgniteTestResources { Marshaller marsh; if (marshallerName == null) - marsh = new OptimizedMarshaller(); + marsh = new BinaryMarshaller(); else { try { Class<? extends Marshaller> cls = (Class<? extends Marshaller>)Class.forName(marshallerName); @@ -257,9 +256,6 @@ public class IgniteTestResources { } } - if (marsh instanceof OptimizedMarshaller) - ((OptimizedMarshaller)marsh).setRequireSerializable(false); - marsh.setContext(new MarshallerContextTestImpl()); if (marsh instanceof BinaryMarshaller) { http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/BinaryObjectsTxDeadlockDetectionTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/BinaryObjectsTxDeadlockDetectionTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/BinaryObjectsTxDeadlockDetectionTestSuite.java deleted file mode 100644 index 45afba2..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/BinaryObjectsTxDeadlockDetectionTestSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * - */ -public class BinaryObjectsTxDeadlockDetectionTestSuite { - /** - * @return Test suite. - * @throws Exception If failed. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - return TxDeadlockDetectionTestSuite.suite(); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java index 8badd86..837523d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java @@ -25,6 +25,13 @@ import org.apache.ignite.internal.GridReleaseTypeSelfTest; import org.apache.ignite.internal.GridVersionSelfTest; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.managers.deployment.GridDeploymentMessageCountSelfTest; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerEnumSelfTest; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerNodeFailoverTest; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerPooledSelfTest; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerSelfTest; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerSerialPersistentFieldsSelfTest; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerTest; +import org.apache.ignite.internal.marshaller.optimized.OptimizedObjectStreamSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheP2pUnmarshallingErrorTest; import org.apache.ignite.internal.processors.cache.IgniteCacheP2pUnmarshallingNearErrorTest; import org.apache.ignite.internal.processors.cache.IgniteCacheP2pUnmarshallingRebalanceErrorTest; @@ -39,13 +46,6 @@ import org.apache.ignite.internal.util.nio.GridNioSelfTest; import org.apache.ignite.internal.util.nio.GridNioSslSelfTest; import org.apache.ignite.marshaller.DynamicProxySerializationMultiJvmSelfTest; import org.apache.ignite.marshaller.jdk.GridJdkMarshallerSelfTest; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerEnumSelfTest; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerNodeFailoverTest; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerPooledSelfTest; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerSelfTest; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerSerialPersistentFieldsSelfTest; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerTest; -import org.apache.ignite.internal.marshaller.optimized.OptimizedObjectStreamSelfTest; import org.apache.ignite.messaging.GridMessagingNoPeerClassLoadingSelfTest; import org.apache.ignite.messaging.GridMessagingSelfTest; import org.apache.ignite.testframework.config.GridTestProperties; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java deleted file mode 100644 index e891d35..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * Cache full API suite with binary marshaller. - */ -public class IgniteBinaryCacheFullApiTestSuite extends TestSuite { - /** - * @return Suite. - * @throws Exception In case of error. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - return IgniteCacheFullApiSelfTestSuite.suite(); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java index f2d1556..170bb33 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java @@ -19,7 +19,6 @@ package org.apache.ignite.testsuites; import java.util.HashSet; import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.cache.GridCacheAffinityRoutingSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheEntryMemorySizeSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheMvccSelfTest; @@ -36,7 +35,6 @@ import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCa import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinariesNearPartitionedByteArrayValuesSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinariesPartitionedOnlyByteArrayValuesSelfTest; import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorSelfTest; -import org.apache.ignite.testframework.config.GridTestProperties; /** * Cache suite with binary marshaller. @@ -47,8 +45,6 @@ public class IgniteBinaryCacheTestSuite extends TestSuite { * @throws Exception In case of error. */ public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - TestSuite suite = new TestSuite("Binary Cache Test Suite"); HashSet<Class> ignoredTests = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheDataStructuresSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheDataStructuresSelfTestSuite.java deleted file mode 100644 index f8769a0..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheDataStructuresSelfTestSuite.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructuresNoClassOnServerTest; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * - */ -public class IgniteBinaryObjectsCacheDataStructuresSelfTestSuite { - /** - * @return Test suite. - * @throws Exception If failed. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - TestSuite suite = IgniteCacheDataStructuresSelfTestSuite.suite(); - - suite.addTestSuite(IgniteDataStructuresNoClassOnServerTest.class); - - return suite; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheExpiryPolicyTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheExpiryPolicyTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheExpiryPolicyTestSuite.java deleted file mode 100644 index 7cb4051..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheExpiryPolicyTestSuite.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.internal.processors.cache.expiry.IgniteCacheExpiryPolicyTestSuite; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * - */ -public class IgniteBinaryObjectsCacheExpiryPolicyTestSuite { - /** - * @return Test suite. - * @throws Exception If failed. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - return IgniteCacheExpiryPolicyTestSuite.suite(); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheRestartTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheRestartTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheRestartTestSuite.java deleted file mode 100644 index e3c9f68..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheRestartTestSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * - */ -public class IgniteBinaryObjectsCacheRestartTestSuite { - /** - * @return Test suite. - * @throws Exception If failed. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - return IgniteCacheRestartTestSuite.suite(); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite2.java deleted file mode 100644 index c13693b..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite2.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * - */ -public class IgniteBinaryObjectsCacheTestSuite2 { - /** - * @return Test suite. - * @throws Exception If failed. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - return IgniteCacheTestSuite2.suite(); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java index d80478b..8d21580 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java @@ -18,7 +18,6 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest; import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryTransactionalEntryProcessorDeploymentSelfTest; import org.apache.ignite.testframework.config.GridTestProperties; @@ -32,7 +31,6 @@ public class IgniteBinaryObjectsCacheTestSuite3 { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); GridTestProperties.setProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME, "org.apache.ignite.tests.p2p.CacheDeploymentBinaryEntryProcessor"); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite4.java deleted file mode 100644 index 2292a93..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite4.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * - */ -public class IgniteBinaryObjectsCacheTestSuite4 { - /** - * @return Test suite. - * @throws Exception If failed. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - return IgniteCacheTestSuite4.suite(); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsComputeGridTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsComputeGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsComputeGridTestSuite.java index e659966..8798db9 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsComputeGridTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsComputeGridTestSuite.java @@ -19,8 +19,6 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.GridComputationBinarylizableClosuresSelfTest; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; /** * @@ -31,8 +29,6 @@ public class IgniteBinaryObjectsComputeGridTestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - TestSuite suite = IgniteComputeGridTestSuite.suite(); suite.addTestSuite(GridComputationBinarylizableClosuresSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index d544810..2ae9297 100755 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -28,8 +28,6 @@ import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreBinaryMarshallerStor import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreBinaryMarshallerStoreKeepBinaryWithSqlEscapeSelfTest; import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreBinaryMarshallerWithSqlEscapeSelfTest; import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreMultitreadedSelfTest; -import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreOptimizedMarshallerSelfTest; -import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreOptimizedMarshallerWithSqlEscapeSelfTest; import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreTest; import org.apache.ignite.cache.store.jdbc.GridCacheJdbcBlobStoreMultithreadedSelfTest; import org.apache.ignite.cache.store.jdbc.GridCacheJdbcBlobStoreSelfTest; @@ -227,8 +225,6 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(GridCacheJdbcBlobStoreMultithreadedSelfTest.class); suite.addTestSuite(JdbcTypesDefaultTransformerTest.class); suite.addTestSuite(CacheJdbcPojoStoreTest.class); - suite.addTestSuite(CacheJdbcPojoStoreOptimizedMarshallerSelfTest.class); - suite.addTestSuite(CacheJdbcPojoStoreOptimizedMarshallerWithSqlEscapeSelfTest.class); suite.addTestSuite(CacheJdbcPojoStoreBinaryMarshallerSelfTest.class); suite.addTestSuite(CacheJdbcPojoStoreBinaryMarshallerStoreKeepBinarySelfTest.class); suite.addTestSuite(CacheJdbcPojoStoreBinaryMarshallerWithSqlEscapeSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeBasicConfigVariationsFullApiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeBasicConfigVariationsFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeBasicConfigVariationsFullApiTestSuite.java index 1be932a..41cc8a1 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeBasicConfigVariationsFullApiTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeBasicConfigVariationsFullApiTestSuite.java @@ -37,7 +37,7 @@ public class IgniteComputeBasicConfigVariationsFullApiTestSuite extends TestSuit Parameters.objectParameters("setMarshaller", Parameters.factory(JdkMarshaller.class), Parameters.factory(BinaryMarshaller.class), - ConfigVariations.optimizedMarshallerFactory() + ConfigVariations.binaryMarshallerFactory() ), Parameters.booleanParameters("setPeerClassLoadingEnabled"), Parameters.booleanParameters("setMarshalLocalJobs"), http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java index a2519fb..908390f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java @@ -45,7 +45,6 @@ import org.apache.ignite.internal.processors.igfs.IgfsModeResolverSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsModesSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsPrimaryMultiNodeSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsOneClientNodeTest; -import org.apache.ignite.internal.processors.igfs.IgfsPrimaryOptimziedMarshallerSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencyClientSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencyMultiNodeSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencySelfTest; @@ -88,8 +87,6 @@ public class IgniteIgfsTestSuite extends TestSuite { suite.addTest(new TestSuite(IgfsPrimaryRelaxedConsistencySelfTest.class)); suite.addTest(new TestSuite(IgfsPrimaryRelaxedConsistencyMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(IgfsPrimaryOptimziedMarshallerSelfTest.class)); - suite.addTest(new TestSuite(IgfsDualSyncSelfTest.class)); suite.addTest(new TestSuite(IgfsDualAsyncSelfTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java index 04be453..38b9d0a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java @@ -61,10 +61,8 @@ import org.apache.ignite.internal.processors.service.GridServiceReassignmentSelf import org.apache.ignite.internal.processors.service.GridServiceSerializationSelfTest; import org.apache.ignite.internal.processors.service.IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest; import org.apache.ignite.internal.processors.service.IgniteServiceDeployment2ClassLoadersJdkMarshallerTest; -import org.apache.ignite.internal.processors.service.IgniteServiceDeployment2ClassLoadersOptimizedMarshallerTest; import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingDefaultMarshallerTest; import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingJdkMarshallerTest; -import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest; import org.apache.ignite.internal.processors.service.IgniteServiceDynamicCachesSelfTest; import org.apache.ignite.internal.processors.service.IgniteServiceProxyTimeoutInitializedTest; import org.apache.ignite.internal.processors.service.IgniteServiceReassignmentTest; @@ -146,10 +144,8 @@ public class IgniteKernalSelfTestSuite extends TestSuite { suite.addTestSuite(ServiceThreadPoolSelfTest.class); suite.addTestSuite(IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.class); - suite.addTestSuite(IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest.class); suite.addTestSuite(IgniteServiceDeploymentClassLoadingJdkMarshallerTest.class); suite.addTestSuite(IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest.class); - suite.addTestSuite(IgniteServiceDeployment2ClassLoadersOptimizedMarshallerTest.class); suite.addTestSuite(IgniteServiceDeployment2ClassLoadersJdkMarshallerTest.class); return suite; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java index 4c5cb98..98a6bde 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java @@ -20,10 +20,6 @@ package org.apache.ignite.testsuites; import java.util.Set; import junit.framework.TestSuite; import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2ByteOrderSelfTest; -import org.apache.ignite.internal.util.GridHandleTableSelfTest; -import org.apache.ignite.internal.util.io.GridUnsafeDataInputOutputByteOrderSelfTest; -import org.apache.ignite.internal.util.io.GridUnsafeDataOutputArraySizingSelfTest; -import org.apache.ignite.marshaller.jdk.GridJdkMarshallerSelfTest; import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerEnumSelfTest; import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerNodeFailoverTest; import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerPooledSelfTest; @@ -31,6 +27,10 @@ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerSelfTe import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerSerialPersistentFieldsSelfTest; import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerTest; import org.apache.ignite.internal.marshaller.optimized.OptimizedObjectStreamSelfTest; +import org.apache.ignite.internal.util.GridHandleTableSelfTest; +import org.apache.ignite.internal.util.io.GridUnsafeDataInputOutputByteOrderSelfTest; +import org.apache.ignite.internal.util.io.GridUnsafeDataOutputArraySizingSelfTest; +import org.apache.ignite.marshaller.jdk.GridJdkMarshallerSelfTest; import org.apache.ignite.testframework.GridTestUtils; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMessagingConfigVariationFullApiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMessagingConfigVariationFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMessagingConfigVariationFullApiTestSuite.java index bfb9cd1..0490a92 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMessagingConfigVariationFullApiTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMessagingConfigVariationFullApiTestSuite.java @@ -37,7 +37,7 @@ public class IgniteMessagingConfigVariationFullApiTestSuite extends TestSuite { Parameters.objectParameters("setMarshaller", Parameters.factory(JdkMarshaller.class), Parameters.factory(BinaryMarshaller.class), - ConfigVariations.optimizedMarshallerFactory() + ConfigVariations.binaryMarshallerFactory() ), Parameters.booleanParameters("setPeerClassLoadingEnabled") }; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteServiceConfigVariationsFullApiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteServiceConfigVariationsFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteServiceConfigVariationsFullApiTestSuite.java index 328ae8d..84af386 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteServiceConfigVariationsFullApiTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteServiceConfigVariationsFullApiTestSuite.java @@ -37,7 +37,7 @@ public class IgniteServiceConfigVariationsFullApiTestSuite extends TestSuite { Parameters.objectParameters("setMarshaller", Parameters.factory(JdkMarshaller.class), Parameters.factory(BinaryMarshaller.class), - ConfigVariations.optimizedMarshallerFactory() + ConfigVariations.binaryMarshallerFactory() ), Parameters.booleanParameters("setPeerClassLoadingEnabled") http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml index ac3a8da..66db1ed 100644 --- a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml +++ b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml @@ -48,21 +48,10 @@ <property name="peerClassLoadingEnabled" value="true"/> <!-- - Configure optimized marshaller. + Configure binary marshaller. --> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - <!-- - For better performance set this property to true in case - all marshalled classes implement java.io.Serializable. - Default value is true. - - Note, that it is recommended to implement java.io.Externalizable - instead of java.io.Serializable for smaller network footprint - and even better performance. - --> - <property name="requireSerializable" value="false"/> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- Set to local host address just for examples. --> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml index 03cf945..291433c 100644 --- a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml +++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml @@ -54,8 +54,7 @@ <property name="gridName" value="IGFS-cli-0"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml index a6022fa..e20bc38 100644 --- a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml +++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml @@ -54,8 +54,7 @@ <property name="gridName" value="IGFS-cli-1"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml index 6cfcf57..ad56227 100644 --- a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml +++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml @@ -54,8 +54,7 @@ <property name="gridName" value="IGFS-cli-2"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml b/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml index 488d8d9..5cefc3d 100644 --- a/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml +++ b/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml @@ -55,8 +55,7 @@ <property name="gridName" value="test-IGFS-cli"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml b/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml index f6d5bab..243de7e 100644 --- a/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml +++ b/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml @@ -53,8 +53,7 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="clientMode" value="true"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/hadoop/src/test/config/igfs-cli-config-primary.xml ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/config/igfs-cli-config-primary.xml b/modules/hadoop/src/test/config/igfs-cli-config-primary.xml index c1c41b4..46914b2 100644 --- a/modules/hadoop/src/test/config/igfs-cli-config-primary.xml +++ b/modules/hadoop/src/test/config/igfs-cli-config-primary.xml @@ -55,8 +55,7 @@ <property name="gridName" value="test-IGFS-cli"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml b/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml index bd4b215..d7c7f00 100644 --- a/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml +++ b/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml @@ -53,8 +53,7 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="clientMode" value="true"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java index 5ae2c3e..6434182 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java @@ -70,6 +70,7 @@ import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration; import org.apache.ignite.igfs.IgfsIpcEndpointType; import org.apache.ignite.igfs.IgfsMode; import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.igfs.IgfsCommonAbstractTest; import org.apache.ignite.internal.processors.igfs.IgfsModeResolver; import org.apache.ignite.internal.util.GridConcurrentHashSet; @@ -78,7 +79,6 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -359,7 +359,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA discoSpi.setIpFinder(IP_FINDER); cfg.setIgniteInstanceName(igniteInstanceName); - cfg.setMarshaller(new OptimizedMarshaller()); + cfg.setMarshaller(new BinaryMarshaller()); cfg.setDiscoverySpi(discoSpi); cfg.setFileSystemConfiguration(igfsConfiguration(igniteInstanceName)); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java index 4fa73b5..e0148b3 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.cache.QueryIndex; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -70,7 +70,7 @@ public class IgniteCacheNoClassQuerySelfTest extends GridCommonAbstractTest { CacheConfiguration cc = defaultCacheConfiguration(); - c.setMarshaller(new OptimizedMarshaller()); + c.setMarshaller(new BinaryMarshaller()); cc.setName("cache"); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java index ec83687..5475311 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java @@ -37,8 +37,8 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.configuration.CacheConfiguration; 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.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -73,7 +73,7 @@ public abstract class AbstractH2CompareQueryTest extends GridCommonAbstractTest c.setDiscoverySpi(disco); - c.setMarshaller(new OptimizedMarshaller(true)); + c.setMarshaller(new BinaryMarshaller()); return c; } http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java b/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java index bbc9762..8a73a8e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java @@ -34,7 +34,7 @@ import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.internal.binary.BinaryMarshaller; /** * SQL query stress test. @@ -158,7 +158,7 @@ public class FetchingQueryCursorStressTest { ccfg.setName(CACHE_NAME); ccfg.setIndexedTypes(Integer.class, Person.class); - cfg.setMarshaller(new OptimizedMarshaller()); + cfg.setMarshaller(new BinaryMarshaller()); cfg.setCacheConfiguration(ccfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java index 5826b72..1cfb345 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java @@ -18,11 +18,9 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.cache.BinarySerializationQuerySelfTest; import org.apache.ignite.internal.processors.cache.BinarySerializationQueryWithReflectiveSerializerSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheBinaryObjectsScanSelfTest; -import org.apache.ignite.testframework.config.GridTestProperties; /** * Cache query suite with binary marshaller. @@ -33,8 +31,6 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite { * @throws Exception In case of error. */ public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - TestSuite suite = IgniteCacheQuerySelfTestSuite.suite(); // Serialization. http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java index 359c7fd..ce2a666 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java @@ -18,9 +18,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.cache.IgniteCacheQueriesLoadTest1; -import org.apache.ignite.testframework.config.GridTestProperties; /** * Cache query suite with binary marshaller. @@ -31,8 +29,6 @@ public class IgniteBinaryCacheQueryTestSuite2 extends TestSuite { * @throws Exception In case of error. */ public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - TestSuite suite = IgniteCacheQuerySelfTestSuite2.suite(); suite.addTestSuite(IgniteCacheQueriesLoadTest1.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java deleted file mode 100644 index f9e9af2..0000000 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite3.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * Cache query suite with binary marshaller. - */ -public class IgniteBinaryCacheQueryTestSuite3 extends TestSuite { - /** - * @return Suite. - * @throws Exception In case of error. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - TestSuite suite = IgniteCacheQuerySelfTestSuite3.suite(); - - return suite; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java deleted file mode 100644 index 32a693f..0000000 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * Cache query suite with binary marshaller. - */ -public class IgniteBinaryCacheQueryTestSuite4 extends TestSuite { - /** - * @return Suite. - * @throws Exception In case of error. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - TestSuite suite = IgniteCacheQuerySelfTestSuite4.suite(); - - return suite; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MarshallerTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MarshallerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MarshallerTest.cs index 030916b..2ec9c6f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MarshallerTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MarshallerTest.cs @@ -68,7 +68,7 @@ namespace Apache.Ignite.Core.Tests var ex = Assert.Throws<IgniteException>(() => StartIgnite("config\\marshaller-invalid.xml")); Assert.AreEqual("Unsupported marshaller (only org.apache.ignite.internal.binary.BinaryMarshaller " + "can be used when running Apache Ignite.NET): org.apache.ignite.internal." + - "marshaller.optimized.OptimizedMarshaller", ex.Message); + "marshaller.optimized.OptimizedMarshaller", ex.Message, ex.ToString()); } /// <summary> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java index 4c0613f..6f7d27a 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java @@ -18,11 +18,10 @@ package org.apache.ignite.internal; import org.apache.ignite.IgniteSpringBean; +import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -36,7 +35,7 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Marshaller. */ - private static final Marshaller MARSHALLER = new OptimizedMarshaller(); + private Marshaller marsh; /** Attribute key. */ private static final String ATTR_KEY = "checkAttr"; @@ -46,11 +45,13 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - MARSHALLER.setContext(new MarshallerContextTestImpl()); + IgniteConfiguration cfg = config(); + + marsh = createStandaloneBinaryMarshaller(cfg); bean = new IgniteSpringBean(); - bean.setConfiguration(config()); + bean.setConfiguration(cfg); bean.afterPropertiesSet(); } @@ -73,6 +74,8 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest cfg.setIgniteInstanceName(getTestIgniteInstanceName()); + cfg.setBinaryConfiguration(new BinaryConfiguration()); + return cfg; } @@ -87,7 +90,7 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest public void testSerialization() throws Exception { assert bean != null; - IgniteSpringBean bean0 = MARSHALLER.unmarshal(MARSHALLER.marshal(bean), null); + IgniteSpringBean bean0 = marsh.unmarshal(marsh.marshal(bean), null); assert bean0 != null; assert bean0.log() != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml ---------------------------------------------------------------------- diff --git a/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml b/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml index 09a7848..7224796 100644 --- a/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml +++ b/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml @@ -39,21 +39,10 @@ <property name="peerClassLoadingEnabled" value="true"/> <!-- - Configure optimized marshaller. + Configure binary marshaller. --> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - <!-- - For better performance set this property to true in case - all marshalled classes implement java.io.Serializable. - Default value is true. - - Note, that it is recommended to implement java.io.Externalizable - instead of java.io.Serializable for smaller network footprint - and even better performance. - --> - <property name="requireSerializable" value="false"/> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- Set to local host address just for examples. --> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/yardstick/config/ignite-int-max-values-onheap-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-int-max-values-onheap-config.xml b/modules/yardstick/config/ignite-int-max-values-onheap-config.xml index 242ae7d..9ad5fcd 100644 --- a/modules/yardstick/config/ignite-int-max-values-onheap-config.xml +++ b/modules/yardstick/config/ignite-int-max-values-onheap-config.xml @@ -29,9 +29,7 @@ <property name="peerClassLoadingEnabled" value="true"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - <property name="requireSerializable" value="false"/> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/yardstick/config/ignite-jdbc-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-jdbc-config.xml b/modules/yardstick/config/ignite-jdbc-config.xml index b944a6b..a279d46 100644 --- a/modules/yardstick/config/ignite-jdbc-config.xml +++ b/modules/yardstick/config/ignite-jdbc-config.xml @@ -33,9 +33,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - <property name="requireSerializable" value="false"/> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <property name="discoverySpi">
