IGNITE-4947 - Move to Ignite 2.0 test suites - Fixes #1986. Signed-off-by: Alexey Goncharuk <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/98a1758d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/98a1758d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/98a1758d Branch: refs/heads/ignite-5075 Commit: 98a1758d438060357d3d370ee797e6b6197664a3 Parents: ca94cf3 Author: dpavlov <[email protected]> Authored: Tue May 23 10:10:04 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue May 23 10:10:04 2017 +0300 ---------------------------------------------------------------------- examples/config/filesystem/example-igfs.xml | 4 + modules/clients/src/test/config/jdbc-config.xml | 6 - .../internal/jdbc2/JdbcMetadataSelfTest.java | 5 +- .../internal/jdbc2/JdbcResultSetSelfTest.java | 24 ++-- .../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 121 +++++++++++++++---- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../ignite/binary/BinaryBasicNameMapper.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../internal/binary/BinaryClassDescriptor.java | 1 + .../ignite/internal/binary/BinaryContext.java | 58 ++++----- .../GridClientOptimizedMarshaller.java | 2 +- .../GridClientZipOptimizedMarshaller.java | 2 +- .../optimized/OptimizedClassDescriptor.java | 2 +- .../optimized/OptimizedMarshaller.java | 2 +- .../marshaller/optimized/package-info.java | 22 ++++ .../apache/ignite/marshaller/Marshaller.java | 3 - .../ignite/marshaller/jdk/JdkMarshaller.java | 5 +- modules/core/src/test/config/example-cache.xml | 5 +- .../src/test/config/spring-start-nodes-attr.xml | 4 +- .../core/src/test/config/spring-start-nodes.xml | 4 +- .../config/websession/example-cache-base.xml | 5 +- .../IgniteExternalizableAbstractTest.java | 15 +-- ...dbcPojoStoreOptimizedMarshallerSelfTest.java | 31 ----- ...ptimizedMarshallerWithSqlEscapeSelfTest.java | 28 ----- .../apache/ignite/igfs/IgfsPathSelfTest.java | 7 +- .../internal/GridLifecycleAwareSelfTest.java | 3 +- .../BinarySimpleNameTestPropertySelfTest.java | 17 +++ .../managers/GridManagerStopSelfTest.java | 3 +- .../GridDiscoveryManagerAttributesSelfTest.java | 2 +- .../optimized/OptimizedMarshallerTest.java | 8 ++ .../marshaller/optimized/package-info.java | 22 ++++ .../CacheStartupInDeploymentModesTest.java | 37 ------ .../cache/GridCacheEntryMemorySizeSelfTest.java | 2 +- ...ridCacheStoreManagerDeserializationTest.java | 4 +- .../cache/GridCacheVersionSelfTest.java | 7 +- .../distributed/CacheAffinityEarlyTest.java | 7 +- .../CacheGetFutureHangsSelfTest.java | 6 +- .../IgniteCacheCreatePutMultiNodeSelfTest.java | 7 +- .../distributed/IgniteCacheCreatePutTest.java | 7 +- .../IgniteCachePartitionLossPolicySelfTest.java | 1 + .../CacheEntryProcessorNonSerializableTest.java | 5 +- .../igfs/IgfsAbstractBaseSelfTest.java | 10 -- .../processors/igfs/IgfsFileInfoSelfTest.java | 16 ++- .../IgfsPrimaryOptimziedMarshallerSelfTest.java | 28 ----- .../service/ClosureServiceClientsNodesTest.java | 4 +- ...namicProxySerializationMultiJvmSelfTest.java | 13 -- .../GridMarshallerPerformanceTest.java | 8 +- .../IgniteMessagingWithClientTest.java | 4 +- ...pClientDiscoveryMarshallerCheckSelfTest.java | 4 +- .../TcpDiscoveryMarshallerCheckSelfTest.java | 4 +- .../config/GridTestProperties.java | 3 +- .../configvariations/ConfigVariations.java | 14 +-- .../testframework/junits/GridAbstractTest.java | 33 +++++ .../junits/IgniteTestResources.java | 8 +- ...naryObjectsTxDeadlockDetectionTestSuite.java | 37 ------ .../testsuites/IgniteBinaryBasicTestSuite.java | 14 +-- .../IgniteBinaryCacheFullApiTestSuite.java | 37 ------ .../testsuites/IgniteBinaryCacheTestSuite.java | 4 - ...ObjectsCacheDataStructuresSelfTestSuite.java | 42 ------- ...BinaryObjectsCacheExpiryPolicyTestSuite.java | 38 ------ ...gniteBinaryObjectsCacheRestartTestSuite.java | 37 ------ .../IgniteBinaryObjectsCacheTestSuite2.java | 37 ------ .../IgniteBinaryObjectsCacheTestSuite3.java | 2 - .../IgniteBinaryObjectsCacheTestSuite4.java | 37 ------ ...IgniteBinaryObjectsComputeGridTestSuite.java | 4 - .../ignite/testsuites/IgniteCacheTestSuite.java | 4 - ...teBasicConfigVariationsFullApiTestSuite.java | 2 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 3 - .../testsuites/IgniteKernalSelfTestSuite.java | 4 - .../IgniteMarshallerSelfTestSuite.java | 8 +- ...essagingConfigVariationFullApiTestSuite.java | 2 +- ...ServiceConfigVariationsFullApiTestSuite.java | 2 +- .../webapp/META-INF/ignite-webapp-config.xml | 15 +-- .../test/config/hadoop-fs-open-test/grid-0.xml | 3 +- .../test/config/hadoop-fs-open-test/grid-1.xml | 3 +- .../test/config/hadoop-fs-open-test/grid-2.xml | 3 +- .../test/config/igfs-cli-config-dual-async.xml | 3 +- .../test/config/igfs-cli-config-dual-sync.xml | 3 +- .../src/test/config/igfs-cli-config-primary.xml | 3 +- .../src/test/config/igfs-cli-config-proxy.xml | 3 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 4 +- .../cache/IgniteCacheNoClassQuerySelfTest.java | 4 +- .../h2/sql/AbstractH2CompareQueryTest.java | 4 +- .../FetchingQueryCursorStressTest.java | 4 +- .../IgniteBinaryCacheQueryTestSuite.java | 4 - .../IgniteBinaryCacheQueryTestSuite2.java | 4 - .../IgniteBinaryCacheQueryTestSuite3.java | 39 ------ .../IgniteBinaryCacheQueryTestSuite4.java | 39 ------ .../Apache.Ignite.Core.Tests/MarshallerTest.cs | 2 +- .../GridSpringBeanSerializationSelfTest.java | 15 ++- .../webapp2/META-INF/ignite-webapp-config.xml | 15 +-- .../ignite-int-max-values-onheap-config.xml | 4 +- modules/yardstick/config/ignite-jdbc-config.xml | 4 +- 94 files changed, 376 insertions(+), 769 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/examples/config/filesystem/example-igfs.xml ---------------------------------------------------------------------- diff --git a/examples/config/filesystem/example-igfs.xml b/examples/config/filesystem/example-igfs.xml index 454dc9f..9e45450 100644 --- a/examples/config/filesystem/example-igfs.xml +++ b/examples/config/filesystem/example-igfs.xml @@ -50,6 +50,10 @@ Configuration below demonstrates how to setup a IgniteFs node with file data. --> <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="marshaller"> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> + </property> + <property name="fileSystemConfiguration"> <list> <bean class="org.apache.ignite.configuration.FileSystemConfiguration"> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/clients/src/test/config/jdbc-config.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/config/jdbc-config.xml b/modules/clients/src/test/config/jdbc-config.xml index 7bba410..b05fe64 100644 --- a/modules/clients/src/test/config/jdbc-config.xml +++ b/modules/clients/src/test/config/jdbc-config.xml @@ -31,12 +31,6 @@ <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> - </property> - <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java index e382b9d..736e343 100755 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java @@ -32,6 +32,7 @@ import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -40,7 +41,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import static java.sql.Types.INTEGER; -import static java.sql.Types.OTHER; import static java.sql.Types.VARCHAR; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -192,6 +192,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testGetColumns() throws Exception { + final boolean primitivesInformationIsLostAfterStore = ignite(0).configuration().getMarshaller() instanceof BinaryMarshaller; try (Connection conn = DriverManager.getConnection(BASE_URL)) { DatabaseMetaData meta = conn.getMetaData(); @@ -219,7 +220,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { } else if ("AGE".equals(name) || "ORGID".equals(name)) { assertEquals(INTEGER, rs.getInt("DATA_TYPE")); assertEquals("INTEGER", rs.getString("TYPE_NAME")); - assertEquals(0, rs.getInt("NULLABLE")); + assertEquals(primitivesInformationIsLostAfterStore ? 1 : 0, rs.getInt("NULLABLE")); } cnt++; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java index 43cd586..54514c7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java @@ -30,11 +30,15 @@ import java.sql.Time; import java.sql.Timestamp; import java.util.Arrays; import java.util.concurrent.Callable; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -45,6 +49,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; +import static org.apache.ignite.jdbc.JdbcResultSetSelfTest.assertEqualsToStringRepresentation; /** * Result set test. @@ -509,6 +514,9 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testObject() throws Exception { + final Ignite ignite = ignite(0); + final boolean binaryMarshaller = ignite.configuration().getMarshaller() instanceof BinaryMarshaller; + final IgniteBinary binary = binaryMarshaller ? ignite.binary() : null; ResultSet rs = stmt.executeQuery(SQL); TestObjectField f1 = new TestObjectField(100, "AAAA"); @@ -518,19 +526,19 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { assertTrue(rs.next()); - assertEquals(f1.toString(), rs.getObject("f1")); - assertEquals(f1.toString(), rs.getObject(16)); + assertEqualsToStringRepresentation(f1, binary, rs.getObject("f1")); + assertEqualsToStringRepresentation(f1, binary, rs.getObject(16)); - assertEquals(f2.toString(), rs.getObject("f2")); - assertEquals(f2.toString(), rs.getObject(17)); + assertEqualsToStringRepresentation(f2, binary, rs.getObject("f2")); + assertEqualsToStringRepresentation(f2, binary, rs.getObject(17)); assertNull(rs.getObject("f3")); assertTrue(rs.wasNull()); assertNull(rs.getObject(18)); assertTrue(rs.wasNull()); - assertEquals(o.toString(), rs.getObject("_val")); - assertEquals(o.toString(), rs.getObject(19)); + assertEqualsToStringRepresentation(o, binary, rs.getObject("_val")); + assertEqualsToStringRepresentation(o, binary, rs.getObject(19)); assertFalse(rs.next()); } @@ -815,10 +823,10 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { @SuppressWarnings("PackageVisibleField") private static class TestObjectField implements Serializable { /** */ - final int a; + @GridToStringInclude final int a; /** */ - final String b; + @GridToStringInclude final String b; /** * @param a A. http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java index a02f489..be148c4 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java @@ -32,6 +32,7 @@ import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -183,6 +184,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testGetColumns() throws Exception { + final boolean primitivesInformationIsLostAfterStore = ignite(0).configuration().getMarshaller() instanceof BinaryMarshaller; try (Connection conn = DriverManager.getConnection(URL)) { DatabaseMetaData meta = conn.getMetaData(); @@ -210,7 +212,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { } else if ("AGE".equals(name) || "ORGID".equals(name)) { assert rs.getInt("DATA_TYPE") == INTEGER; assert "INTEGER".equals(rs.getString("TYPE_NAME")); - assert rs.getInt("NULLABLE") == 0; + assert rs.getInt("NULLABLE") == (primitivesInformationIsLostAfterStore ? 1 : 0); } if ("_KEY".equals(name)) { assert rs.getInt("DATA_TYPE") == OTHER; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java index 140ff36..2dac8b7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java @@ -17,30 +17,33 @@ package org.apache.ignite.jdbc; -import java.io.Serializable; -import java.math.BigDecimal; -import java.net.MalformedURLException; -import java.net.URL; -import java.sql.Date; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Time; -import java.sql.Timestamp; -import java.util.Arrays; -import java.util.concurrent.Callable; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteCache; +import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; 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; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.Nullable; + +import java.io.Serializable; +import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.net.MalformedURLException; +import java.net.URL; +import java.sql.*; +import java.util.Arrays; +import java.util.Objects; +import java.util.concurrent.Callable; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -69,7 +72,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - CacheConfiguration<?,?> cache = defaultCacheConfiguration(); + CacheConfiguration<?, ?> cache = defaultCacheConfiguration(); cache.setCacheMode(PARTITIONED); cache.setBackups(1); @@ -440,9 +443,82 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { } /** + * This does extended toString compare. <br> Actual toString in case binary is enabled is called at {@link + * org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask.JdbcDriverJob#execute()}, <br> + * org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java:312 <br> and then strings are + * compared in assertions <p> And for binary marshaller result of such BinaryObjectImpl.toString will be unexpected + * by this test: <br> <code>org.apache.ignite.jdbc.JdbcResultSetSelfTest$TestObjectField [idHash=1624306582, + * hash=11433031, a=100, b=AAAA]</code> <br> + * + * @param originalObj object initially placed to cache + * @param binary optional parameter, if absent, direct toString compare is used + * @param resSetObj object returned by result set + */ + public static void assertEqualsToStringRepresentation( + final Object originalObj, + @Nullable final IgniteBinary binary, + final Object resSetObj) { + if (binary != null) { + final BinaryObject origObjAsBinary = binary.toBinary(originalObj); + final String strFromResSet = Objects.toString(resSetObj); + for (Field declaredField : originalObj.getClass().getDeclaredFields()) { + checkFieldPresenceInToString(origObjAsBinary, strFromResSet, declaredField.getName()); + } + } + else + assertEquals(originalObj.toString(), Objects.toString(resSetObj)); + } + + /** + * Checks particular field from original binary object + * + * @param original binary object representation of original object + * @param strToCheck string from result set, to be checked for presence of all fields + * @param fieldName field name have being checked + */ + private static void checkFieldPresenceInToString(final BinaryObject original, + final String strToCheck, + final String fieldName) { + + final Object fieldVal = original.field(fieldName); + String strValToSearch = Objects.toString(fieldVal); + if (fieldVal != null) { + final Class<?> aCls = fieldVal.getClass(); + if (aCls.isArray()) { + final Class<?> elemCls = aCls.getComponentType(); + if (elemCls == Byte.TYPE) + strValToSearch = Arrays.toString((byte[])fieldVal); + } + else if (BinaryObject.class.isAssignableFrom(aCls)) { + // hack to avoid search of unpredictable toString representation like + // JdbcResultSetSelfTest$TestObjectField [idHash=1518952510, hash=11433031, a=100, b=AAAA] + // in toString + // other way to fix: iterate on binary object fields: final BinaryObject binVal = (BinaryObject)fieldVal; + strValToSearch = ""; + } + } + assertTrue("Expected to find field " + + fieldName + " having value " + strValToSearch + + " in toString representation [" + strToCheck + "]", + strToCheck.contains(fieldName + "=" + strValToSearch)); + } + + /** + * @param str initial toString representation from binary object + * @return same representation with removed ID hash value + */ + private static String removeIdHash(String str) { + return str.replaceAll("idHash=(\\d)*", "idHash=..."); + } + + /** * @throws Exception If failed. */ public void testObject() throws Exception { + final Ignite ignite = ignite(0); + final boolean binaryMarshaller = ignite.configuration().getMarshaller() instanceof BinaryMarshaller; + final IgniteBinary binary = binaryMarshaller ? ignite.binary() : null; + ResultSet rs = stmt.executeQuery(SQL); TestObjectField f1 = new TestObjectField(100, "AAAA"); @@ -451,20 +527,19 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { TestObject o = createObjectWithData(1); assertTrue(rs.next()); + assertEqualsToStringRepresentation(f1, binary, rs.getObject("f1")); + assertEqualsToStringRepresentation(f1, binary, rs.getObject(16)); - assertEquals(f1.toString(), rs.getObject("f1")); - assertEquals(f1.toString(), rs.getObject(16)); - - assertEquals(f2.toString(), rs.getObject("f2")); - assertEquals(f2.toString(), rs.getObject(17)); + assertEqualsToStringRepresentation(f2, binary, rs.getObject("f2")); + assertEqualsToStringRepresentation(f2, binary, rs.getObject(17)); assertNull(rs.getObject("f3")); assertTrue(rs.wasNull()); assertNull(rs.getObject(18)); assertTrue(rs.wasNull()); - assertEquals(o.toString(), rs.getObject("_val")); - assertEquals(o.toString(), rs.getObject(19)); + assertEqualsToStringRepresentation(o, binary, rs.getObject("_val")); + assertEqualsToStringRepresentation(o, binary, rs.getObject(19)); assertFalse(rs.next()); } @@ -684,10 +759,10 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { @SuppressWarnings("PackageVisibleField") private static class TestObjectField implements Serializable { /** */ - final int a; + @GridToStringInclude final int a; /** */ - final String b; + @GridToStringInclude final String b; /** * @param a A. http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java index d48b1c7..75fa3f0 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -23,8 +23,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Properties; import javax.net.ssl.HostnameVerifier; -import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.lang.IgnitePredicate; import org.jetbrains.annotations.Nullable; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java index 156716c..697108f 100644 --- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java @@ -37,7 +37,7 @@ public class BinaryBasicNameMapper implements BinaryNameMapper { } /** - * @param isSimpleName Whether to use simple name of class or not. + * @param isSimpleName Whether to use simple (no package) name of class or not. * <p> * Defaults to {@link #DFLT_SIMPLE_NAME}. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 2c8c964..40476a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -100,6 +100,7 @@ import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; import org.apache.ignite.internal.managers.failover.GridFailoverManager; import org.apache.ignite.internal.managers.indexing.GridIndexingManager; import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.internal.processors.GridProcessor; import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; @@ -169,7 +170,6 @@ import org.apache.ignite.lifecycle.LifecycleAware; import org.apache.ignite.lifecycle.LifecycleBean; import org.apache.ignite.lifecycle.LifecycleEventType; import org.apache.ignite.marshaller.MarshallerExclusions; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean; import org.apache.ignite.mxbean.IgniteMXBean; import org.apache.ignite.mxbean.StripedExecutorMXBean; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java index f6e637f..7194f49 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java @@ -40,6 +40,7 @@ import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.binary.BinaryReflectiveSerializer; import org.apache.ignite.binary.BinarySerializer; import org.apache.ignite.binary.Binarylizable; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.internal.processors.cache.CacheObjectImpl; import org.apache.ignite.internal.processors.query.QueryUtils; import org.apache.ignite.internal.util.GridUnsafe; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java index f339253..da46496 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java @@ -17,6 +17,34 @@ package org.apache.ignite.internal.binary; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLClassLoader; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; @@ -36,6 +64,7 @@ import org.apache.ignite.cache.affinity.AffinityKeyMapped; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataKey; import org.apache.ignite.internal.processors.closure.GridClosureProcessor; import org.apache.ignite.internal.processors.datastructures.CollocatedQueueItemKey; @@ -91,35 +120,6 @@ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Field; -import java.math.BigDecimal; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLClassLoader; -import java.sql.Time; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.UUID; -import java.util.concurrent.ConcurrentMap; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; - import static org.apache.ignite.internal.MarshallerPlatformIds.JAVA_ID; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java index 75f1807..257b34c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java @@ -24,9 +24,9 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.internal.MarshallerContextImpl; import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.plugin.PluginProvider; import org.jetbrains.annotations.Nullable; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java index bc8220f..8865b2d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java @@ -26,9 +26,9 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; - import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java index 4c0ce17..ccd9946 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java @@ -47,11 +47,11 @@ import java.util.UUID; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.SerializableTransient; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.marshaller.MarshallerContext; import org.apache.ignite.marshaller.MarshallerExclusions; -import org.apache.ignite.internal.util.SerializableTransient; import org.apache.ignite.marshaller.MarshallerUtils; import static java.lang.reflect.Modifier.isFinal; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java index 575c9a4..0a54be2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java @@ -70,7 +70,7 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALL * <bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> * ... * <property name="marshaller"> - * <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> + * <bean class="OptimizedMarshaller"> * <property name="requireSerializable">true</property> * </bean> * </property> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/package-info.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/package-info.java new file mode 100644 index 0000000..7f58f9c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/package-info.java @@ -0,0 +1,22 @@ +/* + * 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 description. --> + * Contains Optimized marshaller. + */ +package org.apache.ignite.internal.marshaller.optimized; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java index 8ffeacd..3ab27ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java @@ -19,10 +19,8 @@ package org.apache.ignite.marshaller; import java.io.InputStream; import java.io.OutputStream; - import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.jetbrains.annotations.Nullable; /** @@ -34,7 +32,6 @@ import org.jetbrains.annotations.Nullable; * <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 OptimizedMarshaller}</li> * <li>{@link org.apache.ignite.marshaller.jdk.JdkMarshaller}</li> * </ul> * <p> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java index 8c27841..6759c40 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java @@ -21,8 +21,8 @@ import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; +import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.internal.util.io.GridByteArrayInputStream; import org.apache.ignite.internal.util.io.GridByteArrayOutputStream; import org.apache.ignite.internal.util.typedef.internal.S; @@ -37,7 +37,8 @@ import org.jetbrains.annotations.Nullable; * <h2 class="header">Mandatory</h2> * This marshaller has no mandatory configuration parameters. * <h2 class="header">Java Example</h2> - * {@code JdkMarshaller} needs to be explicitly configured to override default {@link OptimizedMarshaller}. + * {@code JdkMarshaller} needs to be explicitly configured to override default <b>binary marshaller</b> - + * see {@link IgniteBinary}. * <pre name="code" class="java"> * JdkMarshaller marshaller = new JdkMarshaller(); * http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml index 596f7ad..fdae325 100644 --- a/modules/core/src/test/config/example-cache.xml +++ b/modules/core/src/test/config/example-cache.xml @@ -44,10 +44,7 @@ <property name="peerClassLoadingEnabled" value="true"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - <!-- Set to false to allow non-serializable objects in examples, default is true. --> - <property name="requireSerializable" value="false"/> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- Enable cache events for examples. --> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/config/spring-start-nodes-attr.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-start-nodes-attr.xml b/modules/core/src/test/config/spring-start-nodes-attr.xml index b329973..09cd934 100644 --- a/modules/core/src/test/config/spring-start-nodes-attr.xml +++ b/modules/core/src/test/config/spring-start-nodes-attr.xml @@ -37,9 +37,7 @@ <property name="connectorConfiguration"><null/></property> <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"> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/config/spring-start-nodes.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-start-nodes.xml b/modules/core/src/test/config/spring-start-nodes.xml index 9b2ee94..5de58f0 100644 --- a/modules/core/src/test/config/spring-start-nodes.xml +++ b/modules/core/src/test/config/spring-start-nodes.xml @@ -31,9 +31,7 @@ <property name="connectorConfiguration"><null/></property> <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"> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/config/websession/example-cache-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/example-cache-base.xml b/modules/core/src/test/config/websession/example-cache-base.xml index f8fb6d9..8777528 100644 --- a/modules/core/src/test/config/websession/example-cache-base.xml +++ b/modules/core/src/test/config/websession/example-cache-base.xml @@ -30,10 +30,7 @@ <property name="peerClassLoadingEnabled" value="true"/> <property name="marshaller"> - <bean class="org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller"> - <!-- Set to false to allow non-serializable objects in examples, default is true. --> - <property name="requireSerializable" value="false"/> - </bean> + <bean class="org.apache.ignite.internal.binary.BinaryMarshaller" /> </property> <!-- Enable cache events for examples. --> http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java index de8dfbe..361d80f 100644 --- a/modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java @@ -19,32 +19,25 @@ package org.apache.ignite; import java.util.ArrayList; import java.util.List; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.marshaller.MarshallerContext; -import org.apache.ignite.marshaller.MarshallerContextTestImpl; import org.apache.ignite.marshaller.jdk.JdkMarshaller; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Base externalizable test class. */ public class IgniteExternalizableAbstractTest extends GridCommonAbstractTest { - /** */ - private static final MarshallerContext CTX = new MarshallerContextTestImpl(); - /** * @return Marshallers. */ - protected List<Marshaller> getMarshallers() { + protected List<Marshaller> getMarshallers() throws IgniteCheckedException { List<Marshaller> marshallers = new ArrayList<>(); - OptimizedMarshaller opt = new OptimizedMarshaller(); - - opt.setContext(CTX); + BinaryMarshaller bin = createStandaloneBinaryMarshaller(); marshallers.add(new JdkMarshaller()); - marshallers.add(opt); + marshallers.add(bin); return marshallers; } http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreOptimizedMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreOptimizedMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreOptimizedMarshallerSelfTest.java deleted file mode 100644 index f69a593..0000000 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreOptimizedMarshallerSelfTest.java +++ /dev/null @@ -1,31 +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.cache.store.jdbc; - -import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; - -/** - * Test for {@link CacheJdbcPojoStore} with optimized marshaller. - */ -public class CacheJdbcPojoStoreOptimizedMarshallerSelfTest extends CacheJdbcPojoStoreAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected Marshaller marshaller(){ - return new OptimizedMarshaller(); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreOptimizedMarshallerWithSqlEscapeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreOptimizedMarshallerWithSqlEscapeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreOptimizedMarshallerWithSqlEscapeSelfTest.java deleted file mode 100644 index d1ce726..0000000 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreOptimizedMarshallerWithSqlEscapeSelfTest.java +++ /dev/null @@ -1,28 +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.cache.store.jdbc; - -/** - * Test for {@link CacheJdbcPojoStore} with optimized marshaller and enabled SQL escaping. - */ -public class CacheJdbcPojoStoreOptimizedMarshallerWithSqlEscapeSelfTest extends CacheJdbcPojoStoreOptimizedMarshallerSelfTest { - /** {@inheritDoc} */ - @Override protected boolean sqlEscapeAll(){ - return true; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java index e16385e..465a440 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java @@ -35,7 +35,12 @@ import org.jetbrains.annotations.Nullable; */ public class IgfsPathSelfTest extends GridCommonAbstractTest { /** Marshaller to test {@link Externalizable} interface. */ - private final Marshaller marshaller = new OptimizedMarshaller(); + private final Marshaller marshaller; + + /** Ctor. */ + public IgfsPathSelfTest() throws IgniteCheckedException { + marshaller = createStandaloneBinaryMarshaller(); + } /** * Test public methods of igfs path. http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java index 61d6069..a9d3823 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.IgniteCheckedException; 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.internal.client.ssl.GridSslContextFactory; import org.apache.ignite.lifecycle.LifecycleAware; import org.apache.ignite.lifecycle.LifecycleBean; @@ -105,7 +106,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe /** */ - private static class TestMarshaller extends OptimizedMarshaller implements LifecycleAware { + private static class TestMarshaller extends BinaryMarshaller implements LifecycleAware { /** */ private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(null); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySimpleNameTestPropertySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySimpleNameTestPropertySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySimpleNameTestPropertySelfTest.java index 8f2df9e..b9077d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySimpleNameTestPropertySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySimpleNameTestPropertySelfTest.java @@ -20,6 +20,8 @@ package org.apache.ignite.internal.binary; import org.apache.ignite.IgniteBinary; import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryObjectBuilder; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.testframework.config.GridTestProperties; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -30,6 +32,19 @@ import static org.apache.ignite.testframework.config.GridTestProperties.MARSH_CL * Tests testing framewrok, epecially BINARY_MARSHALLER_USE_SIMPLE_NAME_MAPPER test property. */ public class BinarySimpleNameTestPropertySelfTest extends GridCommonAbstractTest { + /** + * flag for facade disabled test. As we use binary marshaller by default al + */ + private boolean enableJdkMarshaller; + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + final IgniteConfiguration configuration = super.getConfiguration(igniteInstanceName); + if (enableJdkMarshaller) + configuration.setMarshaller(new JdkMarshaller()); + return configuration; + } + /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { super.afterTest(); @@ -62,9 +77,11 @@ public class BinarySimpleNameTestPropertySelfTest extends GridCommonAbstractTest } /** + * Check if Binary facade is disabled test. Test uses JDK marshaller to provide warranty facade is not available * @throws Exception If failed. */ public void testBinaryDisabled() throws Exception { + enableJdkMarshaller = true; assertNull(startGrid().binary()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java index f9845c8..283ef87 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.managers; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager; import org.apache.ignite.internal.managers.collision.GridCollisionManager; import org.apache.ignite.internal.managers.communication.GridIoManager; @@ -123,7 +124,7 @@ public class GridManagerStopSelfTest extends GridCommonAbstractTest { injectLogger(spi); ctx.config().setCommunicationSpi(spi); - ctx.config().setMarshaller(new OptimizedMarshaller()); + ctx.config().setMarshaller(new BinaryMarshaller()); GridIoManager mgr = new GridIoManager(ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java index 10a7a30..2345dd6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java @@ -28,9 +28,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2; import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID; import static org.apache.ignite.IgniteSystemProperties.IGNITE_SERVICES_COMPATIBILITY_MODE; -import static org.apache.ignite.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2; import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; import static org.apache.ignite.configuration.DeploymentMode.SHARED; http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java index 2698042..14b49a4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java @@ -33,6 +33,7 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.compute.ComputeJobAdapter; import org.apache.ignite.compute.ComputeTask; +import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.GridMarshallerTestInheritedBean; import org.apache.ignite.marshaller.Marshaller; @@ -273,6 +274,13 @@ public class OptimizedMarshallerTest extends GridCommonAbstractTest { assertEquals(outItf.checkAfterUnmarshalled(), 17); } + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + IgniteConfiguration configuration = super.getConfiguration(igniteInstanceName); + configuration.setMarshaller(marshaller()); + return configuration; + } + /** * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/package-info.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/package-info.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/package-info.java new file mode 100644 index 0000000..d255fac --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/package-info.java @@ -0,0 +1,22 @@ +/* + * 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 description. --> + * Optimized marchalling test package. + */ +package org.apache.ignite.internal.marshaller.optimized; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java index 949147e..d6711c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java @@ -73,26 +73,6 @@ public class CacheStartupInDeploymentModesTest extends GridCommonAbstractTest { /** * @throws Exception If fail. */ - public void testFailedInIsolatedMode() throws Exception { - deploymentMode = DeploymentMode.ISOLATED; - marshaller = new OptimizedMarshaller(); - - doCheckFailed(); - } - - /** - * @throws Exception If fail. - */ - public void testFailedInPrivateMode() throws Exception { - deploymentMode = DeploymentMode.PRIVATE; - marshaller = new OptimizedMarshaller(); - - doCheckFailed(); - } - - /** - * @throws Exception If fail. - */ public void testStartedInIsolatedMode() throws Exception { deploymentMode = DeploymentMode.ISOLATED; marshaller = new BinaryMarshaller(); @@ -133,22 +113,6 @@ public class CacheStartupInDeploymentModesTest extends GridCommonAbstractTest { } /** - * @throws Exception If failed. - */ - private void doCheckFailed() throws Exception { - try { - startGridsMultiThreaded(2); - } - catch (Exception e) { - assert e.getMessage().contains("Cache can be started in PRIVATE or ISOLATED deployment mode only "); - - return; - } - - fail("Unexpected start of the caches!"); - } - - /** * @param cache IgniteCache */ private void checkPutCache(IgniteCache cache) { @@ -224,6 +188,5 @@ public class CacheStartupInDeploymentModesTest extends GridCommonAbstractTest { ", name='" + name + '\'' + '}'; } - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index b10ff70..6939258 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -144,7 +144,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { * @return Marshaller. */ protected Marshaller createMarshaller() throws IgniteCheckedException { - Marshaller marsh = new OptimizedMarshaller(); + Marshaller marsh = createStandaloneBinaryMarshaller(); marsh.setContext(new MarshallerContext() { @Override public boolean registerClassName(byte platformId, int typeId, String clsName) { http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java index 81a17bb..7a21714 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java @@ -37,7 +37,7 @@ import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.cache.extras.GridCacheObsoleteEntryExtras; import org.apache.ignite.internal.processors.cache.store.CacheLocalStore; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; 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; @@ -88,7 +88,7 @@ public class GridCacheStoreManagerDeserializationTest extends GridCommonAbstract if (igniteInstanceName != null && igniteInstanceName.toLowerCase().startsWith("binary")) c.setMarshaller(new BinaryMarshaller()); else - c.setMarshaller(new OptimizedMarshaller()); + c.setMarshaller(new JdkMarshaller()); TcpDiscoverySpi disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java index b69255f..9cec7ec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java @@ -20,8 +20,7 @@ package org.apache.ignite.internal.processors.cache; import java.util.concurrent.Callable; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx; -import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -81,9 +80,7 @@ public class GridCacheVersionSelfTest extends GridCommonAbstractTest { GridCacheVersion ver = version(1, 1); GridCacheVersionEx verEx = new GridCacheVersionEx(2, 2, 0, ver); - OptimizedMarshaller marsh = new OptimizedMarshaller(false); - - marsh.setContext(new MarshallerContextTestImpl()); + Marshaller marsh = createStandaloneBinaryMarshaller(); byte[] verBytes = marsh.marshal(ver); byte[] verExBytes = marsh.marshal(verEx); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java index 051ca00..46669ac 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; -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; @@ -66,10 +66,7 @@ public class CacheAffinityEarlyTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - OptimizedMarshaller marsh = new OptimizedMarshaller(); - marsh.setRequireSerializable(false); - - cfg.setMarshaller(marsh); + cfg.setMarshaller(new BinaryMarshaller()); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java index 1aec352..eb430f6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CacheConfiguration; 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.F; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; @@ -67,10 +68,7 @@ public class CacheGetFutureHangsSelfTest extends GridCommonAbstractTest { ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); - OptimizedMarshaller marsh = new OptimizedMarshaller(); - marsh.setRequireSerializable(false); - - cfg.setMarshaller(marsh); + cfg.setMarshaller(new BinaryMarshaller()); CacheConfiguration ccfg = defaultCacheConfiguration(); ccfg.setCacheMode(CacheMode.PARTITIONED); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java index 3b7fa4f..23fc941 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; -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; @@ -55,10 +55,7 @@ public class IgniteCacheCreatePutMultiNodeSelfTest extends GridCommonAbstractTes cfg.setDiscoverySpi(discoSpi); - OptimizedMarshaller marsh = new OptimizedMarshaller(); - marsh.setRequireSerializable(false); - - cfg.setMarshaller(marsh); + cfg.setMarshaller(new BinaryMarshaller()); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java index c754b38..113cea4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java @@ -26,8 +26,8 @@ import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.CacheConfiguration; 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.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -67,10 +67,7 @@ public class IgniteCacheCreatePutTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - OptimizedMarshaller marsh = new OptimizedMarshaller(); - marsh.setRequireSerializable(false); - - cfg.setMarshaller(marsh); + cfg.setMarshaller(new BinaryMarshaller()); CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java index 480dc20..5bbeef9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java @@ -141,6 +141,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends GridCommonAbstractTe } /** + * See also https://issues.apache.org/jira/browse/IGNITE-5078 * @throws Exception if failed. */ public void testIgnore() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java index b29f2bb..72928b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -83,7 +83,8 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); cfg.setClientMode(client); - cfg.setMarshaller(new OptimizedMarshaller()); + //set custom marshaller to get expected exception + cfg.setMarshaller(new JdkMarshaller()); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java index d215815..acc6742 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java @@ -218,13 +218,6 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest { } /** - * @return Use optimized marshaller flag. - */ - protected boolean useOptimizedMarshaller() { - return false; - } - - /** * @return Whether append is supported. */ protected boolean appendSupported() { @@ -386,9 +379,6 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); - if (useOptimizedMarshaller()) - cfg.setMarshaller(new OptimizedMarshaller()); - cfg.setIgniteInstanceName(igniteInstanceName); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java index 47af49b..a81bba5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java @@ -17,23 +17,27 @@ package org.apache.ignite.internal.processors.igfs; +import java.io.Externalizable; +import java.util.Random; +import java.util.concurrent.Callable; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.jetbrains.annotations.Nullable; -import java.io.Externalizable; -import java.util.Random; -import java.util.concurrent.Callable; - /** * {@link IgfsEntryInfo} test case. */ public class IgfsFileInfoSelfTest extends IgfsCommonAbstractTest { /** Marshaller to test {@link Externalizable} interface. */ - private final Marshaller marshaller = new OptimizedMarshaller(); + private final Marshaller marshaller; + + /** Ctor. */ + public IgfsFileInfoSelfTest() throws IgniteCheckedException { + marshaller = createStandaloneBinaryMarshaller(); + } + /** * Test node info serialization. http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOptimziedMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOptimziedMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOptimziedMarshallerSelfTest.java deleted file mode 100644 index e4ad1f4..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOptimziedMarshallerSelfTest.java +++ /dev/null @@ -1,28 +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.internal.processors.igfs; - -/** - * Tests for PRIMARY mode with optimized marshaller. - */ -public class IgfsPrimaryOptimziedMarshallerSelfTest extends IgfsPrimarySelfTest { - /** {@inheritDoc} */ - @Override protected boolean useOptimizedMarshaller() { - return true; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java index 68f68b1..c1af323 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java @@ -27,10 +27,10 @@ import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgniteCallable; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.resources.LoggerResource; import org.apache.ignite.services.Service; @@ -59,7 +59,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - cfg.setMarshaller(new OptimizedMarshaller(false)); + cfg.setMarshaller(new BinaryMarshaller()); cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder).setForceServerMode(true)); http://git-wip-us.apache.org/repos/asf/ignite/blob/98a1758d/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java index 3e1e6f7..51e7196 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java @@ -58,19 +58,6 @@ public class DynamicProxySerializationMultiJvmSelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ - public void testOptimizedMarshaller() throws Exception { - marshFactory = new Callable<Marshaller>() { - @Override public Marshaller call() throws Exception { - return new OptimizedMarshaller(false); - } - }; - - doTestMarshaller(); - } - - /** - * @throws Exception If failed. - */ public void testBinaryMarshaller() throws Exception { marshFactory = new Callable<Marshaller>() { @Override public Marshaller call() throws Exception {
