You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/10/30 11:44:33 UTC
[05/19] ignite git commit: ignite-950-new WIP
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/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 2b29e4d..d3d40bd 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
@@ -41,7 +41,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.portable.builder.PortableBuilderImpl;
+import org.apache.ignite.internal.portable.builder.IgniteObjectBuilderImpl;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.lang.GridMapEntry;
@@ -50,19 +50,19 @@ 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.PortableInvalidClassException;
-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.igniteobject.IgniteObjectBuilder;
+import org.apache.ignite.igniteobject.IgniteObjectException;
+import org.apache.ignite.igniteobject.IgniteObjectIdMapper;
+import org.apache.ignite.igniteobject.IgniteObjectInvalidClassException;
+import org.apache.ignite.igniteobject.IgniteObjectMarshalAware;
+import org.apache.ignite.igniteobject.IgniteObjectMetadata;
+import org.apache.ignite.igniteobject.IgniteObject;
+import org.apache.ignite.igniteobject.IgniteObjectRawReader;
+import org.apache.ignite.igniteobject.IgniteObjectRawWriter;
+import org.apache.ignite.igniteobject.IgniteObjectReader;
+import org.apache.ignite.igniteobject.IgniteObjectSerializer;
+import org.apache.ignite.igniteobject.IgniteObjectConfiguration;
+import org.apache.ignite.igniteobject.IgniteObjectWriter;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jsr166.ConcurrentHashMap8;
@@ -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, IgniteObjectMetadata meta) {
// No-op.
}
- @Override public PortableMetadata metadata(int typeId) {
+ @Override public IgniteObjectMetadata metadata(int typeId) {
return null;
}
};
@@ -397,13 +397,13 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
public void testPortableObject() throws Exception {
PortableMarshaller marsh = new PortableMarshaller();
- marsh.setTypeConfigurations(Arrays.asList(new PortableTypeConfiguration(SimpleObject.class.getName())));
+ marsh.setTypeConfigurations(Arrays.asList(new IgniteObjectConfiguration(SimpleObject.class.getName())));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
- PortableObject po0 = marshalUnmarshal(po, marsh);
+ IgniteObject 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());
+ IgniteObjectConfiguration cfg1 = new IgniteObjectConfiguration(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);
+ IgniteObject 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 IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject 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");
+ IgniteObject 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 IgniteObjectConfiguration(SimpleObject.class.getName()),
+ new IgniteObjectConfiguration(TestIgniteObjectObject.class.getName())
));
- TestPortableObject obj = portableObject();
+ TestIgniteObjectObject obj = portableObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject 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");
+ IgniteObject 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");
+ IgniteObject 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, IgniteObject po) {
assertEquals(obj.b, (byte)po.field("b"));
assertEquals(obj.s, (short)po.field("s"));
assertEquals(obj.i, (int)po.field("i"));
@@ -722,7 +722,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
U.intToBytes(Integer.reverseBytes(11111), arr, 3);
- final PortableObject po = new PortableObjectImpl(initPortableContext(new PortableMarshaller()), arr, 0);
+ final IgniteObject po = new IgniteObjectImpl(initPortableContext(new PortableMarshaller()), arr, 0);
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -730,7 +730,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
return null;
}
- }, PortableInvalidClassException.class, "Unknown type ID: 11111"
+ }, IgniteObjectInvalidClassException.class, "Unknown type ID: 11111"
);
}
@@ -741,25 +741,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 IgniteObjectConfiguration(NoPublicConstructor.class.getName()),
+ new IgniteObjectConfiguration(NoPublicDefaultConstructor.class.getName()),
+ new IgniteObjectConfiguration(ProtectedConstructor.class.getName()))
);
initPortableContext(marsh);
NoPublicConstructor npc = new NoPublicConstructor();
- PortableObject npc2 = marshal(npc, marsh);
+ IgniteObject npc2 = marshal(npc, marsh);
assertEquals("test", npc2.<NoPublicConstructor>deserialize().val);
NoPublicDefaultConstructor npdc = new NoPublicDefaultConstructor(239);
- PortableObject npdc2 = marshal(npdc, marsh);
+ IgniteObject npdc2 = marshal(npdc, marsh);
assertEquals(239, npdc2.<NoPublicDefaultConstructor>deserialize().val);
ProtectedConstructor pc = new ProtectedConstructor();
- PortableObject pc2 = marshal(pc, marsh);
+ IgniteObject pc2 = marshal(pc, marsh);
assertEquals(ProtectedConstructor.class, pc2.<ProtectedConstructor>deserialize().getClass());
}
@@ -770,8 +770,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
public void testCustomSerializer() throws Exception {
PortableMarshaller marsh = new PortableMarshaller();
- PortableTypeConfiguration type =
- new PortableTypeConfiguration(CustomSerializedObject1.class.getName());
+ IgniteObjectConfiguration type =
+ new IgniteObjectConfiguration(CustomSerializedObject1.class.getName());
type.setSerializer(new CustomSerializer1());
@@ -779,7 +779,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
CustomSerializedObject1 obj1 = new CustomSerializedObject1(10);
- PortableObject po1 = marshal(obj1, marsh);
+ IgniteObject po1 = marshal(obj1, marsh);
assertEquals(20, po1.<CustomSerializedObject1>deserialize().val);
}
@@ -792,10 +792,10 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setSerializer(new CustomSerializer1());
- PortableTypeConfiguration type1 =
- new PortableTypeConfiguration(CustomSerializedObject1.class.getName());
- PortableTypeConfiguration type2 =
- new PortableTypeConfiguration(CustomSerializedObject2.class.getName());
+ IgniteObjectConfiguration type1 =
+ new IgniteObjectConfiguration(CustomSerializedObject1.class.getName());
+ IgniteObjectConfiguration type2 =
+ new IgniteObjectConfiguration(CustomSerializedObject2.class.getName());
type2.setSerializer(new CustomSerializer2());
@@ -803,13 +803,13 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
CustomSerializedObject1 obj1 = new CustomSerializedObject1(10);
- PortableObject po1 = marshal(obj1, marsh);
+ IgniteObject po1 = marshal(obj1, marsh);
assertEquals(20, po1.<CustomSerializedObject1>deserialize().val);
CustomSerializedObject2 obj2 = new CustomSerializedObject2(10);
- PortableObject po2 = marshal(obj2, marsh);
+ IgniteObject po2 = marshal(obj2, marsh);
assertEquals(30, po2.<CustomSerializedObject2>deserialize().val);
}
@@ -820,10 +820,10 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
public void testCustomIdMapper() throws Exception {
PortableMarshaller marsh = new PortableMarshaller();
- PortableTypeConfiguration type =
- new PortableTypeConfiguration(CustomMappedObject1.class.getName());
+ IgniteObjectConfiguration type =
+ new IgniteObjectConfiguration(CustomMappedObject1.class.getName());
- type.setIdMapper(new PortableIdMapper() {
+ type.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 11111;
}
@@ -846,7 +846,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
CustomMappedObject1 obj1 = new CustomMappedObject1(10, "str");
- PortableObject po1 = marshal(obj1, marsh);
+ IgniteObject po1 = marshal(obj1, marsh);
assertEquals(11111, po1.typeId());
assertEquals(22222, intFromPortable(po1, 19));
@@ -862,7 +862,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
public void testCustomIdMapperWithGlobal() throws Exception {
PortableMarshaller marsh = new PortableMarshaller();
- marsh.setIdMapper(new PortableIdMapper() {
+ marsh.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 11111;
}
@@ -879,12 +879,12 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
});
- PortableTypeConfiguration type1 =
- new PortableTypeConfiguration(CustomMappedObject1.class.getName());
- PortableTypeConfiguration type2 =
- new PortableTypeConfiguration(CustomMappedObject2.class.getName());
+ IgniteObjectConfiguration type1 =
+ new IgniteObjectConfiguration(CustomMappedObject1.class.getName());
+ IgniteObjectConfiguration type2 =
+ new IgniteObjectConfiguration(CustomMappedObject2.class.getName());
- type2.setIdMapper(new PortableIdMapper() {
+ type2.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 44444;
}
@@ -905,7 +905,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
CustomMappedObject1 obj1 = new CustomMappedObject1(10, "str1");
- PortableObject po1 = marshal(obj1, marsh);
+ IgniteObject po1 = marshal(obj1, marsh);
assertEquals(11111, po1.typeId());
assertEquals(22222, intFromPortable(po1, 19));
@@ -916,7 +916,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
CustomMappedObject2 obj2 = new CustomMappedObject2(20, "str2");
- PortableObject po2 = marshal(obj2, marsh);
+ IgniteObject po2 = marshal(obj2, marsh);
assertEquals(44444, po2.typeId());
assertEquals(55555, intFromPortable(po2, 19));
@@ -933,10 +933,10 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(DynamicObject.class.getName())
+ new IgniteObjectConfiguration(DynamicObject.class.getName())
));
- PortableObject po1 = marshal(new DynamicObject(0, 10, 20, 30), marsh);
+ IgniteObject po1 = marshal(new DynamicObject(0, 10, 20, 30), marsh);
assertEquals(new Integer(10), po1.field("val1"));
assertEquals(null, po1.field("val2"));
@@ -948,7 +948,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
assertEquals(0, do1.val2);
assertEquals(0, do1.val3);
- PortableObject po2 = marshal(new DynamicObject(1, 10, 20, 30), marsh);
+ IgniteObject po2 = marshal(new DynamicObject(1, 10, 20, 30), marsh);
assertEquals(new Integer(10), po2.field("val1"));
assertEquals(new Integer(20), po2.field("val2"));
@@ -960,7 +960,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
assertEquals(20, do2.val2);
assertEquals(0, do2.val3);
- PortableObject po3 = marshal(new DynamicObject(2, 10, 20, 30), marsh);
+ IgniteObject po3 = marshal(new DynamicObject(2, 10, 20, 30), marsh);
assertEquals(new Integer(10), po3.field("val1"));
assertEquals(new Integer(20), po3.field("val2"));
@@ -980,14 +980,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(CycleLinkObject.class.getName())
+ new IgniteObjectConfiguration(CycleLinkObject.class.getName())
));
CycleLinkObject obj = new CycleLinkObject();
obj.self = obj;
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
CycleLinkObject obj0 = po.deserialize();
@@ -1001,8 +1001,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 IgniteObjectConfiguration(DetachedTestObject.class.getName()),
+ new IgniteObjectConfiguration(DetachedInnerTestObject.class.getName())
));
UUID id = UUID.randomUUID();
@@ -1015,7 +1015,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
assert obj.inner1 == obj.inner4;
- PortableObjectImpl innerPo = (PortableObjectImpl)obj.inner2;
+ IgniteObjectImpl innerPo = (IgniteObjectImpl)obj.inner2;
assert innerPo.detached();
@@ -1023,7 +1023,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
assertEquals(id, inner.id);
- PortableObjectImpl detachedPo = (PortableObjectImpl)innerPo.detach();
+ IgniteObjectImpl detachedPo = (IgniteObjectImpl)innerPo.detach();
assert detachedPo.detached();
@@ -1031,7 +1031,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
assertEquals(id, inner.id);
- innerPo = (PortableObjectImpl)obj.inner3;
+ innerPo = (IgniteObjectImpl)obj.inner3;
assert innerPo.detached();
@@ -1040,7 +1040,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
assertEquals(id, inner.id);
assertNotNull(inner.inner);
- detachedPo = (PortableObjectImpl)innerPo.detach();
+ detachedPo = (IgniteObjectImpl)innerPo.detach();
assert detachedPo.detached();
@@ -1057,9 +1057,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 IgniteObjectConfiguration(CollectionFieldsObject.class.getName()),
+ new IgniteObjectConfiguration(Key.class.getName()),
+ new IgniteObjectConfiguration(Value.class.getName())
));
Object[] arr = new Object[] {new Value(1), new Value(2), new Value(3)};
@@ -1068,7 +1068,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
CollectionFieldsObject obj = new CollectionFieldsObject(arr, col, map);
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
Object[] arr0 = po.field("arr");
@@ -1077,18 +1077,18 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
int i = 1;
for (Object valPo : arr0)
- assertEquals(i++, ((PortableObject)valPo).<Value>deserialize().val);
+ assertEquals(i++, ((IgniteObject)valPo).<Value>deserialize().val);
- Collection<PortableObject> col0 = po.field("col");
+ Collection<IgniteObject> col0 = po.field("col");
i = 4;
- for (PortableObject valPo : col0)
+ for (IgniteObject valPo : col0)
assertEquals(i++, valPo.<Value>deserialize().val);
- Map<PortableObject, PortableObject> map0 = po.field("map");
+ Map<IgniteObject, IgniteObject> map0 = po.field("map");
- for (Map.Entry<PortableObject, PortableObject> e : map0.entrySet())
+ for (Map.Entry<IgniteObject, IgniteObject> e : map0.entrySet())
assertEquals(e.getKey().<Key>deserialize().key, e.getValue().<Value>deserialize().val);
}
@@ -1098,10 +1098,10 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
public void testDefaultMapping() throws Exception {
PortableMarshaller marsh1 = new PortableMarshaller();
- PortableTypeConfiguration customMappingType =
- new PortableTypeConfiguration(TestPortableObject.class.getName());
+ IgniteObjectConfiguration customMappingType =
+ new IgniteObjectConfiguration(TestIgniteObjectObject.class.getName());
- customMappingType.setIdMapper(new PortableIdMapper() {
+ customMappingType.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
String typeName;
@@ -1125,19 +1125,19 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
});
marsh1.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName()),
+ new IgniteObjectConfiguration(SimpleObject.class.getName()),
customMappingType
));
- TestPortableObject obj = portableObject();
+ TestIgniteObjectObject obj = portableObject();
- PortableObjectImpl po = marshal(obj, marsh1);
+ IgniteObjectImpl po = marshal(obj, marsh1);
PortableMarshaller marsh2 = new PortableMarshaller();
marsh2.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName()),
- new PortableTypeConfiguration(TestPortableObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName()),
+ new IgniteObjectConfiguration(TestIgniteObjectObject.class.getName())
));
PortableContext ctx = initPortableContext(marsh2);
@@ -1153,9 +1153,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
public void testTypeNames() throws Exception {
PortableMarshaller marsh = new PortableMarshaller();
- PortableTypeConfiguration customType1 = new PortableTypeConfiguration(Value.class.getName());
+ IgniteObjectConfiguration customType1 = new IgniteObjectConfiguration(Value.class.getName());
- customType1.setIdMapper(new PortableIdMapper() {
+ customType1.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 300;
}
@@ -1165,9 +1165,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
});
- PortableTypeConfiguration customType2 = new PortableTypeConfiguration("org.gridgain.NonExistentClass1");
+ IgniteObjectConfiguration customType2 = new IgniteObjectConfiguration("org.gridgain.NonExistentClass1");
- customType2.setIdMapper(new PortableIdMapper() {
+ customType2.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 400;
}
@@ -1177,9 +1177,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
});
- PortableTypeConfiguration customType3 = new PortableTypeConfiguration("NonExistentClass2");
+ IgniteObjectConfiguration customType3 = new IgniteObjectConfiguration("NonExistentClass2");
- customType3.setIdMapper(new PortableIdMapper() {
+ customType3.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 500;
}
@@ -1189,9 +1189,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
});
- PortableTypeConfiguration customType4 = new PortableTypeConfiguration("NonExistentClass5");
+ IgniteObjectConfiguration customType4 = new IgniteObjectConfiguration("NonExistentClass5");
- customType4.setIdMapper(new PortableIdMapper() {
+ customType4.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 0;
}
@@ -1202,9 +1202,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
});
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(Key.class.getName()),
- new PortableTypeConfiguration("org.gridgain.NonExistentClass3"),
- new PortableTypeConfiguration("NonExistentClass4"),
+ new IgniteObjectConfiguration(Key.class.getName()),
+ new IgniteObjectConfiguration("org.gridgain.NonExistentClass3"),
+ new IgniteObjectConfiguration("NonExistentClass4"),
customType1,
customType2,
customType3,
@@ -1229,9 +1229,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
public void testFieldIdMapping() throws Exception {
PortableMarshaller marsh = new PortableMarshaller();
- PortableTypeConfiguration customType1 = new PortableTypeConfiguration(Value.class.getName());
+ IgniteObjectConfiguration customType1 = new IgniteObjectConfiguration(Value.class.getName());
- customType1.setIdMapper(new PortableIdMapper() {
+ customType1.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 300;
}
@@ -1250,9 +1250,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
});
- PortableTypeConfiguration customType2 = new PortableTypeConfiguration("NonExistentClass1");
+ IgniteObjectConfiguration customType2 = new IgniteObjectConfiguration("NonExistentClass1");
- customType2.setIdMapper(new PortableIdMapper() {
+ customType2.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 400;
}
@@ -1271,8 +1271,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
});
- marsh.setTypeConfigurations(Arrays.asList(new PortableTypeConfiguration(Key.class.getName()),
- new PortableTypeConfiguration("NonExistentClass2"),
+ marsh.setTypeConfigurations(Arrays.asList(new IgniteObjectConfiguration(Key.class.getName()),
+ new IgniteObjectConfiguration("NonExistentClass2"),
customType1,
customType2));
@@ -1295,9 +1295,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
public void testDuplicateTypeId() throws Exception {
final PortableMarshaller marsh = new PortableMarshaller();
- PortableTypeConfiguration customType1 = new PortableTypeConfiguration("org.gridgain.Class1");
+ IgniteObjectConfiguration customType1 = new IgniteObjectConfiguration("org.gridgain.Class1");
- customType1.setIdMapper(new PortableIdMapper() {
+ customType1.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 100;
}
@@ -1307,9 +1307,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
});
- PortableTypeConfiguration customType2 = new PortableTypeConfiguration("org.gridgain.Class2");
+ IgniteObjectConfiguration customType2 = new IgniteObjectConfiguration("org.gridgain.Class2");
- customType2.setIdMapper(new PortableIdMapper() {
+ customType2.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 100;
}
@@ -1341,14 +1341,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- final PortableObject po = marshal(obj, marsh);
+ final IgniteObject po = marshal(obj, marsh);
- PortableObject copy = copy(po, null);
+ IgniteObject copy = copy(po, null);
assertEquals(obj, copy.deserialize());
@@ -1464,14 +1464,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
- PortableObject copy = copy(po, F.<String, Object>asMap("str", "str3"));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("str", "str3"));
assertEquals("str3", copy.<String>field("str"));
@@ -1487,16 +1487,16 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
UUID uuid = UUID.randomUUID();
- PortableObject copy = copy(po, F.<String, Object>asMap("uuid", uuid));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("uuid", uuid));
assertEquals(uuid, copy.<UUID>field("uuid"));
@@ -1512,14 +1512,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
- PortableObject copy = copy(po, F.<String, Object>asMap("bArr", new byte[]{1, 2, 3}));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("bArr", new byte[]{1, 2, 3}));
assertArrayEquals(new byte[] {1, 2, 3}, copy.<byte[]>field("bArr"));
@@ -1533,8 +1533,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 IgniteObject copy(IgniteObject po, Map<String, Object> fields) {
+ IgniteObjectBuilder builder = IgniteObjectBuilderImpl.wrap(po);
if (fields != null) {
for (Map.Entry<String, Object> e : fields.entrySet())
@@ -1551,14 +1551,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
- PortableObject copy = copy(po, F.<String, Object>asMap("sArr", new short[]{1, 2, 3}));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("sArr", new short[]{1, 2, 3}));
assertArrayEquals(new short[] {1, 2, 3}, copy.<short[]>field("sArr"));
@@ -1574,14 +1574,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
- PortableObject copy = copy(po, F.<String, Object>asMap("iArr", new int[]{1, 2, 3}));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("iArr", new int[]{1, 2, 3}));
assertArrayEquals(new int[] {1, 2, 3}, copy.<int[]>field("iArr"));
@@ -1597,14 +1597,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
- PortableObject copy = copy(po, F.<String, Object>asMap("lArr", new long[]{1, 2, 3}));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("lArr", new long[]{1, 2, 3}));
assertArrayEquals(new long[] {1, 2, 3}, copy.<long[]>field("lArr"));
@@ -1620,14 +1620,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
- PortableObject copy = copy(po, F.<String, Object>asMap("fArr", new float[]{1, 2, 3}));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("fArr", new float[]{1, 2, 3}));
assertArrayEquals(new float[] {1, 2, 3}, copy.<float[]>field("fArr"), 0);
@@ -1643,14 +1643,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
- PortableObject copy = copy(po, F.<String, Object>asMap("dArr", new double[]{1, 2, 3}));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("dArr", new double[]{1, 2, 3}));
assertArrayEquals(new double[] {1, 2, 3}, copy.<double[]>field("dArr"), 0);
@@ -1666,14 +1666,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
- PortableObject copy = copy(po, F.<String, Object>asMap("cArr", new char[]{1, 2, 3}));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("cArr", new char[]{1, 2, 3}));
assertArrayEquals(new char[]{1, 2, 3}, copy.<char[]>field("cArr"));
@@ -1689,14 +1689,14 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
- PortableObject copy = copy(po, F.<String, Object>asMap("strArr", new String[]{"str1", "str2"}));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("strArr", new String[]{"str1", "str2"}));
assertArrayEquals(new String[]{"str1", "str2"}, copy.<String[]>field("strArr"));
@@ -1712,12 +1712,12 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
SimpleObject newObj = new SimpleObject();
@@ -1725,9 +1725,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));
+ IgniteObject copy = copy(po, F.<String, Object>asMap("inner", newObj));
- assertEquals(newObj, copy.<PortableObject>field("inner").deserialize());
+ assertEquals(newObj, copy.<IgniteObject>field("inner").deserialize());
SimpleObject obj0 = copy.deserialize();
@@ -1741,12 +1741,12 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = new PortableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())
+ new IgniteObjectConfiguration(SimpleObject.class.getName())
));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
Map<String, Object> map = new HashMap<>(3, 1.0f);
@@ -1760,10 +1760,10 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
map.put("inner", newObj);
map.put("bArr", new byte[]{6, 7, 9});
- PortableObject copy = copy(po, map);
+ IgniteObject copy = copy(po, map);
assertEquals("str555", copy.<String>field("str"));
- assertEquals(newObj, copy.<PortableObject>field("inner").deserialize());
+ assertEquals(newObj, copy.<IgniteObject>field("inner").deserialize());
assertArrayEquals(new byte[]{6, 7, 9}, copy.<byte[]>field("bArr"));
SimpleObject obj0 = copy.deserialize();
@@ -1779,11 +1779,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 IgniteObjectConfiguration(SimpleObject.class.getName())));
SimpleObject obj = simpleObject();
- PortableObject po = marshal(obj, marsh);
+ IgniteObject po = marshal(obj, marsh);
Map<String, Object> map = new HashMap<>(3, 1.0f);
@@ -1800,11 +1800,11 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
map.put("bArr", new byte[]{6, 7, 9});
map.put("b", (byte)111);
- PortableObject copy = copy(po, map);
+ IgniteObject 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.<IgniteObject>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());
@@ -1828,7 +1828,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setClassNames(Arrays.asList(SimpleObject.class.getName()));
marsh.setKeepDeserialized(true);
- PortableObject po = marshal(simpleObject(), marsh);
+ IgniteObject po = marshal(simpleObject(), marsh);
assert po.deserialize() == po.deserialize();
@@ -1845,7 +1845,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setKeepDeserialized(true);
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())));
+ new IgniteObjectConfiguration(SimpleObject.class.getName())));
po = marshal(simpleObject(), marsh);
@@ -1855,7 +1855,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setKeepDeserialized(false);
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(SimpleObject.class.getName())));
+ new IgniteObjectConfiguration(SimpleObject.class.getName())));
po = marshal(simpleObject(), marsh);
@@ -1865,7 +1865,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setKeepDeserialized(true);
- PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(SimpleObject.class.getName());
+ IgniteObjectConfiguration typeCfg = new IgniteObjectConfiguration(SimpleObject.class.getName());
typeCfg.setKeepDeserialized(false);
@@ -1879,7 +1879,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setKeepDeserialized(false);
- typeCfg = new PortableTypeConfiguration(SimpleObject.class.getName());
+ typeCfg = new IgniteObjectConfiguration(SimpleObject.class.getName());
typeCfg.setKeepDeserialized(true);
@@ -1896,13 +1896,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 IgniteObjectConfiguration(SimpleObject.class.getName())));
PortableContext ctx = initPortableContext(marsh);
SimpleObject simpleObj = simpleObject();
- PortableObjectImpl obj = marshal(simpleObj, marsh);
+ IgniteObjectImpl obj = marshal(simpleObj, marsh);
long ptr = 0;
@@ -1913,7 +1913,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
try {
ptr = copyOffheap(obj);
- PortableObjectOffheapImpl offheapObj = new PortableObjectOffheapImpl(ctx,
+ IgniteObjectOffheapImpl offheapObj = new IgniteObjectOffheapImpl(ctx,
ptr,
0,
obj.array().length);
@@ -1926,7 +1926,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
ptr1 = copyOffheap(obj);
- PortableObjectOffheapImpl offheapObj1 = new PortableObjectOffheapImpl(ctx,
+ IgniteObjectOffheapImpl offheapObj1 = new IgniteObjectOffheapImpl(ctx,
ptr1,
0,
obj.array().length);
@@ -1939,20 +1939,20 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
checkSimpleObjectData(simpleObj, offheapObj);
- PortableObjectOffheapImpl innerOffheapObj = offheapObj.field("inner");
+ IgniteObjectOffheapImpl innerOffheapObj = offheapObj.field("inner");
assertNotNull(innerOffheapObj);
checkSimpleObjectData(simpleObj.inner, innerOffheapObj);
- obj = (PortableObjectImpl)offheapObj.heapCopy();
+ obj = (IgniteObjectImpl)offheapObj.heapCopy();
assertEquals(obj.typeId(), offheapObj.typeId());
assertEquals(obj.hashCode(), offheapObj.hashCode());
checkSimpleObjectData(simpleObj, obj);
- PortableObjectImpl innerObj = obj.field("inner");
+ IgniteObjectImpl innerObj = obj.field("inner");
assertNotNull(innerObj);
@@ -1967,7 +1967,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
ptr2 = copyOffheap(obj);
- PortableObjectOffheapImpl offheapObj2 = new PortableObjectOffheapImpl(ctx,
+ IgniteObjectOffheapImpl offheapObj2 = new IgniteObjectOffheapImpl(ctx,
ptr2,
0,
obj.array().length);
@@ -1995,7 +1995,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setClassNames(
Arrays.asList(MySingleton.class.getName(), SingletonMarker.class.getName()));
- PortableObjectImpl portableObj = marshal(MySingleton.INSTANCE, marsh);
+ IgniteObjectImpl portableObj = marshal(MySingleton.INSTANCE, marsh);
assertTrue(portableObj.array().length <= 1024); // Check that big string was not serialized.
@@ -2012,7 +2012,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setClassNames(Collections.singletonList(MyTestClass.class.getName()));
- PortableObjectImpl portableObj = marshal(new MyTestClass(), marsh);
+ IgniteObjectImpl portableObj = marshal(new MyTestClass(), marsh);
MyTestClass obj = portableObj.deserialize();
@@ -2027,7 +2027,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setClassNames(Arrays.asList(ChildPortable.class.getName()));
- PortableObjectImpl portableObj = marshal(new ChildPortable(), marsh);
+ IgniteObjectImpl portableObj = marshal(new ChildPortable(), marsh);
ChildPortable singleton = portableObj.deserialize();
@@ -2053,7 +2053,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
obj1.val = BigDecimal.ZERO;
obj1.valArr = new BigDecimal[] { BigDecimal.ONE, BigDecimal.TEN };
- PortableObjectImpl portObj = marshal(obj1, marsh);
+ IgniteObjectImpl portObj = marshal(obj1, marsh);
assertEquals(obj1.val, portObj.field("val"));
assertArrayEquals(obj1.valArr, portObj.<BigDecimal[]>field("valArr"));
@@ -2100,7 +2100,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
// Checking the writer directly.
assertEquals(false, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired());
- try (PortableWriterExImpl writer = new PortableWriterExImpl(initPortableContext(new PortableMarshaller()), 0)) {
+ try (IgniteObjectWriterExImpl writer = new IgniteObjectWriterExImpl(initPortableContext(new PortableMarshaller()), 0)) {
assertEquals(true, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired());
writer.writeString("Thread local test");
@@ -2122,12 +2122,12 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
assertEquals(false, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired());
// Checking the builder.
- PortableBuilder builder = new PortableBuilderImpl(initPortableContext(new PortableMarshaller()),
+ IgniteObjectBuilder builder = new IgniteObjectBuilderImpl(initPortableContext(new PortableMarshaller()),
"org.gridgain.foo.bar.TestClass");
builder.setField("a", "1");
- PortableObject portableObj = builder.build();
+ IgniteObject portableObj = builder.build();
assertEquals(false, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired());
}
@@ -2147,7 +2147,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
try {
marsh.marshal(job2);
- } catch (PortableException e) {
+ } catch (IgniteObjectException e) {
assertEquals(true, e.getMessage().contains("Failed to register class"));
return;
}
@@ -2339,7 +2339,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
* @param obj Object.
* @return Offheap address.
*/
- private long copyOffheap(PortableObjectImpl obj) {
+ private long copyOffheap(IgniteObjectImpl 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(IgniteObject 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> IgniteObjectImpl 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 IgniteObjectImpl(U.<GridPortableMarshaller>field(marsh, "impl").context(),
bytes, 0);
}
@@ -2536,7 +2536,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @return Portable object.
*/
- private TestPortableObject portableObject() {
+ private TestIgniteObjectObject portableObject() {
SimpleObject innerSimple = new SimpleObject();
innerSimple.b = 1;
@@ -2576,7 +2576,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
innerSimple.map.put(2, "str2");
innerSimple.map.put(3, "str3");
- TestPortableObject innerPortable = new TestPortableObject();
+ TestIgniteObjectObject innerPortable = new TestIgniteObjectObject();
innerPortable.b = 2;
innerPortable.s = 2;
@@ -2651,7 +2651,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
innerPortable.mapRaw.put(8, "str8");
innerPortable.mapRaw.put(9, "str9");
- TestPortableObject outer = new TestPortableObject();
+ TestIgniteObjectObject outer = new TestIgniteObjectObject();
outer.b = 4;
outer.s = 4;
@@ -2855,7 +2855,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
/** */
- private static class TestPortableObject implements PortableMarshalAware {
+ private static class TestIgniteObjectObject implements IgniteObjectMarshalAware {
/** */
private byte b;
@@ -3031,13 +3031,13 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
private SimpleObject simpleRaw;
/** */
- private TestPortableObject portable;
+ private TestIgniteObjectObject portable;
/** */
- private TestPortableObject portableRaw;
+ private TestIgniteObjectObject portableRaw;
/** {@inheritDoc} */
- @Override public void writePortable(PortableWriter writer) throws PortableException {
+ @Override public void writePortable(IgniteObjectWriter writer) throws IgniteObjectException {
writer.writeByte("_b", b);
writer.writeShort("_s", s);
writer.writeInt("_i", i);
@@ -3069,7 +3069,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
writer.writeObject("_simple", simple);
writer.writeObject("_portable", portable);
- PortableRawWriter raw = writer.rawWriter();
+ IgniteObjectRawWriter raw = writer.rawWriter();
raw.writeByte(bRaw);
raw.writeShort(sRaw);
@@ -3104,7 +3104,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void readPortable(PortableReader reader) throws PortableException {
+ @Override public void readPortable(IgniteObjectReader reader) throws IgniteObjectException {
b = reader.readByte("_b");
s = reader.readShort("_s");
i = reader.readInt("_i");
@@ -3136,7 +3136,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
simple = reader.readObject("_simple");
portable = reader.readObject("_portable");
- PortableRawReader raw = reader.rawReader();
+ IgniteObjectRawReader raw = reader.rawReader();
bRaw = raw.readByte();
sRaw = raw.readShort();
@@ -3179,20 +3179,20 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
if (other == null || getClass() != other.getClass())
return false;
- TestPortableObject obj = (TestPortableObject)other;
+ TestIgniteObjectObject obj = (TestIgniteObjectObject)other;
return GridTestUtils.deepEquals(this, obj);
}
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(TestPortableObject.class, this);
+ return S.toString(TestIgniteObjectObject.class, this);
}
}
/**
*/
- private static class CustomSerializedObject1 implements PortableMarshalAware {
+ private static class CustomSerializedObject1 implements IgniteObjectMarshalAware {
/** */
private int val;
@@ -3210,19 +3210,19 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void writePortable(PortableWriter writer) throws PortableException {
+ @Override public void writePortable(IgniteObjectWriter writer) throws IgniteObjectException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void readPortable(PortableReader reader) throws PortableException {
+ @Override public void readPortable(IgniteObjectReader reader) throws IgniteObjectException {
// No-op.
}
}
/**
*/
- private static class CustomSerializedObject2 implements PortableMarshalAware {
+ private static class CustomSerializedObject2 implements IgniteObjectMarshalAware {
/** */
private int val;
@@ -3240,28 +3240,28 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void writePortable(PortableWriter writer) throws PortableException {
+ @Override public void writePortable(IgniteObjectWriter writer) throws IgniteObjectException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void readPortable(PortableReader reader) throws PortableException {
+ @Override public void readPortable(IgniteObjectReader reader) throws IgniteObjectException {
// No-op.
}
}
/**
*/
- private static class CustomSerializer1 implements PortableSerializer {
+ private static class CustomSerializer1 implements IgniteObjectSerializer {
/** {@inheritDoc} */
- @Override public void writePortable(Object obj, PortableWriter writer) throws PortableException {
+ @Override public void writePortable(Object obj, IgniteObjectWriter writer) throws IgniteObjectException {
CustomSerializedObject1 o = (CustomSerializedObject1)obj;
writer.writeInt("val", o.val * 2);
}
/** {@inheritDoc} */
- @Override public void readPortable(Object obj, PortableReader reader) throws PortableException {
+ @Override public void readPortable(Object obj, IgniteObjectReader reader) throws IgniteObjectException {
CustomSerializedObject1 o = (CustomSerializedObject1)obj;
o.val = reader.readInt("val");
@@ -3270,16 +3270,16 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
/**
*/
- private static class CustomSerializer2 implements PortableSerializer {
+ private static class CustomSerializer2 implements IgniteObjectSerializer {
/** {@inheritDoc} */
- @Override public void writePortable(Object obj, PortableWriter writer) throws PortableException {
+ @Override public void writePortable(Object obj, IgniteObjectWriter writer) throws IgniteObjectException {
CustomSerializedObject2 o = (CustomSerializedObject2)obj;
writer.writeInt("val", o.val * 3);
}
/** {@inheritDoc} */
- @Override public void readPortable(Object obj, PortableReader reader) throws PortableException {
+ @Override public void readPortable(Object obj, IgniteObjectReader reader) throws IgniteObjectException {
CustomSerializedObject2 o = (CustomSerializedObject2)obj;
o.val = reader.readInt("val");
@@ -3338,7 +3338,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
/**
*/
- private static class DynamicObject implements PortableMarshalAware {
+ private static class DynamicObject implements IgniteObjectMarshalAware {
/** */
private int idx;
@@ -3370,7 +3370,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void writePortable(PortableWriter writer) throws PortableException {
+ @Override public void writePortable(IgniteObjectWriter writer) throws IgniteObjectException {
writer.writeInt("val1", val1);
if (idx > 0)
@@ -3383,7 +3383,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void readPortable(PortableReader reader) throws PortableException {
+ @Override public void readPortable(IgniteObjectReader reader) throws IgniteObjectException {
val1 = reader.readInt("val1");
val2 = reader.readInt("val2");
val3 = reader.readInt("val3");
@@ -3399,7 +3399,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
/**
*/
- private static class DetachedTestObject implements PortableMarshalAware {
+ private static class DetachedTestObject implements IgniteObjectMarshalAware {
/** */
private DetachedInnerTestObject inner1;
@@ -3429,8 +3429,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void writePortable(PortableWriter writer) throws PortableException {
- PortableRawWriterEx raw = (PortableRawWriterEx)writer.rawWriter();
+ @Override public void writePortable(IgniteObjectWriter writer) throws IgniteObjectException {
+ IgniteObjectRawWriterEx raw = (IgniteObjectRawWriterEx)writer.rawWriter();
raw.writeObject(inner1);
raw.writeObjectDetached(inner2);
@@ -3439,8 +3439,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void readPortable(PortableReader reader) throws PortableException {
- PortableRawReaderEx raw = (PortableRawReaderEx)reader.rawReader();
+ @Override public void readPortable(IgniteObjectReader reader) throws IgniteObjectException {
+ IgniteObjectRawReaderEx raw = (IgniteObjectRawReaderEx)reader.rawReader();
inner1 = (DetachedInnerTestObject)raw.readObject();
inner2 = raw.readObjectDetached();
@@ -3620,7 +3620,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
/**
*
*/
- private static class MyTestClass implements PortableMarshalAware {
+ private static class MyTestClass implements IgniteObjectMarshalAware {
/** */
private boolean readyToSerialize;
@@ -3646,13 +3646,13 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void writePortable(PortableWriter writer) throws PortableException {
+ @Override public void writePortable(IgniteObjectWriter writer) throws IgniteObjectException {
if (!readyToSerialize)
fail();
}
/** {@inheritDoc} */
- @Override public void readPortable(PortableReader reader) throws PortableException {
+ @Override public void readPortable(IgniteObjectReader reader) throws IgniteObjectException {
s = "readPortable";
}
}
@@ -3737,7 +3737,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
/**
*
*/
- private static class DecimalMarshalAware extends DecimalReflective implements PortableMarshalAware {
+ private static class DecimalMarshalAware extends DecimalReflective implements IgniteObjectMarshalAware {
/** */
public BigDecimal rawVal;
@@ -3745,22 +3745,22 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
public BigDecimal[] rawValArr;
/** {@inheritDoc} */
- @Override public void writePortable(PortableWriter writer) throws PortableException {
+ @Override public void writePortable(IgniteObjectWriter writer) throws IgniteObjectException {
writer.writeDecimal("val", val);
writer.writeDecimalArray("valArr", valArr);
- PortableRawWriter rawWriter = writer.rawWriter();
+ IgniteObjectRawWriter rawWriter = writer.rawWriter();
rawWriter.writeDecimal(rawVal);
rawWriter.writeDecimalArray(rawValArr);
}
/** {@inheritDoc} */
- @Override public void readPortable(PortableReader reader) throws PortableException {
+ @Override public void readPortable(IgniteObjectReader reader) throws IgniteObjectException {
val = reader.readDecimal("val");
valArr = reader.readDecimalArray("valArr");
- PortableRawReader rawReader = reader.rawReader();
+ IgniteObjectRawReader rawReader = reader.rawReader();
rawVal = rawReader.readDecimal();
rawValArr = rawReader.readDecimalArray();
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/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..8800d81 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.IgniteObjects;
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.igniteobject.IgniteObjectBuilder;
+import org.apache.ignite.igniteobject.IgniteObjectException;
+import org.apache.ignite.igniteobject.IgniteObjectMarshalAware;
+import org.apache.ignite.igniteobject.IgniteObjectReader;
+import org.apache.ignite.igniteobject.IgniteObjectConfiguration;
+import org.apache.ignite.igniteobject.IgniteObjectWriter;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/**
@@ -47,7 +47,7 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest
/**
* @return Portables.
*/
- private IgnitePortables portables() {
+ private IgniteObjects portables() {
return grid().portables();
}
@@ -74,7 +74,7 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest
assertEquals(0, portables().metadata(TestObject1.class).fields().size());
assertEquals(0, portables().metadata(TestObject2.class).fields().size());
- PortableBuilder bldr = portables().builder("FakeType");
+ IgniteObjectBuilder 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());
+ IgniteObjectConfiguration typeCfg = new IgniteObjectConfiguration(TestObject2.class.getName());
typeCfg.setMetaDataEnabled(true);
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(TestObject1.class.getName()),
+ new IgniteObjectConfiguration(TestObject1.class.getName()),
typeCfg
));
@@ -123,12 +123,12 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest
public void testDisableGlobalMarshalAwareClass() throws Exception {
marsh = new PortableMarshaller();
- PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(TestObject1.class.getName());
+ IgniteObjectConfiguration typeCfg = new IgniteObjectConfiguration(TestObject1.class.getName());
typeCfg.setMetaDataEnabled(true);
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(TestObject2.class.getName()),
+ new IgniteObjectConfiguration(TestObject2.class.getName()),
typeCfg
));
@@ -154,12 +154,12 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest
public void testDisableSimpleClass() throws Exception {
marsh = new PortableMarshaller();
- PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(TestObject1.class.getName());
+ IgniteObjectConfiguration typeCfg = new IgniteObjectConfiguration(TestObject1.class.getName());
typeCfg.setMetaDataEnabled(false);
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(TestObject2.class.getName()),
+ new IgniteObjectConfiguration(TestObject2.class.getName()),
typeCfg
));
@@ -183,12 +183,12 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest
public void testDisableMarshalAwareClass() throws Exception {
marsh = new PortableMarshaller();
- PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(TestObject2.class.getName());
+ IgniteObjectConfiguration typeCfg = new IgniteObjectConfiguration(TestObject2.class.getName());
typeCfg.setMetaDataEnabled(false);
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration(TestObject1.class.getName()),
+ new IgniteObjectConfiguration(TestObject1.class.getName()),
typeCfg
));
@@ -216,14 +216,14 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest
/**
*/
- private static class TestObject2 implements PortableMarshalAware {
+ private static class TestObject2 implements IgniteObjectMarshalAware {
/** {@inheritDoc} */
- @Override public void writePortable(PortableWriter writer) throws PortableException {
+ @Override public void writePortable(IgniteObjectWriter writer) throws IgniteObjectException {
writer.writeInt("field", 1);
}
/** {@inheritDoc} */
- @Override public void readPortable(PortableReader reader) throws PortableException {
+ @Override public void readPortable(IgniteObjectReader reader) throws IgniteObjectException {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/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..ac9645b 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.IgniteObjects;
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.igniteobject.IgniteObjectException;
+import org.apache.ignite.igniteobject.IgniteObjectMarshalAware;
+import org.apache.ignite.igniteobject.IgniteObjectMetadata;
+import org.apache.ignite.igniteobject.IgniteObject;
+import org.apache.ignite.igniteobject.IgniteObjectRawWriter;
+import org.apache.ignite.igniteobject.IgniteObjectReader;
+import org.apache.ignite.igniteobject.IgniteObjectWriter;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/**
@@ -74,7 +74,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest {
/**
* @return Portables API.
*/
- protected IgnitePortables portables() {
+ protected IgniteObjects portables() {
return grid().portables();
}
@@ -84,11 +84,11 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest {
public void testGetAll() throws Exception {
portables().toPortable(new TestObject2());
- Collection<PortableMetadata> metas = portables().metadata();
+ Collection<IgniteObjectMetadata> metas = portables().metadata();
assertEquals(2, metas.size());
- for (PortableMetadata meta : metas) {
+ for (IgniteObjectMetadata meta : metas) {
Collection<String> fields;
switch (meta.typeName()) {
@@ -159,7 +159,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testReflection() throws Exception {
- PortableMetadata meta = portables().metadata(TestObject1.class);
+ IgniteObjectMetadata meta = portables().metadata(TestObject1.class);
assertNotNull(meta);
@@ -192,7 +192,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest {
public void testPortableMarshalAware() throws Exception {
portables().toPortable(new TestObject2());
- PortableMetadata meta = portables().metadata(TestObject2.class);
+ IgniteObjectMetadata meta = portables().metadata(TestObject2.class);
assertNotNull(meta);
@@ -229,7 +229,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest {
portables().toPortable(new TestObject2());
- PortableMetadata meta = portables().metadata(TestObject2.class);
+ IgniteObjectMetadata 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);
+ IgniteObject po = portables().toPortable(obj);
info(po.toString());
- PortableMetadata meta = po.metaData();
+ IgniteObjectMetadata meta = po.metaData();
assertNotNull(meta);
@@ -333,9 +333,9 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest {
/**
*/
- private static class TestObject2 implements PortableMarshalAware {
+ private static class TestObject2 implements IgniteObjectMarshalAware {
/** {@inheritDoc} */
- @Override public void writePortable(PortableWriter writer) throws PortableException {
+ @Override public void writePortable(IgniteObjectWriter writer) throws IgniteObjectException {
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();
+ IgniteObjectRawWriter raw = writer.rawWriter();
raw.writeChar((char)0);
raw.writeCollection(null);
}
/** {@inheritDoc} */
- @Override public void readPortable(PortableReader reader) throws PortableException {
+ @Override public void readPortable(IgniteObjectReader reader) throws IgniteObjectException {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
index 349f152..b8b8189 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
@@ -22,9 +22,9 @@ import java.util.Map;
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.PortableIdMapper;
-import org.apache.ignite.portable.PortableMetadata;
-import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.apache.ignite.igniteobject.IgniteObjectIdMapper;
+import org.apache.ignite.igniteobject.IgniteObjectMetadata;
+import org.apache.ignite.igniteobject.IgniteObjectConfiguration;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/**
@@ -33,11 +33,11 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
/** */
private static final PortableMetaDataHandler META_HND = new PortableMetaDataHandler() {
- @Override public void addMeta(int typeId, PortableMetadata meta) {
+ @Override public void addMeta(int typeId, IgniteObjectMetadata meta) {
// No-op.
}
- @Override public PortableMetadata metadata(int typeId) {
+ @Override public IgniteObjectMetadata metadata(int typeId) {
return null;
}
};
@@ -91,7 +91,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = portableMarshaller();
- marsh.setIdMapper(new PortableIdMapper() {
+ marsh.setIdMapper(new IgniteObjectIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -116,7 +116,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
ctx.configure(marsh);
- Map<String, PortableIdMapper> typeMappers = U.field(ctx, "typeMappers");
+ Map<String, IgniteObjectIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
@@ -134,8 +134,8 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = portableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration("org.apache.ignite.internal.portable.test.*"),
- new PortableTypeConfiguration("unknown.*")
+ new IgniteObjectConfiguration("org.apache.ignite.internal.portable.test.*"),
+ new IgniteObjectConfiguration("unknown.*")
));
ctx.configure(marsh);
@@ -157,7 +157,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = portableMarshaller();
- marsh.setIdMapper(new PortableIdMapper() {
+ marsh.setIdMapper(new IgniteObjectIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -176,13 +176,13 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
});
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration("org.apache.ignite.internal.portable.test.*"),
- new PortableTypeConfiguration("unknown.*")
+ new IgniteObjectConfiguration("org.apache.ignite.internal.portable.test.*"),
+ new IgniteObjectConfiguration("unknown.*")
));
ctx.configure(marsh);
- Map<String, PortableIdMapper> typeMappers = U.field(ctx, "typeMappers");
+ Map<String, IgniteObjectIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
@@ -199,7 +199,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = portableMarshaller();
- marsh.setIdMapper(new PortableIdMapper() {
+ marsh.setIdMapper(new IgniteObjectIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -218,13 +218,13 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
});
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration("org.apache.ignite.internal.portable.test.*"),
- new PortableTypeConfiguration("unknown.*")
+ new IgniteObjectConfiguration("org.apache.ignite.internal.portable.test.*"),
+ new IgniteObjectConfiguration("unknown.*")
));
ctx.configure(marsh);
- Map<String, PortableIdMapper> typeMappers = U.field(ctx, "typeMappers");
+ Map<String, IgniteObjectIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
@@ -245,10 +245,10 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
"org.apache.ignite.internal.portable.test.*"
));
- PortableTypeConfiguration typeCfg = new PortableTypeConfiguration();
+ IgniteObjectConfiguration typeCfg = new IgniteObjectConfiguration();
typeCfg.setClassName("org.apache.ignite.internal.portable.test.GridPortableTestClass2");
- typeCfg.setIdMapper(new PortableIdMapper() {
+ typeCfg.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 100;
}
@@ -270,7 +270,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
assertTrue(typeIds.containsKey("innerclass".hashCode()));
assertFalse(typeIds.containsKey("gridportabletestclass2".hashCode()));
- Map<String, PortableIdMapper> typeMappers = U.field(ctx, "typeMappers");
+ Map<String, IgniteObjectIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(100, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
}
@@ -306,7 +306,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = portableMarshaller();
- marsh.setIdMapper(new PortableIdMapper() {
+ marsh.setIdMapper(new IgniteObjectIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -329,7 +329,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
ctx.configure(marsh);
- Map<String, PortableIdMapper> typeMappers = U.field(ctx, "typeMappers");
+ Map<String, IgniteObjectIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
@@ -346,8 +346,8 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = portableMarshaller();
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration("org.apache.ignite.portable.testjar.*"),
- new PortableTypeConfiguration("unknown.*")
+ new IgniteObjectConfiguration("org.apache.ignite.portable.testjar.*"),
+ new IgniteObjectConfiguration("unknown.*")
));
ctx.configure(marsh);
@@ -368,7 +368,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = portableMarshaller();
- marsh.setIdMapper(new PortableIdMapper() {
+ marsh.setIdMapper(new IgniteObjectIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -385,13 +385,13 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
});
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration("org.apache.ignite.portable.testjar.*"),
- new PortableTypeConfiguration("unknown.*")
+ new IgniteObjectConfiguration("org.apache.ignite.portable.testjar.*"),
+ new IgniteObjectConfiguration("unknown.*")
));
ctx.configure(marsh);
- Map<String, PortableIdMapper> typeMappers = U.field(ctx, "typeMappers");
+ Map<String, IgniteObjectIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
@@ -407,7 +407,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
PortableMarshaller marsh = portableMarshaller();
- marsh.setIdMapper(new PortableIdMapper() {
+ marsh.setIdMapper(new IgniteObjectIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -424,13 +424,13 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
});
marsh.setTypeConfigurations(Arrays.asList(
- new PortableTypeConfiguration("org.apache.ignite.portable.testjar.*"),
- new PortableTypeConfiguration("unknown.*")
+ new IgniteObjectConfiguration("org.apache.ignite.portable.testjar.*"),
+ new IgniteObjectConfiguration("unknown.*")
));
ctx.configure(marsh);
- Map<String, PortableIdMapper> typeMappers = U.field(ctx, "typeMappers");
+ Map<String, IgniteObjectIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
@@ -450,10 +450,10 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
"org.apache.ignite.portable.testjar.*"
));
- PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(
+ IgniteObjectConfiguration typeCfg = new IgniteObjectConfiguration(
"org.apache.ignite.portable.testjar.GridPortableTestClass2");
- typeCfg.setIdMapper(new PortableIdMapper() {
+ typeCfg.setIdMapper(new IgniteObjectIdMapper() {
@Override public int typeId(String clsName) {
return 100;
}
@@ -473,7 +473,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
- Map<String, PortableIdMapper> typeMappers = U.field(ctx, "typeMappers");
+ Map<String, IgniteObjectIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());