http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java index 9cf1242..dc70f4d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java @@ -40,19 +40,19 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testClassNames() throws Exception { - BinaryMarshaller marsh = portableMarshaller(Arrays.asList( + BinaryMarshaller marsh = binaryMarshaller(Arrays.asList( new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"), new BinaryTypeConfiguration("unknown.*") )); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<Integer, Class> typeIds = U.field(ctx, "userTypes"); assertEquals(3, typeIds.size()); - assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode())); - assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode())); + assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode())); + assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode())); assertTrue(typeIds.containsKey("innerclass".hashCode())); } @@ -60,7 +60,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testClassNamesWithMapper() throws Exception { - BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() { + BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() { @SuppressWarnings("IfMayBeConditional") @Override public int typeId(String clsName) { if (clsName.endsWith("1")) @@ -81,14 +81,14 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { new BinaryTypeConfiguration("unknown.*") )); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers"); assertEquals(3, typeMappers.size()); - assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1")); - assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2")); + assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1")); + assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2")); assertEquals(500, typeMappers.get("InnerClass").typeId("InnerClass")); } @@ -96,19 +96,19 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testTypeConfigurations() throws Exception { - BinaryMarshaller marsh = portableMarshaller(Arrays.asList( + BinaryMarshaller marsh = binaryMarshaller(Arrays.asList( new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"), new BinaryTypeConfiguration("unknown.*") )); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<Integer, Class> typeIds = U.field(ctx, "userTypes"); assertEquals(3, typeIds.size()); - assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode())); - assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode())); + assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode())); + assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode())); assertTrue(typeIds.containsKey("innerclass".hashCode())); } @@ -116,7 +116,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testTypeConfigurationsWithGlobalMapper() throws Exception { - BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() { + BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() { @SuppressWarnings("IfMayBeConditional") @Override public int typeId(String clsName) { if (clsName.endsWith("1")) @@ -137,14 +137,14 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { new BinaryTypeConfiguration("unknown.*") )); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers"); assertEquals(3, typeMappers.size()); - assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1")); - assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2")); + assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1")); + assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2")); assertEquals(500, typeMappers.get("InnerClass").typeId("InnerClass")); } @@ -152,7 +152,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testTypeConfigurationsWithNonGlobalMapper() throws Exception { - BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() { + BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() { @SuppressWarnings("IfMayBeConditional") @Override public int typeId(String clsName) { if (clsName.endsWith("1")) @@ -173,14 +173,14 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { new BinaryTypeConfiguration("unknown.*") )); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers"); assertEquals(3, typeMappers.size()); - assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1")); - assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2")); + assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1")); + assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2")); assertEquals(500, typeMappers.get("InnerClass").typeId("InnerClass")); } @@ -190,7 +190,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { public void testOverride() throws Exception { BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(); - typeCfg.setTypeName("GridPortableTestClass2"); + typeCfg.setTypeName("GridBinaryTestClass2"); typeCfg.setIdMapper(new BinaryIdMapper() { @Override public int typeId(String clsName) { return 100; @@ -201,49 +201,49 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { } }); - BinaryMarshaller marsh = portableMarshaller(Arrays.asList( + BinaryMarshaller marsh = binaryMarshaller(Arrays.asList( new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"), typeCfg)); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<Integer, Class> typeIds = U.field(ctx, "userTypes"); assertEquals(3, typeIds.size()); - assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode())); + assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode())); assertTrue(typeIds.containsKey("innerclass".hashCode())); - assertFalse(typeIds.containsKey("gridportabletestclass2".hashCode())); + assertFalse(typeIds.containsKey("gridbinarytestclass2".hashCode())); Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers"); - assertEquals(100, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2")); + assertEquals(100, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2")); } /** * @throws Exception If failed. */ public void testClassNamesJar() throws Exception { - BinaryMarshaller marsh = portableMarshaller(Arrays.asList( + BinaryMarshaller marsh = binaryMarshaller(Arrays.asList( new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"), new BinaryTypeConfiguration("unknown.*") )); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<Integer, Class> typeIds = U.field(ctx, "userTypes"); assertEquals(3, typeIds.size()); - assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode())); - assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode())); + assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode())); + assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode())); } /** * @throws Exception If failed. */ public void testClassNamesWithMapperJar() throws Exception { - BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() { + BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() { @SuppressWarnings("IfMayBeConditional") @Override public int typeId(String clsName) { if (clsName.endsWith("1")) @@ -262,40 +262,40 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { new BinaryTypeConfiguration("unknown.*") )); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers"); assertEquals(3, typeMappers.size()); - assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1")); - assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2")); + assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1")); + assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2")); } /** * @throws Exception If failed. */ public void testTypeConfigurationsJar() throws Exception { - BinaryMarshaller marsh = portableMarshaller(Arrays.asList( + BinaryMarshaller marsh = binaryMarshaller(Arrays.asList( new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"), new BinaryTypeConfiguration("unknown.*") )); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<Integer, Class> typeIds = U.field(ctx, "userTypes"); assertEquals(3, typeIds.size()); - assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode())); - assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode())); + assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode())); + assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode())); } /** * @throws Exception If failed. */ public void testTypeConfigurationsWithGlobalMapperJar() throws Exception { - BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() { + BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() { @SuppressWarnings("IfMayBeConditional") @Override public int typeId(String clsName) { if (clsName.endsWith("1")) @@ -314,21 +314,21 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { new BinaryTypeConfiguration("unknown.*") )); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers"); assertEquals(3, typeMappers.size()); - assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1")); - assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2")); + assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1")); + assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2")); } /** * @throws Exception If failed. */ public void testTypeConfigurationsWithNonGlobalMapperJar() throws Exception { - BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() { + BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() { @SuppressWarnings("IfMayBeConditional") @Override public int typeId(String clsName) { if (clsName.endsWith("1")) @@ -347,14 +347,14 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { new BinaryTypeConfiguration("unknown.*") )); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers"); assertEquals(3, typeMappers.size()); - assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1")); - assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2")); + assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1")); + assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2")); } /** @@ -362,7 +362,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { */ public void testOverrideJar() throws Exception { BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration( - "org.apache.ignite.binary.testjar.GridPortableTestClass2"); + "org.apache.ignite.binary.testjar.GridBinaryTestClass2"); typeCfg.setIdMapper(new BinaryIdMapper() { @Override public int typeId(String clsName) { @@ -374,30 +374,30 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { } }); - BinaryMarshaller marsh = portableMarshaller(Arrays.asList( + BinaryMarshaller marsh = binaryMarshaller(Arrays.asList( new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"), typeCfg)); - BinaryContext ctx = portableContext(marsh); + BinaryContext ctx = binaryContext(marsh); Map<Integer, Class> typeIds = U.field(ctx, "userTypes"); assertEquals(3, typeIds.size()); - assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode())); + assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode())); Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers"); assertEquals(3, typeMappers.size()); - assertEquals(100, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2")); + assertEquals(100, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2")); } /** * @param marsh Marshaller. - * @return Portable context. + * @return Binary context. */ - protected BinaryContext portableContext(BinaryMarshaller marsh) { + protected BinaryContext binaryContext(BinaryMarshaller marsh) { GridBinaryMarshaller impl = U.field(marsh, "impl"); return impl.context(); @@ -406,36 +406,36 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { /** * */ - protected BinaryMarshaller portableMarshaller() + protected BinaryMarshaller binaryMarshaller() throws IgniteCheckedException { - return portableMarshaller(null, null, null); + return binaryMarshaller(null, null, null); } /** * */ - protected BinaryMarshaller portableMarshaller(Collection<BinaryTypeConfiguration> cfgs) + protected BinaryMarshaller binaryMarshaller(Collection<BinaryTypeConfiguration> cfgs) throws IgniteCheckedException { - return portableMarshaller(null, null, cfgs); + return binaryMarshaller(null, null, cfgs); } /** * */ - protected BinaryMarshaller portableMarshaller(BinaryIdMapper mapper, Collection<BinaryTypeConfiguration> cfgs) + protected BinaryMarshaller binaryMarshaller(BinaryIdMapper mapper, Collection<BinaryTypeConfiguration> cfgs) throws IgniteCheckedException { - return portableMarshaller(mapper, null, cfgs); + return binaryMarshaller(mapper, null, cfgs); } /** * */ - protected BinaryMarshaller portableMarshaller(BinarySerializer serializer, Collection<BinaryTypeConfiguration> cfgs) + protected BinaryMarshaller binaryMarshaller(BinarySerializer serializer, Collection<BinaryTypeConfiguration> cfgs) throws IgniteCheckedException { - return portableMarshaller(null, serializer, cfgs); + return binaryMarshaller(null, serializer, cfgs); } - protected BinaryMarshaller portableMarshaller( + protected BinaryMarshaller binaryMarshaller( BinaryIdMapper mapper, BinarySerializer serializer, Collection<BinaryTypeConfiguration> cfgs @@ -457,7 +457,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest { marsh.setContext(new MarshallerContextTestImpl(null)); - IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg); + IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg); return marsh; }
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java index 0170f99..ae615b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java @@ -110,22 +110,22 @@ public class GridBinaryTestClasses { /** * */ - public static class TestObjectPlainPortable { + public static class TestObjectPlainBinary { /** */ - public BinaryObject plainPortable; + public BinaryObject plainBinary; /** * */ - public TestObjectPlainPortable() { + public TestObjectPlainBinary() { // No-op. } /** - * @param plainPortable Object. + * @param plainBinary Object. */ - public TestObjectPlainPortable(BinaryObject plainPortable) { - this.plainPortable = plainPortable; + public TestObjectPlainBinary(BinaryObject plainBinary) { + this.plainBinary = plainBinary; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java index 7687f38..c657cfd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.noncompact; import org.apache.ignite.internal.binary.BinaryFieldsHeapSelfTest; /** - * Field tests for heap-based portables with non-compact footer. + * Field tests for heap-based binaries with non-compact footer. */ public class BinaryFieldsHeapNonCompactSelfTest extends BinaryFieldsHeapSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java index 52bccd8..f717f57 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.noncompact; import org.apache.ignite.internal.binary.BinaryFieldsOffheapSelfTest; /** - * Field tests for offheap-based portables with non-compact footer. + * Field tests for offheap-based binaries with non-compact footer. */ public class BinaryFieldsOffheapNonCompactSelfTest extends BinaryFieldsOffheapSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java index 279e4f0..14cc991 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.noncompact; import org.apache.ignite.internal.binary.BinaryFooterOffsetsHeapSelfTest; /** - * Compact offsets tests for heap portable objects with non-compact footer. + * Compact offsets tests for heap binary objects with non-compact footer. */ public class BinaryFooterOffsetsHeapNonCompactSelfTest extends BinaryFooterOffsetsHeapSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java index 66a8d1a..fe2929a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.noncompact; import org.apache.ignite.internal.binary.BinaryFooterOffsetsOffheapSelfTest; /** - * Compact offsets tests for offheap portable objects with non-compact footer. + * Compact offsets tests for offheap binary objects with non-compact footer. */ public class BinaryFooterOffsetsOffheapNonCompactSelfTest extends BinaryFooterOffsetsOffheapSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java index 1305b6e..c698783 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.noncompact; import org.apache.ignite.internal.binary.BinaryObjectBuilderSelfTest; /** - * Portable builder test for objects with non-compact footer. + * Binary builder test for objects with non-compact footer. */ public class BinaryObjectBuilderNonCompactSelfTest extends BinaryObjectBuilderSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java index 363b8e4..23d248d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java @@ -66,7 +66,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb } /** {@inheritDoc} */ - protected boolean portableEnabled() { + protected boolean binaryEnabled() { return false; } @@ -444,14 +444,14 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb TestValue val2 = new TestValue(new byte[10]); - if (portableEnabled()) // TODO: IGNITE-608, check return value when fixed. + if (binaryEnabled()) // TODO: IGNITE-608, check return value when fixed. c.put(key, val); else assertEquals(val, c.getAndPut(key, val)); checkValue(key, val2); - if (portableEnabled()) // TODO: IGNITE-608, check return value when fixed. + if (binaryEnabled()) // TODO: IGNITE-608, check return value when fixed. c.remove(key); else assertEquals(val2, c.getAndRemove(key)); @@ -672,4 +672,4 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb '}'; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java index b9c1449..d29440e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java @@ -284,7 +284,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr GridCacheContext cctx = cache0.context(); - boolean binary = cctx.cacheObjects().isPortableEnabled(null); + boolean binary = cctx.cacheObjects().isBinaryEnabled(null); for (Map.Entry<TestKey, TestValue> e : map.entrySet()) { GridCacheEntryEx entry = cache0.peekEx(e.getKey()); @@ -335,7 +335,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr GridCacheContext cctx = cache0.context(); - boolean binary = cctx.cacheObjects().isPortableEnabled(null); + boolean binary = cctx.cacheObjects().isBinaryEnabled(null); for (Map.Entry<TestKey, byte[]> e : map.entrySet()) { GridCacheEntryEx entry = cache0.peekEx(e.getKey()); @@ -603,4 +603,4 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr this.delegate = delegate; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index a34e7df..f6eb430 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -474,7 +474,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr long ttl, boolean evt, boolean metrics, - boolean keepPortable, + boolean keepBinary, AffinityTopologyVersion topVer, CacheEntryPredicate[] filter, GridDrType drType, @@ -497,7 +497,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr boolean writeThrough, boolean readThrough, boolean retval, - boolean keepPortable, + boolean keepBinary, @Nullable ExpiryPolicy expiryPlc, boolean evt, boolean metrics, @@ -520,7 +520,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr boolean writeThrough, boolean readThrough, boolean retval, - boolean keepPortable, + boolean keepBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean evt, boolean metrics, @@ -552,7 +552,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr boolean retval, boolean evt, boolean metrics, - boolean keepPortable, + boolean keepBinary, AffinityTopologyVersion topVer, CacheEntryPredicate[] filter, GridDrType drType, http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java index 128e316..d1f7826 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java @@ -41,7 +41,7 @@ public class GridBinaryCacheEntryMemorySizeSelfTest extends GridCacheEntryMemory BinaryContext pCtx = new BinaryContext(BinaryNoopMetadataHandler.instance(), iCfg); - IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", pCtx, iCfg); + IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", pCtx, iCfg); return marsh; } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java index 9306958..a3f8055 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java @@ -35,7 +35,7 @@ import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.binary.BinaryObject; /** - * Tests that portable object is the same in cache entry and in index. + * Tests that binary object is the same in cache entry and in index. */ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends GridCacheAbstractSelfTest { /** {@inheritDoc} */ @@ -49,7 +49,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr BinaryConfiguration bCfg = new BinaryConfiguration(); - bCfg.setClassNames(Collections.singletonList(TestPortable.class.getName())); + bCfg.setClassNames(Collections.singletonList(TestBinary.class.getName())); cfg.setBinaryConfiguration(bCfg); @@ -67,7 +67,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr CacheTypeMetadata meta = new CacheTypeMetadata(); meta.setKeyType(Integer.class); - meta.setValueType(TestPortable.class.getName()); + meta.setValueType(TestBinary.class.getName()); Map<String, Class<?>> idx = new HashMap<>(); @@ -91,13 +91,13 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr * @throws Exception If failed. */ public void testIndexReferences() throws Exception { - IgniteCache<Integer, TestPortable> cache = grid(0).cache(null); + IgniteCache<Integer, TestBinary> cache = grid(0).cache(null); String fieldOneVal = "123"; int fieldTwoVal = 123; int key = 0; - cache.put(key, new TestPortable(fieldOneVal, fieldTwoVal)); + cache.put(key, new TestBinary(fieldOneVal, fieldTwoVal)); IgniteCache<Integer, BinaryObject> prj = grid(0).cache(null).withKeepBinary(); @@ -107,7 +107,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr assertEquals(new Integer(fieldTwoVal), cacheVal.field("fieldTwo")); List<?> row = F.first(prj.query(new SqlFieldsQuery("select _val from " + - "TestPortable where _key = ?").setArgs(key)).getAll()); + "TestBinary where _key = ?").setArgs(key)).getAll()); assertEquals(1, row.size()); @@ -119,9 +119,9 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr } /** - * Test portable object. + * Test binary object. */ - private static class TestPortable { + private static class TestBinary { /** */ private String fieldOne; @@ -131,7 +131,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr /** * */ - private TestPortable() { + private TestBinary() { // No-op. } @@ -139,7 +139,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr * @param fieldOne Field one. * @param fieldTwo Field two. */ - private TestPortable(String fieldOne, int fieldTwo) { + private TestBinary(String fieldOne, int fieldTwo) { this.fieldOne = fieldOne; this.fieldTwo = fieldTwo; } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java index 5840149..beb76d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java @@ -43,7 +43,7 @@ import org.jsr166.LongAdder8; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC; /** - * Test for portable objects stored in cache. + * Test for binary objects stored in cache. */ public abstract class GridCacheBinaryObjectsAbstractDataStreamerSelfTest extends GridCommonAbstractTest { /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java index 043f24f..0f73b53 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java @@ -49,7 +49,7 @@ import org.jsr166.LongAdder8; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC; /** - * Test for portable objects stored in cache. + * Test for binary objects stored in cache. */ public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extends GridCommonAbstractTest { /** */ @@ -146,11 +146,11 @@ public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extend switch (threadId) { case 0: - // Put/get/remove portable -> portable. + // Put/get/remove binary -> binary. c.put(new TestObject(rnd.nextInt(10000)), new TestObject(rnd.nextInt(10000))); - IgniteCache<Object, Object> p2 = ((IgniteCacheProxy<Object, Object>)c).keepPortable(); + IgniteCache<Object, Object> p2 = ((IgniteCacheProxy<Object, Object>)c).keepBinary(); BinaryObject v = (BinaryObject)p2.get(new TestObject(rnd.nextInt(10000))); @@ -162,10 +162,10 @@ public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extend break; case 1: - // Put/get int -> portable. + // Put/get int -> binary. c.put(rnd.nextInt(10000), new TestObject(rnd.nextInt(10000))); - IgniteCache<Integer, BinaryObject> p4 = ((IgniteCacheProxy<Object, Object>)c).keepPortable(); + IgniteCache<Integer, BinaryObject> p4 = ((IgniteCacheProxy<Object, Object>)c).keepBinary(); BinaryObject v1 = p4.get(rnd.nextInt(10000)); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java index d24e1e4..2da781b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java @@ -68,7 +68,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; /** - * Test for portable objects stored in cache. + * Test for binary objects stored in cache. */ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonAbstractTest { /** */ @@ -184,7 +184,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA */ @SuppressWarnings("unchecked") public void testCircularReference() throws Exception { - IgniteCache c = keepPortableCache(); + IgniteCache c = keepBinaryCache(); TestReferenceObject obj1 = new TestReferenceObject(); @@ -229,7 +229,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA assertEquals(i, obj.val); } - IgniteCache<Integer, BinaryObject> kpc = keepPortableCache(); + IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache(); for (int i = 0; i < ENTRY_CNT; i++) { BinaryObject po = kpc.get(i); @@ -254,7 +254,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA entries.put(i, val); } - IgniteCache<Integer, BinaryObject> prj = ((IgniteCacheProxy)c).keepPortable(); + IgniteCache<Integer, BinaryObject> prj = ((IgniteCacheProxy)c).keepBinary(); Iterator<Cache.Entry<Integer, BinaryObject>> it = prj.iterator(); @@ -306,7 +306,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA } } - IgniteCache<Integer, Collection<BinaryObject>> kpc = keepPortableCache(); + IgniteCache<Integer, Collection<BinaryObject>> kpc = keepBinaryCache(); for (int i = 0; i < ENTRY_CNT; i++) { Collection<BinaryObject> col = kpc.get(i); @@ -353,7 +353,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA } } - IgniteCache<Integer, Map<Integer, BinaryObject>> kpc = keepPortableCache(); + IgniteCache<Integer, Map<Integer, BinaryObject>> kpc = keepBinaryCache(); for (int i = 0; i < ENTRY_CNT; i++) { Map<Integer, BinaryObject> map = kpc.get(i); @@ -389,14 +389,14 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA assertEquals(i, obj.val); } - IgniteCache<Integer, BinaryObject> kpc = keepPortableCache(); + IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache(); - IgniteCache<Integer, BinaryObject> cachePortableAsync = kpc.withAsync(); + IgniteCache<Integer, BinaryObject> cacheBinaryAsync = kpc.withAsync(); for (int i = 0; i < ENTRY_CNT; i++) { - cachePortableAsync.get(i); + cacheBinaryAsync.get(i); - BinaryObject po = cachePortableAsync.<BinaryObject>future().get(); + BinaryObject po = cacheBinaryAsync.<BinaryObject>future().get(); assertEquals(i, (int)po.field("val")); } @@ -434,7 +434,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA } } - IgniteCache<Integer, BinaryObject> kpc = keepPortableCache(); + IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache(); for (int i = 0; i < ENTRY_CNT; i++) { try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { @@ -483,14 +483,14 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA } } - IgniteCache<Integer, BinaryObject> kpc = keepPortableCache(); - IgniteCache<Integer, BinaryObject> cachePortableAsync = kpc.withAsync(); + IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache(); + IgniteCache<Integer, BinaryObject> cacheBinaryAsync = kpc.withAsync(); for (int i = 0; i < ENTRY_CNT; i++) { try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - cachePortableAsync.get(i); + cacheBinaryAsync.get(i); - BinaryObject po = cachePortableAsync.<BinaryObject>future().get(); + BinaryObject po = cacheBinaryAsync.<BinaryObject>future().get(); assertEquals(i, (int)po.field("val")); @@ -522,7 +522,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA assertEquals(e.getKey().intValue(), e.getValue().val); } - IgniteCache<Integer, BinaryObject> kpc = keepPortableCache(); + IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache(); for (int i = 0; i < ENTRY_CNT; ) { Set<Integer> keys = new HashSet<>(); @@ -566,8 +566,8 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA assertEquals(e.getKey().intValue(), e.getValue().val); } - IgniteCache<Integer, BinaryObject> kpc = keepPortableCache(); - IgniteCache<Integer, BinaryObject> cachePortableAsync = kpc.withAsync(); + IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache(); + IgniteCache<Integer, BinaryObject> cacheBinaryAsync = kpc.withAsync(); for (int i = 0; i < ENTRY_CNT; ) { Set<Integer> keys = new HashSet<>(); @@ -576,9 +576,9 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA keys.add(i++); - cachePortableAsync.getAll(keys); + cacheBinaryAsync.getAll(keys); - Map<Integer, BinaryObject> objs = cachePortableAsync.<Map<Integer, BinaryObject>>future().get(); + Map<Integer, BinaryObject> objs = cacheBinaryAsync.<Map<Integer, BinaryObject>>future().get(); assertEquals(10, objs.size()); @@ -628,7 +628,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA } } - IgniteCache<Integer, BinaryObject> kpc = keepPortableCache(); + IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache(); for (int i = 0; i < ENTRY_CNT; ) { Set<Integer> keys = new HashSet<>(); @@ -693,7 +693,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA } } - IgniteCache<Integer, BinaryObject> cache = keepPortableCache(); + IgniteCache<Integer, BinaryObject> cache = keepBinaryCache(); for (int i = 0; i < ENTRY_CNT; ) { Set<Integer> keys = new HashSet<>(); @@ -785,7 +785,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ public void testTransform() throws Exception { - IgniteCache<Integer, BinaryObject> c = keepPortableCache(); + IgniteCache<Integer, BinaryObject> c = keepBinaryCache(); checkTransform(primaryKey(c)); @@ -798,9 +798,9 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA } /** - * @return Cache with keep portable flag. + * @return Cache with keep binary flag. */ - private <K, V> IgniteCache<K, V> keepPortableCache() { + private <K, V> IgniteCache<K, V> keepBinaryCache() { return ignite(0).cache(null).withKeepBinary(); } @@ -811,7 +811,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA private void checkTransform(Integer key) throws Exception { log.info("Transform: " + key); - IgniteCache<Integer, BinaryObject> c = keepPortableCache(); + IgniteCache<Integer, BinaryObject> c = keepBinaryCache(); try { c.invoke(key, new EntryProcessor<Integer, BinaryObject, Void>() { @@ -836,9 +836,9 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA Ignite ignite = e.unwrap(Ignite.class); - IgniteBinary portables = ignite.binary(); + IgniteBinary binaries = ignite.binary(); - BinaryObjectBuilder builder = portables.builder(val); + BinaryObjectBuilder builder = binaries.builder(val); builder.setField("val", 2); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java index 058dc0b..4f478f7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java @@ -62,7 +62,7 @@ public abstract class GridCacheBinaryStoreAbstractSelfTest extends GridCommonAbs CacheConfiguration cacheCfg = new CacheConfiguration(); cacheCfg.setCacheStoreFactory(singletonFactory(STORE)); - cacheCfg.setKeepBinaryInStore(keepPortableInStore()); + cacheCfg.setKeepBinaryInStore(keepBinaryInStore()); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); cacheCfg.setLoadPreviousValue(true); @@ -81,7 +81,7 @@ public abstract class GridCacheBinaryStoreAbstractSelfTest extends GridCommonAbs /** * @return Keep binary in store flag. */ - protected abstract boolean keepPortableInStore(); + protected abstract boolean keepBinaryInStore(); /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java index 55f2da0..4d163b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.binary.BinaryObject; */ public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAbstractSelfTest { /** {@inheritDoc} */ - @Override protected boolean keepPortableInStore() { + @Override protected boolean keepBinaryInStore() { return true; } @@ -34,7 +34,7 @@ public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAb assert idxs != null; for (int idx : idxs) - map.put(portable(new Key(idx)), portable(new Value(idx))); + map.put(binary(new Key(idx)), binary(new Value(idx))); } /** {@inheritDoc} */ @@ -45,7 +45,7 @@ public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAb assertEquals(idxs.length, map.size()); for (int idx : idxs) { - Object val = map.get(portable(new Key(idx))); + Object val = map.get(binary(new Key(idx))); assertTrue(String.valueOf(val), val instanceof BinaryObject); @@ -58,9 +58,9 @@ public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAb /** * @param obj Object. - * @return Portable object. + * @return Binary object. */ - private Object portable(Object obj) { + private Object binary(Object obj) { return grid().binary().toBinary(obj); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java index a4d08ec..1096c15 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java @@ -24,7 +24,7 @@ import java.util.Map; */ public class GridCacheBinaryStoreObjectsSelfTest extends GridCacheBinaryStoreAbstractSelfTest { /** {@inheritDoc} */ - @Override protected boolean keepPortableInStore() { + @Override protected boolean keepBinaryInStore() { return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java index 004494e..fee302b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java @@ -96,10 +96,10 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo IgniteInternalFuture<?> fut; try { - // Update portable metadata concurrently with client nodes start. + // Update binary metadata concurrently with client nodes start. fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { - IgniteBinary portables = ignite(0).binary(); + IgniteBinary binaries = ignite(0).binary(); IgniteCache<Object, Object> cache = ignite(0).cache(null).withKeepBinary(); @@ -108,12 +108,12 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo for (int i = 0; i < 1000; i++) { log.info("Iteration: " + i); - String type = "portable-type-" + i; + String type = "binary-type-" + i; allTypes.add(type); for (int f = 0; f < 10; f++) { - BinaryObjectBuilder builder = portables.builder(type); + BinaryObjectBuilder builder = binaries.builder(type); String fieldName = "f" + f; @@ -145,7 +145,7 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo assertFalse(allTypes.isEmpty()); - log.info("Expected portable types: " + allTypes.size()); + log.info("Expected binary types: " + allTypes.size()); assertEquals(7, ignite(0).cluster().nodes().size()); @@ -156,9 +156,9 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo assertEquals((Object)client, ignite(i).configuration().isClientMode()); - IgniteBinary portables = ignite(i).binary(); + IgniteBinary binaries = ignite(i).binary(); - Collection<BinaryType> metaCol = portables.types(); + Collection<BinaryType> metaCol = binaries.types(); assertEquals(allTypes.size(), metaCol.size()); @@ -182,12 +182,12 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo public void testFailoverOnStart() throws Exception { startGrids(4); - IgniteBinary portables = ignite(0).binary(); + IgniteBinary binaries = ignite(0).binary(); IgniteCache<Object, Object> cache = ignite(0).cache(null).withKeepBinary(); for (int i = 0; i < 1000; i++) { - BinaryObjectBuilder builder = portables.builder("type-" + i); + BinaryObjectBuilder builder = binaries.builder("type-" + i); builder.setField("f0", i); @@ -232,9 +232,9 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo assertEquals((Object) client, ignite(i).configuration().isClientMode()); - portables = ignite(i).binary(); + binaries = ignite(i).binary(); - final IgniteBinary p0 = portables; + final IgniteBinary p0 = binaries; GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { @@ -244,7 +244,7 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo } }, getTestTimeout()); - Collection<BinaryType> metaCol = portables.types(); + Collection<BinaryType> metaCol = binaries.types(); assertEquals(1000, metaCol.size()); @@ -278,12 +278,12 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo assertFalse(ignite1.configuration().isClientMode()); - IgniteBinary portables = ignite(1).binary(); + IgniteBinary binaries = ignite(1).binary(); IgniteCache<Object, Object> cache = ignite(1).cache(null).withKeepBinary(); for (int i = 0; i < 100; i++) { - BinaryObjectBuilder builder = portables.builder("type-" + i); + BinaryObjectBuilder builder = binaries.builder("type-" + i); builder.setField("f0", i); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java index 2a71748..b91b088 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java @@ -94,7 +94,7 @@ public class GridCacheClientNodeBinaryObjectMetadataTest extends GridCacheAbstra /** * @throws Exception If failed. */ - public void testPortableMetadataOnClient() throws Exception { + public void testBinaryMetadataOnClient() throws Exception { Ignite ignite0 = ignite(gridCount() - 1); assertTrue(ignite0.configuration().isClientMode()); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java index 125a055..4caa5fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java @@ -55,7 +55,7 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { private static final int KEYS_COUNT = 1000; /** Flag indicating should be cache configured with binary or not. */ - private static boolean portables; + private static boolean binaries; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -66,7 +66,7 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - if (portables) { + if (binaries) { BinaryMarshaller marsh = new BinaryMarshaller(); cfg.setMarshaller(marsh); @@ -101,7 +101,7 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { */ public void testAddDataFromMap() throws Exception { try { - portables = false; + binaries = false; startGrids(2); @@ -143,13 +143,13 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { } /** - * Data streamer should add portable object that weren't registered explicitly. + * Data streamer should add binary object that weren't registered explicitly. * * @throws Exception If failed. */ - public void testAddMissingPortable() throws Exception { + public void testAddMissingBinary() throws Exception { try { - portables = true; + binaries = true; startGrids(2); @@ -177,14 +177,14 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { } /** - * Data streamer should correctly load portable entries from HashMap in case of grids with more than one node + * Data streamer should correctly load binary entries from HashMap in case of grids with more than one node * and with GridOptimizedMarshaller that requires serializable. * * @throws Exception If failed. */ - public void testAddPortableDataFromMap() throws Exception { + public void testAddBinaryDataFromMap() throws Exception { try { - portables = true; + binaries = true; startGrids(2); @@ -220,8 +220,8 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { assertEquals(k, v.val()); } - // Read random keys. Take values as PortableObject. - IgniteCache<Integer, BinaryObject> c2 = ((IgniteCacheProxy)c).keepPortable(); + // Read random keys. Take values as BinaryObject. + IgniteCache<Integer, BinaryObject> c2 = ((IgniteCacheProxy)c).keepBinary(); for (int i = 0; i < 100; i ++) { Integer k = rnd.nextInt(KEYS_COUNT); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java index 0199217..db57cf9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java @@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** - * Test for portable objects stored in cache. + * Test for binary objects stored in cache. */ public class GridCacheBinaryObjectsAtomicNearDisabledSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java index fcdd184..7501abc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java @@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** - * Test for portable objects stored in cache. + * Test for binary objects stored in cache. */ public class GridCacheBinaryObjectsAtomicSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java index dc439d7..a512bdf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java @@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** - * Test for portable objects stored in cache. + * Test for binary objects stored in cache. */ public class GridCacheBinaryObjectsPartitionedNearDisabledSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java index 550ae3f..341b571 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java @@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** - * Test for portable objects stored in cache. + * Test for binary objects stored in cache. */ public class GridCacheBinaryObjectsPartitionedSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java index 3494b5c..d9b4663 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.internal.binary.BinaryMarshaller; */ public class GridCacheOffHeapTieredAtomicBinarySelfTest extends GridCacheOffHeapTieredAtomicSelfTest { /** {@inheritDoc} */ - @Override protected boolean portableEnabled() { + @Override protected boolean binaryEnabled() { return true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java index 7cde9e7..abfc739 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.internal.binary.BinaryMarshaller; */ public class GridCacheOffHeapTieredBinarySelfTest extends GridCacheOffHeapTieredSelfTest { /** {@inheritDoc} */ - @Override protected boolean portableEnabled() { + @Override protected boolean binaryEnabled() { return true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java index 79fe8d3..aec896a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java @@ -44,24 +44,24 @@ public class GridCacheOffHeapTieredEvictionAtomicBinarySelfTest extends GridCach /** {@inheritDoc} */ @Override protected TestPredicate testPredicate(String expVal, boolean acceptNull) { - return new PortableValuePredicate(expVal, acceptNull); + return new BinaryValuePredicate(expVal, acceptNull); } /** {@inheritDoc} */ @Override protected TestProcessor testClosure(String expVal, boolean acceptNull) { - return new PortableValueClosure(expVal, acceptNull); + return new BinaryValueClosure(expVal, acceptNull); } /** * */ @SuppressWarnings("PackageVisibleInnerClass") - static class PortableValuePredicate extends TestPredicate { + static class BinaryValuePredicate extends TestPredicate { /** * @param expVal Expected value. * @param acceptNull If {@code true} value can be null; */ - PortableValuePredicate(String expVal, boolean acceptNull) { + BinaryValuePredicate(String expVal, boolean acceptNull) { super(expVal, acceptNull); } @@ -77,12 +77,12 @@ public class GridCacheOffHeapTieredEvictionAtomicBinarySelfTest extends GridCach * */ @SuppressWarnings("PackageVisibleInnerClass") - static class PortableValueClosure extends TestProcessor { + static class BinaryValueClosure extends TestProcessor { /** * @param expVal Expected value. * @param acceptNull If {@code true} value can be null; */ - PortableValueClosure(String expVal, boolean acceptNull) { + BinaryValueClosure(String expVal, boolean acceptNull) { super(expVal, acceptNull); } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java index 9a47e4f..3138eb7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java @@ -44,24 +44,24 @@ public class GridCacheOffHeapTieredEvictionBinarySelfTest extends GridCacheOffHe /** {@inheritDoc} */ @Override protected TestPredicate testPredicate(String expVal, boolean acceptNull) { - return new PortableValuePredicate(expVal, acceptNull); + return new BinaryValuePredicate(expVal, acceptNull); } /** {@inheritDoc} */ @Override protected TestProcessor testClosure(String expVal, boolean acceptNull) { - return new PortableValueClosure(expVal, acceptNull); + return new BinaryValueClosure(expVal, acceptNull); } /** * */ @SuppressWarnings("PackageVisibleInnerClass") - static class PortableValuePredicate extends TestPredicate { + static class BinaryValuePredicate extends TestPredicate { /** * @param expVal Expected value. * @param acceptNull If {@code true} value can be null; */ - PortableValuePredicate(String expVal, boolean acceptNull) { + BinaryValuePredicate(String expVal, boolean acceptNull) { super(expVal, acceptNull); } @@ -77,12 +77,12 @@ public class GridCacheOffHeapTieredEvictionBinarySelfTest extends GridCacheOffHe * */ @SuppressWarnings("PackageVisibleInnerClass") - static class PortableValueClosure extends TestProcessor { + static class BinaryValueClosure extends TestProcessor { /** * @param expVal Expected value. * @param acceptNull If {@code true} value can be null; */ - PortableValueClosure(String expVal, boolean acceptNull) { + BinaryValueClosure(String expVal, boolean acceptNull) { super(expVal, acceptNull); } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java index 90f060f..719c564 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java @@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.REPLICATED; /** - * Test for portable objects stored in cache. + * Test for binary objects stored in cache. */ public class GridCacheBinaryObjectsReplicatedSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java index fc38561..2712181 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java @@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.LOCAL; /** - * Test for portable objects stored in cache. + * Test for binary objects stored in cache. */ public class GridCacheBinaryObjectsLocalSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java index a284883..03ab998 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java @@ -74,17 +74,17 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter<Integer, Object> /** Type: map. */ private static final int TYPE_MAP = 11; - /** Type: portable object which exists in all platforms. */ - private static final int TYPE_PORTABLE = 12; + /** Type: binary object which exists in all platforms. */ + private static final int TYPE_BINARY = 12; - /** Type: portable object which exists only in Java. */ - private static final int TYPE_PORTABLE_JAVA = 13; + /** Type: binary object which exists only in Java. */ + private static final int TYPE_BINARY_JAVA = 13; /** Type: object array. */ private static final int TYPE_OBJ_ARRAY = 14; - /** Type: portable object array. */ - private static final int TYPE_PORTABLE_ARRAY = 15; + /** Type: binary object array. */ + private static final int TYPE_BINARY_ARRAY = 15; /** Type: enum. */ private static final int TYPE_ENUM = 16; @@ -165,16 +165,16 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter<Integer, Object> case TYPE_MAP: return Collections.singletonMap(1, 1); - case TYPE_PORTABLE: + case TYPE_BINARY: return new PlatformComputeBinarizable(1); - case TYPE_PORTABLE_JAVA: + case TYPE_BINARY_JAVA: return new PlatformComputeJavaBinarizable(1); case TYPE_OBJ_ARRAY: return new String[] { "foo", "bar", "baz" }; - case TYPE_PORTABLE_ARRAY: + case TYPE_BINARY_ARRAY: return new PlatformComputeBinarizable[] { new PlatformComputeBinarizable(1), new PlatformComputeBinarizable(2), @@ -203,4 +203,4 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter<Integer, Object> } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java index f3374c4..3038cba 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java @@ -102,7 +102,7 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract marsh.setContext(new MarshallerContextTestImpl(null)); - IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, cfg); + IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, cfg); } GridSessionCheckpointSelfTest.spi = spi; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/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 67a4f20..4e3f326 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 @@ -266,7 +266,7 @@ public class IgniteTestResources { if (marsh instanceof BinaryMarshaller) { BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration()); - IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, new IgniteConfiguration()); + IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, new IgniteConfiguration()); } return marsh; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/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 index 3dc78cc..e891d35 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java @@ -22,7 +22,7 @@ import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.testframework.config.GridTestProperties; /** - * Cache full API suite with portable marshaller. + * Cache full API suite with binary marshaller. */ public class IgniteBinaryCacheFullApiTestSuite extends TestSuite { /** http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/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 729bebe..982bd4c 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 @@ -47,7 +47,7 @@ import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorSel import org.apache.ignite.testframework.config.GridTestProperties; /** - * Cache suite with portable marshaller. + * Cache suite with binary marshaller. */ public class IgniteBinaryCacheTestSuite extends TestSuite { /** @@ -57,11 +57,11 @@ public class IgniteBinaryCacheTestSuite extends TestSuite { public static TestSuite suite() throws Exception { GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - TestSuite suite = new TestSuite("Portable Cache Test Suite"); + TestSuite suite = new TestSuite("Binary Cache Test Suite"); HashSet<Class> ignoredTests = new HashSet<>(); - // Tests below have a special version for Portable Marshaller + // Tests below have a special version for Binary Marshaller ignoredTests.add(DataStreamProcessorSelfTest.class); ignoredTests.add(GridCacheOffHeapTieredEvictionAtomicSelfTest.class); ignoredTests.add(GridCacheOffHeapTieredEvictionSelfTest.class); @@ -71,7 +71,7 @@ public class IgniteBinaryCacheTestSuite extends TestSuite { ignoredTests.add(IgniteCacheAtomicLocalExpiryPolicyTest.class); ignoredTests.add(GridCacheEntryMemorySizeSelfTest.class); - // Tests that are not ready to be used with PortableMarshaller + // Tests that are not ready to be used with BinaryMarshaller ignoredTests.add(GridCacheMvccSelfTest.class); suite.addTest(IgniteCacheTestSuite.suite(ignoredTests)); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/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 7a6a0a6..d80478b 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 @@ -34,7 +34,7 @@ public class IgniteBinaryObjectsCacheTestSuite3 { 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.CacheDeploymentPortableEntryProcessor"); + "org.apache.ignite.tests.p2p.CacheDeploymentBinaryEntryProcessor"); TestSuite suite = IgniteCacheTestSuite3.suite();
