http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java index 917ba03..ea96842 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java @@ -17,34 +17,6 @@ package org.apache.ignite.internal.portable; -import junit.framework.Assert; -import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.builder.PortableBuilderImpl; -import org.apache.ignite.internal.util.GridUnsafe; -import org.apache.ignite.internal.util.IgniteUtils; -import org.apache.ignite.internal.util.lang.GridMapEntry; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableBuilder; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableIdMapper; -import org.apache.ignite.portable.PortableMarshalAware; -import org.apache.ignite.portable.PortableMetadata; -import org.apache.ignite.portable.PortableObject; -import org.apache.ignite.portable.PortableRawReader; -import org.apache.ignite.portable.PortableRawWriter; -import org.apache.ignite.portable.PortableReader; -import org.apache.ignite.portable.PortableSerializer; -import org.apache.ignite.portable.PortableTypeConfiguration; -import org.apache.ignite.portable.PortableWriter; -import org.apache.ignite.testframework.GridTestUtils; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ConcurrentHashMap8; -import sun.misc.Unsafe; - import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -67,6 +39,34 @@ import java.util.TreeSet; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet; +import junit.framework.Assert; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.binary.BinaryObject; +import org.apache.ignite.binary.BinaryObjectBuilder; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryRawReader; +import org.apache.ignite.binary.BinaryRawWriter; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinarySerializer; +import org.apache.ignite.binary.BinaryType; +import org.apache.ignite.binary.BinaryTypeConfiguration; +import org.apache.ignite.binary.BinaryTypeIdMapper; +import org.apache.ignite.binary.BinaryWriter; +import org.apache.ignite.binary.Binarylizable; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.portable.builder.BinaryObjectBuilderImpl; +import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.internal.util.lang.GridMapEntry; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.marshaller.MarshallerContextTestImpl; +import org.apache.ignite.marshaller.portable.PortableMarshaller; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jsr166.ConcurrentHashMap8; +import sun.misc.Unsafe; import static org.apache.ignite.internal.portable.PortableThreadLocalMemoryAllocator.THREAD_LOCAL_ALLOC; import static org.junit.Assert.assertArrayEquals; @@ -84,11 +84,11 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { /** */ protected static final PortableMetaDataHandler META_HND = new PortableMetaDataHandler() { - @Override public void addMeta(int typeId, PortableMetadata meta) { + @Override public void addMeta(int typeId, BinaryType meta) { // No-op. } - @Override public PortableMetadata metadata(int typeId) { + @Override public BinaryType metadata(int typeId) { return null; } }; @@ -394,16 +394,16 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testPortableObject() throws Exception { + public void testBinaryObject() throws Exception { PortableMarshaller marsh = new PortableMarshaller(); - marsh.setTypeConfigurations(Arrays.asList(new PortableTypeConfiguration(SimpleObject.class.getName()))); + marsh.setTypeConfigurations(Arrays.asList(new BinaryTypeConfiguration(SimpleObject.class.getName()))); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); - PortableObject po0 = marshalUnmarshal(po, marsh); + BinaryObject po0 = marshalUnmarshal(po, marsh); assertTrue(po.hasField("b")); assertTrue(po.hasField("s")); @@ -435,7 +435,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testDateAndTimestampInSingleObject() throws Exception { - PortableTypeConfiguration cfg1 = new PortableTypeConfiguration(DateClass1.class.getName()); + BinaryTypeConfiguration cfg1 = new BinaryTypeConfiguration(DateClass1.class.getName()); PortableMarshaller marsh = new PortableMarshaller(); @@ -448,7 +448,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { obj1.date = date; obj1.ts = ts; - PortableObject po1 = marshal(obj1, marsh); + BinaryObject po1 = marshal(obj1, marsh); assertEquals(date, po1.field("date")); assertEquals(Date.class, po1.field("date").getClass()); @@ -467,12 +467,12 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); assertEquals(obj.hashCode(), po.hashCode()); @@ -509,7 +509,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assertArrayEquals(ordinals(obj.enumArr), ordinals((Enum<?>[])po.field("enumArr"))); assertNull(po.field("unknown")); - PortableObject innerPo = po.field("inner"); + BinaryObject innerPo = po.field("inner"); assertEquals(obj.inner, innerPo.deserialize()); @@ -554,13 +554,13 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()), - new PortableTypeConfiguration(TestPortableObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()), + new BinaryTypeConfiguration(TestBinary.class.getName()) )); - TestPortableObject obj = portableObject(); + TestBinary obj = BinaryObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); assertEquals(obj.hashCode(), po.hashCode()); @@ -596,7 +596,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assertArrayEquals(ordinals(obj.enumArr), ordinals((Enum<?>[])po.field("_enumArr"))); assertNull(po.field("unknown")); - PortableObject simplePo = po.field("_simple"); + BinaryObject simplePo = po.field("_simple"); assertEquals(obj.simple, simplePo.deserialize()); @@ -634,7 +634,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assertNull(simplePo.field("portable")); assertNull(simplePo.field("unknown")); - PortableObject portablePo = po.field("_portable"); + BinaryObject portablePo = po.field("_portable"); assertEquals(obj.portable, portablePo.deserialize()); @@ -676,7 +676,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { * @param obj Simple object. * @param po Portable object. */ - private void checkSimpleObjectData(SimpleObject obj, PortableObject po) { + private void checkSimpleObjectData(SimpleObject obj, BinaryObject po) { assertEquals(obj.b, (byte)po.field("b")); assertEquals(obj.s, (short)po.field("s")); assertEquals(obj.i, (int)po.field("i")); @@ -718,25 +718,25 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(NoPublicConstructor.class.getName()), - new PortableTypeConfiguration(NoPublicDefaultConstructor.class.getName()), - new PortableTypeConfiguration(ProtectedConstructor.class.getName())) + new BinaryTypeConfiguration(NoPublicConstructor.class.getName()), + new BinaryTypeConfiguration(NoPublicDefaultConstructor.class.getName()), + new BinaryTypeConfiguration(ProtectedConstructor.class.getName())) ); initPortableContext(marsh); NoPublicConstructor npc = new NoPublicConstructor(); - PortableObject npc2 = marshal(npc, marsh); + BinaryObject npc2 = marshal(npc, marsh); assertEquals("test", npc2.<NoPublicConstructor>deserialize().val); NoPublicDefaultConstructor npdc = new NoPublicDefaultConstructor(239); - PortableObject npdc2 = marshal(npdc, marsh); + BinaryObject npdc2 = marshal(npdc, marsh); assertEquals(239, npdc2.<NoPublicDefaultConstructor>deserialize().val); ProtectedConstructor pc = new ProtectedConstructor(); - PortableObject pc2 = marshal(pc, marsh); + BinaryObject pc2 = marshal(pc, marsh); assertEquals(ProtectedConstructor.class, pc2.<ProtectedConstructor>deserialize().getClass()); } @@ -747,8 +747,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { public void testCustomSerializer() throws Exception { PortableMarshaller marsh = new PortableMarshaller(); - PortableTypeConfiguration type = - new PortableTypeConfiguration(CustomSerializedObject1.class.getName()); + BinaryTypeConfiguration type = + new BinaryTypeConfiguration(CustomSerializedObject1.class.getName()); type.setSerializer(new CustomSerializer1()); @@ -756,7 +756,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { CustomSerializedObject1 obj1 = new CustomSerializedObject1(10); - PortableObject po1 = marshal(obj1, marsh); + BinaryObject po1 = marshal(obj1, marsh); assertEquals(20, po1.<CustomSerializedObject1>deserialize().val); } @@ -769,10 +769,10 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { marsh.setSerializer(new CustomSerializer1()); - PortableTypeConfiguration type1 = - new PortableTypeConfiguration(CustomSerializedObject1.class.getName()); - PortableTypeConfiguration type2 = - new PortableTypeConfiguration(CustomSerializedObject2.class.getName()); + BinaryTypeConfiguration type1 = + new BinaryTypeConfiguration(CustomSerializedObject1.class.getName()); + BinaryTypeConfiguration type2 = + new BinaryTypeConfiguration(CustomSerializedObject2.class.getName()); type2.setSerializer(new CustomSerializer2()); @@ -780,13 +780,13 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { CustomSerializedObject1 obj1 = new CustomSerializedObject1(10); - PortableObject po1 = marshal(obj1, marsh); + BinaryObject po1 = marshal(obj1, marsh); assertEquals(20, po1.<CustomSerializedObject1>deserialize().val); CustomSerializedObject2 obj2 = new CustomSerializedObject2(10); - PortableObject po2 = marshal(obj2, marsh); + BinaryObject po2 = marshal(obj2, marsh); assertEquals(30, po2.<CustomSerializedObject2>deserialize().val); } @@ -797,10 +797,10 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { public void testCustomIdMapper() throws Exception { PortableMarshaller marsh = new PortableMarshaller(); - PortableTypeConfiguration type = - new PortableTypeConfiguration(CustomMappedObject1.class.getName()); + BinaryTypeConfiguration type = + new BinaryTypeConfiguration(CustomMappedObject1.class.getName()); - type.setIdMapper(new PortableIdMapper() { + type.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 11111; } @@ -823,7 +823,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { CustomMappedObject1 obj1 = new CustomMappedObject1(10, "str"); - PortableObjectEx po1 = marshal(obj1, marsh); + BinaryObjectEx po1 = marshal(obj1, marsh); assertEquals(11111, po1.typeId()); assertEquals(10, po1.field(22222)); @@ -839,7 +839,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { public void testCustomIdMapperWithGlobal() throws Exception { PortableMarshaller marsh = new PortableMarshaller(); - marsh.setIdMapper(new PortableIdMapper() { + marsh.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 11111; } @@ -856,12 +856,12 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } }); - PortableTypeConfiguration type1 = - new PortableTypeConfiguration(CustomMappedObject1.class.getName()); - PortableTypeConfiguration type2 = - new PortableTypeConfiguration(CustomMappedObject2.class.getName()); + BinaryTypeConfiguration type1 = + new BinaryTypeConfiguration(CustomMappedObject1.class.getName()); + BinaryTypeConfiguration type2 = + new BinaryTypeConfiguration(CustomMappedObject2.class.getName()); - type2.setIdMapper(new PortableIdMapper() { + type2.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 44444; } @@ -882,7 +882,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { CustomMappedObject1 obj1 = new CustomMappedObject1(10, "str1"); - PortableObjectEx po1 = marshal(obj1, marsh); + BinaryObjectEx po1 = marshal(obj1, marsh); assertEquals(11111, po1.typeId()); assertEquals(10, po1.field(22222)); @@ -893,7 +893,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { CustomMappedObject2 obj2 = new CustomMappedObject2(20, "str2"); - PortableObjectEx po2 = marshal(obj2, marsh); + BinaryObjectEx po2 = marshal(obj2, marsh); assertEquals(44444, po2.typeId()); assertEquals(20, po2.field(55555)); @@ -910,10 +910,10 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(DynamicObject.class.getName()) + new BinaryTypeConfiguration(DynamicObject.class.getName()) )); - PortableObject po1 = marshal(new DynamicObject(0, 10, 20, 30), marsh); + BinaryObject po1 = marshal(new DynamicObject(0, 10, 20, 30), marsh); assertEquals(new Integer(10), po1.field("val1")); assertEquals(null, po1.field("val2")); @@ -925,7 +925,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assertEquals(0, do1.val2); assertEquals(0, do1.val3); - PortableObject po2 = marshal(new DynamicObject(1, 10, 20, 30), marsh); + BinaryObject po2 = marshal(new DynamicObject(1, 10, 20, 30), marsh); assertEquals(new Integer(10), po2.field("val1")); assertEquals(new Integer(20), po2.field("val2")); @@ -937,7 +937,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assertEquals(20, do2.val2); assertEquals(0, do2.val3); - PortableObject po3 = marshal(new DynamicObject(2, 10, 20, 30), marsh); + BinaryObject po3 = marshal(new DynamicObject(2, 10, 20, 30), marsh); assertEquals(new Integer(10), po3.field("val1")); assertEquals(new Integer(20), po3.field("val2")); @@ -957,14 +957,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(CycleLinkObject.class.getName()) + new BinaryTypeConfiguration(CycleLinkObject.class.getName()) )); CycleLinkObject obj = new CycleLinkObject(); obj.self = obj; - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); CycleLinkObject obj0 = po.deserialize(); @@ -978,8 +978,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(DetachedTestObject.class.getName()), - new PortableTypeConfiguration(DetachedInnerTestObject.class.getName()) + new BinaryTypeConfiguration(DetachedTestObject.class.getName()), + new BinaryTypeConfiguration(DetachedInnerTestObject.class.getName()) )); UUID id = UUID.randomUUID(); @@ -992,7 +992,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assert obj.inner1 == obj.inner4; - PortableObjectImpl innerPo = (PortableObjectImpl)obj.inner2; + BinaryObjectImpl innerPo = (BinaryObjectImpl)obj.inner2; assert innerPo.detached(); @@ -1000,7 +1000,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assertEquals(id, inner.id); - PortableObjectImpl detachedPo = (PortableObjectImpl)innerPo.detach(); + BinaryObjectImpl detachedPo = (BinaryObjectImpl)innerPo.detach(); assert detachedPo.detached(); @@ -1008,7 +1008,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assertEquals(id, inner.id); - innerPo = (PortableObjectImpl)obj.inner3; + innerPo = (BinaryObjectImpl)obj.inner3; assert innerPo.detached(); @@ -1017,7 +1017,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assertEquals(id, inner.id); assertNotNull(inner.inner); - detachedPo = (PortableObjectImpl)innerPo.detach(); + detachedPo = (BinaryObjectImpl)innerPo.detach(); assert detachedPo.detached(); @@ -1034,9 +1034,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(CollectionFieldsObject.class.getName()), - new PortableTypeConfiguration(Key.class.getName()), - new PortableTypeConfiguration(Value.class.getName()) + new BinaryTypeConfiguration(CollectionFieldsObject.class.getName()), + new BinaryTypeConfiguration(Key.class.getName()), + new BinaryTypeConfiguration(Value.class.getName()) )); Object[] arr = new Object[] {new Value(1), new Value(2), new Value(3)}; @@ -1045,7 +1045,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { CollectionFieldsObject obj = new CollectionFieldsObject(arr, col, map); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); Object[] arr0 = po.field("arr"); @@ -1054,18 +1054,18 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { int i = 1; for (Object valPo : arr0) - assertEquals(i++, ((PortableObject)valPo).<Value>deserialize().val); + assertEquals(i++, ((BinaryObject)valPo).<Value>deserialize().val); - Collection<PortableObject> col0 = po.field("col"); + Collection<BinaryObject> col0 = po.field("col"); i = 4; - for (PortableObject valPo : col0) + for (BinaryObject valPo : col0) assertEquals(i++, valPo.<Value>deserialize().val); - Map<PortableObject, PortableObject> map0 = po.field("map"); + Map<BinaryObject, BinaryObject> map0 = po.field("map"); - for (Map.Entry<PortableObject, PortableObject> e : map0.entrySet()) + for (Map.Entry<BinaryObject, BinaryObject> e : map0.entrySet()) assertEquals(e.getKey().<Key>deserialize().key, e.getValue().<Value>deserialize().val); } @@ -1075,10 +1075,10 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { public void testDefaultMapping() throws Exception { PortableMarshaller marsh1 = new PortableMarshaller(); - PortableTypeConfiguration customMappingType = - new PortableTypeConfiguration(TestPortableObject.class.getName()); + BinaryTypeConfiguration customMappingType = + new BinaryTypeConfiguration(TestBinary.class.getName()); - customMappingType.setIdMapper(new PortableIdMapper() { + customMappingType.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { String typeName; @@ -1102,19 +1102,19 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { }); marsh1.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()), + new BinaryTypeConfiguration(SimpleObject.class.getName()), customMappingType )); - TestPortableObject obj = portableObject(); + TestBinary obj = BinaryObject(); - PortableObjectImpl po = marshal(obj, marsh1); + BinaryObjectImpl po = marshal(obj, marsh1); PortableMarshaller marsh2 = new PortableMarshaller(); marsh2.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()), - new PortableTypeConfiguration(TestPortableObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()), + new BinaryTypeConfiguration(TestBinary.class.getName()) )); PortableContext ctx = initPortableContext(marsh2); @@ -1130,9 +1130,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { public void testTypeNames() throws Exception { PortableMarshaller marsh = new PortableMarshaller(); - PortableTypeConfiguration customType1 = new PortableTypeConfiguration(Value.class.getName()); + BinaryTypeConfiguration customType1 = new BinaryTypeConfiguration(Value.class.getName()); - customType1.setIdMapper(new PortableIdMapper() { + customType1.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 300; } @@ -1142,9 +1142,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } }); - PortableTypeConfiguration customType2 = new PortableTypeConfiguration("org.gridgain.NonExistentClass1"); + BinaryTypeConfiguration customType2 = new BinaryTypeConfiguration("org.gridgain.NonExistentClass1"); - customType2.setIdMapper(new PortableIdMapper() { + customType2.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 400; } @@ -1154,9 +1154,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } }); - PortableTypeConfiguration customType3 = new PortableTypeConfiguration("NonExistentClass2"); + BinaryTypeConfiguration customType3 = new BinaryTypeConfiguration("NonExistentClass2"); - customType3.setIdMapper(new PortableIdMapper() { + customType3.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 500; } @@ -1166,9 +1166,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } }); - PortableTypeConfiguration customType4 = new PortableTypeConfiguration("NonExistentClass5"); + BinaryTypeConfiguration customType4 = new BinaryTypeConfiguration("NonExistentClass5"); - customType4.setIdMapper(new PortableIdMapper() { + customType4.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 0; } @@ -1179,9 +1179,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { }); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(Key.class.getName()), - new PortableTypeConfiguration("org.gridgain.NonExistentClass3"), - new PortableTypeConfiguration("NonExistentClass4"), + new BinaryTypeConfiguration(Key.class.getName()), + new BinaryTypeConfiguration("org.gridgain.NonExistentClass3"), + new BinaryTypeConfiguration("NonExistentClass4"), customType1, customType2, customType3, @@ -1206,9 +1206,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { public void testFieldIdMapping() throws Exception { PortableMarshaller marsh = new PortableMarshaller(); - PortableTypeConfiguration customType1 = new PortableTypeConfiguration(Value.class.getName()); + BinaryTypeConfiguration customType1 = new BinaryTypeConfiguration(Value.class.getName()); - customType1.setIdMapper(new PortableIdMapper() { + customType1.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 300; } @@ -1227,9 +1227,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } }); - PortableTypeConfiguration customType2 = new PortableTypeConfiguration("NonExistentClass1"); + BinaryTypeConfiguration customType2 = new BinaryTypeConfiguration("NonExistentClass1"); - customType2.setIdMapper(new PortableIdMapper() { + customType2.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 400; } @@ -1248,8 +1248,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } }); - marsh.setTypeConfigurations(Arrays.asList(new PortableTypeConfiguration(Key.class.getName()), - new PortableTypeConfiguration("NonExistentClass2"), + marsh.setTypeConfigurations(Arrays.asList(new BinaryTypeConfiguration(Key.class.getName()), + new BinaryTypeConfiguration("NonExistentClass2"), customType1, customType2)); @@ -1272,9 +1272,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { public void testDuplicateTypeId() throws Exception { final PortableMarshaller marsh = new PortableMarshaller(); - PortableTypeConfiguration customType1 = new PortableTypeConfiguration("org.gridgain.Class1"); + BinaryTypeConfiguration customType1 = new BinaryTypeConfiguration("org.gridgain.Class1"); - customType1.setIdMapper(new PortableIdMapper() { + customType1.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 100; } @@ -1284,9 +1284,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } }); - PortableTypeConfiguration customType2 = new PortableTypeConfiguration("org.gridgain.Class2"); + BinaryTypeConfiguration customType2 = new BinaryTypeConfiguration("org.gridgain.Class2"); - customType2.setIdMapper(new PortableIdMapper() { + customType2.setIdMapper(new BinaryTypeIdMapper() { @Override public int typeId(String clsName) { return 100; } @@ -1318,14 +1318,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - final PortableObject po = marshal(obj, marsh); + final BinaryObject po = marshal(obj, marsh); - PortableObject copy = copy(po, null); + BinaryObject copy = copy(po, null); assertEquals(obj, copy.deserialize()); @@ -1441,14 +1441,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); - PortableObject copy = copy(po, F.<String, Object>asMap("str", "str3")); + BinaryObject copy = copy(po, F.<String, Object>asMap("str", "str3")); assertEquals("str3", copy.<String>field("str")); @@ -1464,16 +1464,16 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); UUID uuid = UUID.randomUUID(); - PortableObject copy = copy(po, F.<String, Object>asMap("uuid", uuid)); + BinaryObject copy = copy(po, F.<String, Object>asMap("uuid", uuid)); assertEquals(uuid, copy.<UUID>field("uuid")); @@ -1489,14 +1489,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); - PortableObject copy = copy(po, F.<String, Object>asMap("bArr", new byte[]{1, 2, 3})); + BinaryObject copy = copy(po, F.<String, Object>asMap("bArr", new byte[]{1, 2, 3})); assertArrayEquals(new byte[] {1, 2, 3}, copy.<byte[]>field("bArr")); @@ -1510,8 +1510,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { * @param fields Fields. * @return Copy. */ - private PortableObject copy(PortableObject po, Map<String, Object> fields) { - PortableBuilder builder = PortableBuilderImpl.wrap(po); + private BinaryObject copy(BinaryObject po, Map<String, Object> fields) { + BinaryObjectBuilder builder = BinaryObjectBuilderImpl.wrap(po); if (fields != null) { for (Map.Entry<String, Object> e : fields.entrySet()) @@ -1528,14 +1528,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); - PortableObject copy = copy(po, F.<String, Object>asMap("sArr", new short[]{1, 2, 3})); + BinaryObject copy = copy(po, F.<String, Object>asMap("sArr", new short[]{1, 2, 3})); assertArrayEquals(new short[] {1, 2, 3}, copy.<short[]>field("sArr")); @@ -1551,14 +1551,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); - PortableObject copy = copy(po, F.<String, Object>asMap("iArr", new int[]{1, 2, 3})); + BinaryObject copy = copy(po, F.<String, Object>asMap("iArr", new int[]{1, 2, 3})); assertArrayEquals(new int[] {1, 2, 3}, copy.<int[]>field("iArr")); @@ -1574,14 +1574,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); - PortableObject copy = copy(po, F.<String, Object>asMap("lArr", new long[]{1, 2, 3})); + BinaryObject copy = copy(po, F.<String, Object>asMap("lArr", new long[]{1, 2, 3})); assertArrayEquals(new long[] {1, 2, 3}, copy.<long[]>field("lArr")); @@ -1597,14 +1597,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); - PortableObject copy = copy(po, F.<String, Object>asMap("fArr", new float[]{1, 2, 3})); + BinaryObject copy = copy(po, F.<String, Object>asMap("fArr", new float[]{1, 2, 3})); assertArrayEquals(new float[] {1, 2, 3}, copy.<float[]>field("fArr"), 0); @@ -1620,14 +1620,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); - PortableObject copy = copy(po, F.<String, Object>asMap("dArr", new double[]{1, 2, 3})); + BinaryObject copy = copy(po, F.<String, Object>asMap("dArr", new double[]{1, 2, 3})); assertArrayEquals(new double[] {1, 2, 3}, copy.<double[]>field("dArr"), 0); @@ -1643,14 +1643,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); - PortableObject copy = copy(po, F.<String, Object>asMap("cArr", new char[]{1, 2, 3})); + BinaryObject copy = copy(po, F.<String, Object>asMap("cArr", new char[]{1, 2, 3})); assertArrayEquals(new char[]{1, 2, 3}, copy.<char[]>field("cArr")); @@ -1666,14 +1666,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); - PortableObject copy = copy(po, F.<String, Object>asMap("strArr", new String[]{"str1", "str2"})); + BinaryObject copy = copy(po, F.<String, Object>asMap("strArr", new String[]{"str1", "str2"})); assertArrayEquals(new String[]{"str1", "str2"}, copy.<String[]>field("strArr")); @@ -1689,12 +1689,12 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); SimpleObject newObj = new SimpleObject(); @@ -1702,9 +1702,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { newObj.fArr = new float[] {5, 8, 0}; newObj.str = "newStr"; - PortableObject copy = copy(po, F.<String, Object>asMap("inner", newObj)); + BinaryObject copy = copy(po, F.<String, Object>asMap("inner", newObj)); - assertEquals(newObj, copy.<PortableObject>field("inner").deserialize()); + assertEquals(newObj, copy.<BinaryObject>field("inner").deserialize()); SimpleObject obj0 = copy.deserialize(); @@ -1718,12 +1718,12 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { PortableMarshaller marsh = new PortableMarshaller(); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()) + new BinaryTypeConfiguration(SimpleObject.class.getName()) )); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); Map<String, Object> map = new HashMap<>(3, 1.0f); @@ -1737,10 +1737,10 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { map.put("inner", newObj); map.put("bArr", new byte[]{6, 7, 9}); - PortableObject copy = copy(po, map); + BinaryObject copy = copy(po, map); assertEquals("str555", copy.<String>field("str")); - assertEquals(newObj, copy.<PortableObject>field("inner").deserialize()); + assertEquals(newObj, copy.<BinaryObject>field("inner").deserialize()); assertArrayEquals(new byte[]{6, 7, 9}, copy.<byte[]>field("bArr")); SimpleObject obj0 = copy.deserialize(); @@ -1756,11 +1756,11 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { public void testPortableCopyMixed() throws Exception { PortableMarshaller marsh = new PortableMarshaller(); - marsh.setTypeConfigurations(Arrays.asList(new PortableTypeConfiguration(SimpleObject.class.getName()))); + marsh.setTypeConfigurations(Arrays.asList(new BinaryTypeConfiguration(SimpleObject.class.getName()))); SimpleObject obj = simpleObject(); - PortableObject po = marshal(obj, marsh); + BinaryObject po = marshal(obj, marsh); Map<String, Object> map = new HashMap<>(3, 1.0f); @@ -1777,11 +1777,11 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { map.put("bArr", new byte[]{6, 7, 9}); map.put("b", (byte)111); - PortableObject copy = copy(po, map); + BinaryObject copy = copy(po, map); assertEquals(1234, copy.<Integer>field("i").intValue()); assertEquals("str555", copy.<String>field("str")); - assertEquals(newObj, copy.<PortableObject>field("inner").deserialize()); + assertEquals(newObj, copy.<BinaryObject>field("inner").deserialize()); assertEquals((short)2323, copy.<Short>field("s").shortValue()); assertArrayEquals(new byte[] {6, 7, 9}, copy.<byte[]>field("bArr")); assertEquals((byte)111, copy.<Byte>field("b").byteValue()); @@ -1805,7 +1805,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { marsh.setClassNames(Arrays.asList(SimpleObject.class.getName())); marsh.setKeepDeserialized(true); - PortableObject po = marshal(simpleObject(), marsh); + BinaryObject po = marshal(simpleObject(), marsh); assert po.deserialize() == po.deserialize(); @@ -1822,7 +1822,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { marsh.setKeepDeserialized(true); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()))); + new BinaryTypeConfiguration(SimpleObject.class.getName()))); po = marshal(simpleObject(), marsh); @@ -1832,7 +1832,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { marsh.setKeepDeserialized(false); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(SimpleObject.class.getName()))); + new BinaryTypeConfiguration(SimpleObject.class.getName()))); po = marshal(simpleObject(), marsh); @@ -1842,7 +1842,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { marsh.setKeepDeserialized(true); - PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(SimpleObject.class.getName()); + BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(SimpleObject.class.getName()); typeCfg.setKeepDeserialized(false); @@ -1856,7 +1856,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { marsh.setKeepDeserialized(false); - typeCfg = new PortableTypeConfiguration(SimpleObject.class.getName()); + typeCfg = new BinaryTypeConfiguration(SimpleObject.class.getName()); typeCfg.setKeepDeserialized(true); @@ -1873,13 +1873,13 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { public void testOffheapPortable() throws Exception { PortableMarshaller marsh = new PortableMarshaller(); - marsh.setTypeConfigurations(Arrays.asList(new PortableTypeConfiguration(SimpleObject.class.getName()))); + marsh.setTypeConfigurations(Arrays.asList(new BinaryTypeConfiguration(SimpleObject.class.getName()))); PortableContext ctx = initPortableContext(marsh); SimpleObject simpleObj = simpleObject(); - PortableObjectImpl obj = marshal(simpleObj, marsh); + BinaryObjectImpl obj = marshal(simpleObj, marsh); long ptr = 0; @@ -1890,7 +1890,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { try { ptr = copyOffheap(obj); - PortableObjectOffheapImpl offheapObj = new PortableObjectOffheapImpl(ctx, + BinaryObjectOffheapImpl offheapObj = new BinaryObjectOffheapImpl(ctx, ptr, 0, obj.array().length); @@ -1903,7 +1903,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { ptr1 = copyOffheap(obj); - PortableObjectOffheapImpl offheapObj1 = new PortableObjectOffheapImpl(ctx, + BinaryObjectOffheapImpl offheapObj1 = new BinaryObjectOffheapImpl(ctx, ptr1, 0, obj.array().length); @@ -1916,20 +1916,20 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { checkSimpleObjectData(simpleObj, offheapObj); - PortableObjectOffheapImpl innerOffheapObj = offheapObj.field("inner"); + BinaryObjectOffheapImpl innerOffheapObj = offheapObj.field("inner"); assertNotNull(innerOffheapObj); checkSimpleObjectData(simpleObj.inner, innerOffheapObj); - obj = (PortableObjectImpl)offheapObj.heapCopy(); + obj = (BinaryObjectImpl)offheapObj.heapCopy(); assertEquals(obj.typeId(), offheapObj.typeId()); assertEquals(obj.hashCode(), offheapObj.hashCode()); checkSimpleObjectData(simpleObj, obj); - PortableObjectImpl innerObj = obj.field("inner"); + BinaryObjectImpl innerObj = obj.field("inner"); assertNotNull(innerObj); @@ -1944,7 +1944,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { ptr2 = copyOffheap(obj); - PortableObjectOffheapImpl offheapObj2 = new PortableObjectOffheapImpl(ctx, + BinaryObjectOffheapImpl offheapObj2 = new BinaryObjectOffheapImpl(ctx, ptr2, 0, obj.array().length); @@ -1972,7 +1972,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { marsh.setClassNames( Arrays.asList(MySingleton.class.getName(), SingletonMarker.class.getName())); - PortableObjectImpl portableObj = marshal(MySingleton.INSTANCE, marsh); + BinaryObjectImpl portableObj = marshal(MySingleton.INSTANCE, marsh); assertTrue(portableObj.array().length <= 1024); // Check that big string was not serialized. @@ -1989,7 +1989,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { marsh.setClassNames(Collections.singletonList(MyTestClass.class.getName())); - PortableObjectImpl portableObj = marshal(new MyTestClass(), marsh); + BinaryObjectImpl portableObj = marshal(new MyTestClass(), marsh); MyTestClass obj = portableObj.deserialize(); @@ -2004,7 +2004,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { marsh.setClassNames(Arrays.asList(ChildPortable.class.getName())); - PortableObjectImpl portableObj = marshal(new ChildPortable(), marsh); + BinaryObjectImpl portableObj = marshal(new ChildPortable(), marsh); ChildPortable singleton = portableObj.deserialize(); @@ -2030,7 +2030,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { obj1.val = BigDecimal.ZERO; obj1.valArr = new BigDecimal[] { BigDecimal.ONE, BigDecimal.TEN }; - PortableObjectImpl portObj = marshal(obj1, marsh); + BinaryObjectImpl portObj = marshal(obj1, marsh); assertEquals(obj1.val, portObj.field("val")); assertArrayEquals(obj1.valArr, portObj.<BigDecimal[]>field("valArr")); @@ -2077,7 +2077,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { // Checking the writer directly. assertEquals(false, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired()); - try (PortableWriterExImpl writer = new PortableWriterExImpl(initPortableContext(new PortableMarshaller()))) { + try (BinaryWriterExImpl writer = new BinaryWriterExImpl(initPortableContext(new PortableMarshaller()))) { assertEquals(true, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired()); writer.writeString("Thread local test"); @@ -2099,12 +2099,12 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assertEquals(false, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired()); // Checking the builder. - PortableBuilder builder = new PortableBuilderImpl(initPortableContext(new PortableMarshaller()), + BinaryObjectBuilder builder = new BinaryObjectBuilderImpl(initPortableContext(new PortableMarshaller()), "org.gridgain.foo.bar.TestClass"); builder.setField("a", "1"); - PortableObject portableObj = builder.build(); + BinaryObject portableObj = builder.build(); assertEquals(false, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired()); } @@ -2124,7 +2124,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { try { marsh.marshal(job2); - } catch (PortableException e) { + } catch (BinaryObjectException e) { assertEquals(true, e.getMessage().contains("Failed to register class")); return; } @@ -2165,7 +2165,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { assertEquals(obj.cls1, obj2.cls1); assertNull(obj2.cls2); - PortableObject portObj = marshal(obj, marsh); + BinaryObject portObj = marshal(obj, marsh); Class cls1 = portObj.field("cls1"); @@ -2339,7 +2339,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { * @param obj Object. * @return Offheap address. */ - private long copyOffheap(PortableObjectImpl obj) { + private long copyOffheap(BinaryObjectImpl obj) { byte[] arr = obj.array(); long ptr = UNSAFE.allocateMemory(arr.length); @@ -2367,7 +2367,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { * @param off Offset. * @return Value. */ - private int intFromPortable(PortableObject po, int off) { + private int intFromPortable(BinaryObject po, int off) { byte[] arr = U.field(po, "arr"); return Integer.reverseBytes(U.bytesToInt(arr, off)); @@ -2399,12 +2399,12 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { * @param marsh Marshaller. * @return Portable object. */ - private <T> PortableObjectImpl marshal(T obj, PortableMarshaller marsh) throws IgniteCheckedException { + private <T> BinaryObjectImpl marshal(T obj, PortableMarshaller marsh) throws IgniteCheckedException { initPortableContext(marsh); byte[] bytes = marsh.marshal(obj); - return new PortableObjectImpl(U.<GridPortableMarshaller>field(marsh, "impl").context(), + return new BinaryObjectImpl(U.<GridPortableMarshaller>field(marsh, "impl").context(), bytes, 0); } @@ -2412,7 +2412,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { * @return Portable context. */ protected PortableContext initPortableContext(PortableMarshaller marsh) throws IgniteCheckedException { - PortableContext ctx = new PortableContext(META_HND, null); + IgniteConfiguration iCfg = new IgniteConfiguration(); + + PortableContext ctx = new PortableContext(META_HND, iCfg); marsh.setContext(new MarshallerContextTestImpl(null)); @@ -2536,7 +2538,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { /** * @return Portable object. */ - private TestPortableObject portableObject() { + private TestBinary BinaryObject() { SimpleObject innerSimple = new SimpleObject(); innerSimple.b = 1; @@ -2576,7 +2578,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { innerSimple.map.put(2, "str2"); innerSimple.map.put(3, "str3"); - TestPortableObject innerPortable = new TestPortableObject(); + TestBinary innerPortable = new TestBinary(); innerPortable.b = 2; innerPortable.s = 2; @@ -2651,7 +2653,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { innerPortable.mapRaw.put(8, "str8"); innerPortable.mapRaw.put(9, "str9"); - TestPortableObject outer = new TestPortableObject(); + TestBinary outer = new TestBinary(); outer.b = 4; outer.s = 4; @@ -2855,7 +2857,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } /** */ - private static class TestPortableObject implements PortableMarshalAware { + private static class TestBinary implements Binarylizable { /** */ private byte b; @@ -3031,13 +3033,13 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { private SimpleObject simpleRaw; /** */ - private TestPortableObject portable; + private TestBinary portable; /** */ - private TestPortableObject portableRaw; + private TestBinary portableRaw; /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeByte("_b", b); writer.writeShort("_s", s); writer.writeInt("_i", i); @@ -3069,7 +3071,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { writer.writeObject("_simple", simple); writer.writeObject("_portable", portable); - PortableRawWriter raw = writer.rawWriter(); + BinaryRawWriter raw = writer.rawWriter(); raw.writeByte(bRaw); raw.writeShort(sRaw); @@ -3104,7 +3106,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { b = reader.readByte("_b"); s = reader.readShort("_s"); i = reader.readInt("_i"); @@ -3136,7 +3138,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { simple = reader.readObject("_simple"); portable = reader.readObject("_portable"); - PortableRawReader raw = reader.rawReader(); + BinaryRawReader raw = reader.rawReader(); bRaw = raw.readByte(); sRaw = raw.readShort(); @@ -3179,20 +3181,20 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { if (other == null || getClass() != other.getClass()) return false; - TestPortableObject obj = (TestPortableObject)other; + TestBinary obj = (TestBinary)other; return GridTestUtils.deepEquals(this, obj); } /** {@inheritDoc} */ @Override public String toString() { - return S.toString(TestPortableObject.class, this); + return S.toString(TestBinary.class, this); } } /** */ - private static class CustomSerializedObject1 implements PortableMarshalAware { + private static class CustomSerializedObject1 implements Binarylizable { /** */ private int val; @@ -3210,19 +3212,19 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { // No-op. } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { // No-op. } } /** */ - private static class CustomSerializedObject2 implements PortableMarshalAware { + private static class CustomSerializedObject2 implements Binarylizable { /** */ private int val; @@ -3240,28 +3242,28 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { // No-op. } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { // No-op. } } /** */ - private static class CustomSerializer1 implements PortableSerializer { + private static class CustomSerializer1 implements BinarySerializer { /** {@inheritDoc} */ - @Override public void writePortable(Object obj, PortableWriter writer) throws PortableException { + @Override public void writeBinary(Object obj, BinaryWriter writer) throws BinaryObjectException { CustomSerializedObject1 o = (CustomSerializedObject1)obj; writer.writeInt("val", o.val * 2); } /** {@inheritDoc} */ - @Override public void readPortable(Object obj, PortableReader reader) throws PortableException { + @Override public void readBinary(Object obj, BinaryReader reader) throws BinaryObjectException { CustomSerializedObject1 o = (CustomSerializedObject1)obj; o.val = reader.readInt("val"); @@ -3270,16 +3272,16 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { /** */ - private static class CustomSerializer2 implements PortableSerializer { + private static class CustomSerializer2 implements BinarySerializer { /** {@inheritDoc} */ - @Override public void writePortable(Object obj, PortableWriter writer) throws PortableException { + @Override public void writeBinary(Object obj, BinaryWriter writer) throws BinaryObjectException { CustomSerializedObject2 o = (CustomSerializedObject2)obj; writer.writeInt("val", o.val * 3); } /** {@inheritDoc} */ - @Override public void readPortable(Object obj, PortableReader reader) throws PortableException { + @Override public void readBinary(Object obj, BinaryReader reader) throws BinaryObjectException { CustomSerializedObject2 o = (CustomSerializedObject2)obj; o.val = reader.readInt("val"); @@ -3338,7 +3340,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { /** */ - private static class DynamicObject implements PortableMarshalAware { + private static class DynamicObject implements Binarylizable { /** */ private int idx; @@ -3370,7 +3372,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeInt("val1", val1); if (idx > 0) @@ -3383,7 +3385,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { val1 = reader.readInt("val1"); val2 = reader.readInt("val2"); val3 = reader.readInt("val3"); @@ -3399,7 +3401,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { /** */ - private static class DetachedTestObject implements PortableMarshalAware { + private static class DetachedTestObject implements Binarylizable { /** */ private DetachedInnerTestObject inner1; @@ -3429,8 +3431,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { - PortableRawWriterEx raw = (PortableRawWriterEx)writer.rawWriter(); + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriterEx raw = (BinaryRawWriterEx)writer.rawWriter(); raw.writeObject(inner1); raw.writeObjectDetached(inner2); @@ -3439,8 +3441,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { - PortableRawReaderEx raw = (PortableRawReaderEx)reader.rawReader(); + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReaderEx raw = (BinaryRawReaderEx)reader.rawReader(); inner1 = (DetachedInnerTestObject)raw.readObject(); inner2 = raw.readObjectDetached(); @@ -3620,7 +3622,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { /** * */ - private static class MyTestClass implements PortableMarshalAware { + private static class MyTestClass implements Binarylizable { /** */ private boolean readyToSerialize; @@ -3646,14 +3648,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { if (!readyToSerialize) fail(); } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { - s = "readPortable"; + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + s = "readBinary"; } } @@ -3737,7 +3739,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { /** * */ - private static class DecimalMarshalAware extends DecimalReflective implements PortableMarshalAware { + private static class DecimalMarshalAware extends DecimalReflective implements Binarylizable { /** */ public BigDecimal rawVal; @@ -3745,22 +3747,22 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest { public BigDecimal[] rawValArr; /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeDecimal("val", val); writer.writeDecimalArray("valArr", valArr); - PortableRawWriter rawWriter = writer.rawWriter(); + BinaryRawWriter rawWriter = writer.rawWriter(); rawWriter.writeDecimal(rawVal); rawWriter.writeDecimalArray(rawValArr); } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { val = reader.readDecimal("val"); valArr = reader.readDecimalArray("valArr"); - PortableRawReader rawReader = reader.rawReader(); + BinaryRawReader rawReader = reader.rawReader(); rawVal = rawReader.readDecimal(); rawValArr = rawReader.readDecimalArray();
http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataDisabledSelfTest.java index 05df23b..fbdb562 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataDisabledSelfTest.java @@ -17,15 +17,15 @@ package org.apache.ignite.internal.portable; import java.util.Arrays; -import org.apache.ignite.IgnitePortables; +import org.apache.ignite.IgniteBinary; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableBuilder; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableMarshalAware; -import org.apache.ignite.portable.PortableReader; -import org.apache.ignite.portable.PortableTypeConfiguration; -import org.apache.ignite.portable.PortableWriter; +import org.apache.ignite.binary.BinaryObjectBuilder; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.Binarylizable; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinaryTypeConfiguration; +import org.apache.ignite.binary.BinaryWriter; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -47,8 +47,8 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest /** * @return Portables. */ - private IgnitePortables portables() { - return grid().portables(); + private IgniteBinary portables() { + return grid().binary(); } /** @@ -67,14 +67,14 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest try { startGrid(); - portables().toPortable(new TestObject1()); - portables().toPortable(new TestObject2()); - portables().toPortable(new TestObject3()); + portables().toBinary(new TestObject1()); + portables().toBinary(new TestObject2()); + portables().toBinary(new TestObject3()); assertEquals(0, portables().metadata(TestObject1.class).fields().size()); assertEquals(0, portables().metadata(TestObject2.class).fields().size()); - PortableBuilder bldr = portables().builder("FakeType"); + BinaryObjectBuilder bldr = portables().builder("FakeType"); bldr.setField("field1", 0).setField("field2", "value").build(); @@ -92,12 +92,12 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest public void testDisableGlobalSimpleClass() throws Exception { marsh = new PortableMarshaller(); - PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(TestObject2.class.getName()); + BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(TestObject2.class.getName()); typeCfg.setMetaDataEnabled(true); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(TestObject1.class.getName()), + new BinaryTypeConfiguration(TestObject1.class.getName()), typeCfg )); @@ -106,8 +106,8 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest try { startGrid(); - portables().toPortable(new TestObject1()); - portables().toPortable(new TestObject2()); + portables().toBinary(new TestObject1()); + portables().toBinary(new TestObject2()); assertEquals(0, portables().metadata(TestObject1.class).fields().size()); assertEquals(1, portables().metadata(TestObject2.class).fields().size()); @@ -123,12 +123,12 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest public void testDisableGlobalMarshalAwareClass() throws Exception { marsh = new PortableMarshaller(); - PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(TestObject1.class.getName()); + BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(TestObject1.class.getName()); typeCfg.setMetaDataEnabled(true); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(TestObject2.class.getName()), + new BinaryTypeConfiguration(TestObject2.class.getName()), typeCfg )); @@ -137,8 +137,8 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest try { startGrid(); - portables().toPortable(new TestObject1()); - portables().toPortable(new TestObject2()); + portables().toBinary(new TestObject1()); + portables().toBinary(new TestObject2()); assertEquals(1, portables().metadata(TestObject1.class).fields().size()); assertEquals(0, portables().metadata(TestObject2.class).fields().size()); @@ -154,20 +154,20 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest public void testDisableSimpleClass() throws Exception { marsh = new PortableMarshaller(); - PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(TestObject1.class.getName()); + BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(TestObject1.class.getName()); typeCfg.setMetaDataEnabled(false); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(TestObject2.class.getName()), + new BinaryTypeConfiguration(TestObject2.class.getName()), typeCfg )); try { startGrid(); - portables().toPortable(new TestObject1()); - portables().toPortable(new TestObject2()); + portables().toBinary(new TestObject1()); + portables().toBinary(new TestObject2()); assertEquals(0, portables().metadata(TestObject1.class).fields().size()); assertEquals(1, portables().metadata(TestObject2.class).fields().size()); @@ -183,20 +183,20 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest public void testDisableMarshalAwareClass() throws Exception { marsh = new PortableMarshaller(); - PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(TestObject2.class.getName()); + BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(TestObject2.class.getName()); typeCfg.setMetaDataEnabled(false); marsh.setTypeConfigurations(Arrays.asList( - new PortableTypeConfiguration(TestObject1.class.getName()), + new BinaryTypeConfiguration(TestObject1.class.getName()), typeCfg )); try { startGrid(); - portables().toPortable(new TestObject1()); - portables().toPortable(new TestObject2()); + portables().toBinary(new TestObject1()); + portables().toBinary(new TestObject2()); assertEquals(1, portables().metadata(TestObject1.class).fields().size()); assertEquals(0, portables().metadata(TestObject2.class).fields().size()); @@ -216,14 +216,14 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest /** */ - private static class TestObject2 implements PortableMarshalAware { + private static class TestObject2 implements Binarylizable { /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeInt("field", 1); } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { // No-op. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java index fa3c9a7..c0e2563 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java @@ -22,17 +22,17 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashMap; -import org.apache.ignite.IgnitePortables; +import org.apache.ignite.IgniteBinary; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableMarshalAware; -import org.apache.ignite.portable.PortableMetadata; -import org.apache.ignite.portable.PortableObject; -import org.apache.ignite.portable.PortableRawWriter; -import org.apache.ignite.portable.PortableReader; -import org.apache.ignite.portable.PortableWriter; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.Binarylizable; +import org.apache.ignite.binary.BinaryType; +import org.apache.ignite.binary.BinaryObject; +import org.apache.ignite.binary.BinaryRawWriter; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinaryWriter; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -74,21 +74,21 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { /** * @return Portables API. */ - protected IgnitePortables portables() { - return grid().portables(); + protected IgniteBinary portables() { + return grid().binary(); } /** * @throws Exception If failed. */ public void testGetAll() throws Exception { - portables().toPortable(new TestObject2()); + portables().toBinary(new TestObject2()); - Collection<PortableMetadata> metas = portables().metadata(); + Collection<BinaryType> metas = portables().metadata(); assertEquals(2, metas.size()); - for (PortableMetadata meta : metas) { + for (BinaryType meta : metas) { Collection<String> fields; switch (meta.typeName()) { @@ -150,7 +150,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { public void testNoConfiguration() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-1377";); - portables().toPortable(new TestObject3()); + portables().toBinary(new TestObject3()); assertNotNull(portables().metadata(TestObject3.class)); } @@ -159,7 +159,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testReflection() throws Exception { - PortableMetadata meta = portables().metadata(TestObject1.class); + BinaryType meta = portables().metadata(TestObject1.class); assertNotNull(meta); @@ -190,9 +190,9 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testPortableMarshalAware() throws Exception { - portables().toPortable(new TestObject2()); + portables().toBinary(new TestObject2()); - PortableMetadata meta = portables().metadata(TestObject2.class); + BinaryType meta = portables().metadata(TestObject2.class); assertNotNull(meta); @@ -223,13 +223,13 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testMerge() throws Exception { - portables().toPortable(new TestObject2()); + portables().toBinary(new TestObject2()); idx = 1; - portables().toPortable(new TestObject2()); + portables().toBinary(new TestObject2()); - PortableMetadata meta = portables().metadata(TestObject2.class); + BinaryType meta = portables().metadata(TestObject2.class); assertNotNull(meta); @@ -274,11 +274,11 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { obj.decVal = BigDecimal.ZERO; obj.decArrVal = new BigDecimal[] { BigDecimal.ONE }; - PortableObject po = portables().toPortable(obj); + BinaryObject po = portables().toBinary(obj); info(po.toString()); - PortableMetadata meta = po.metaData(); + BinaryType meta = po.type(); assertNotNull(meta); @@ -333,9 +333,9 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { /** */ - private static class TestObject2 implements PortableMarshalAware { + private static class TestObject2 implements Binarylizable { /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeBoolean("boolVal", false); writer.writeDate("dateVal", new Date()); writer.writeUuidArray("uuidArrVal", null); @@ -349,14 +349,14 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { writer.writeCollection("colVal", null); } - PortableRawWriter raw = writer.rawWriter(); + BinaryRawWriter raw = writer.rawWriter(); raw.writeChar((char)0); raw.writeCollection(null); } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { // No-op. } }
