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:37 UTC
[09/19] ignite git commit: ignite-950-new WIP
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
index c86de5d..f8ab6f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
@@ -21,8 +21,8 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.cache.store.CacheStoreSession;
import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.portable.PortableRawReaderEx;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.cache.store.PlatformCacheStore;
import org.apache.ignite.internal.processors.platform.cache.store.PlatformCacheStoreCallback;
@@ -170,8 +170,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
try {
final GridTuple<V> val = new GridTuple<>();
- doInvoke(new IgniteInClosureX<PortableRawWriterEx>() {
- @Override public void applyx(PortableRawWriterEx writer) throws IgniteCheckedException {
+ doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() {
+ @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
writer.writeByte(OP_LOAD);
writer.writeLong(session());
writer.writeString(ses.cacheName());
@@ -191,8 +191,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
try {
final Map<K, V> loaded = new HashMap<>();
- doInvoke(new IgniteInClosureX<PortableRawWriterEx>() {
- @Override public void applyx(PortableRawWriterEx writer) throws IgniteCheckedException {
+ doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() {
+ @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
writer.writeByte(OP_LOAD_ALL);
writer.writeLong(session());
writer.writeString(ses.cacheName());
@@ -210,8 +210,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
/** {@inheritDoc} */
@Override public void loadCache(final IgniteBiInClosure<K, V> clo, final @Nullable Object... args) {
try {
- doInvoke(new IgniteInClosureX<PortableRawWriterEx>() {
- @Override public void applyx(PortableRawWriterEx writer) throws IgniteCheckedException {
+ doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() {
+ @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
writer.writeByte(OP_LOAD_CACHE);
writer.writeLong(session());
writer.writeString(ses.cacheName());
@@ -227,8 +227,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
/** {@inheritDoc} */
@Override public void write(final Cache.Entry<? extends K, ? extends V> entry) {
try {
- doInvoke(new IgniteInClosureX<PortableRawWriterEx>() {
- @Override public void applyx(PortableRawWriterEx writer) throws IgniteCheckedException {
+ doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() {
+ @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
writer.writeByte(OP_PUT);
writer.writeLong(session());
writer.writeString(ses.cacheName());
@@ -246,8 +246,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
@SuppressWarnings({"NullableProblems", "unchecked"})
@Override public void writeAll(final Collection<Cache.Entry<? extends K, ? extends V>> entries) {
try {
- doInvoke(new IgniteInClosureX<PortableRawWriterEx>() {
- @Override public void applyx(PortableRawWriterEx writer) throws IgniteCheckedException {
+ doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() {
+ @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
Map<K, V> map = new AbstractMap<K, V>() {
@Override public int size() {
return entries.size();
@@ -287,8 +287,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
/** {@inheritDoc} */
@Override public void delete(final Object key) {
try {
- doInvoke(new IgniteInClosureX<PortableRawWriterEx>() {
- @Override public void applyx(PortableRawWriterEx writer) throws IgniteCheckedException {
+ doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() {
+ @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
writer.writeByte(OP_RMV);
writer.writeLong(session());
writer.writeString(ses.cacheName());
@@ -304,8 +304,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
/** {@inheritDoc} */
@Override public void deleteAll(final Collection<?> keys) {
try {
- doInvoke(new IgniteInClosureX<PortableRawWriterEx>() {
- @Override public void applyx(PortableRawWriterEx writer) throws IgniteCheckedException {
+ doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() {
+ @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
writer.writeByte(OP_RMV_ALL);
writer.writeLong(session());
writer.writeString(ses.cacheName());
@@ -321,8 +321,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
/** {@inheritDoc} */
@Override public void sessionEnd(final boolean commit) {
try {
- doInvoke(new IgniteInClosureX<PortableRawWriterEx>() {
- @Override public void applyx(PortableRawWriterEx writer) throws IgniteCheckedException {
+ doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() {
+ @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
writer.writeByte(OP_SES_END);
writer.writeLong(session());
writer.writeString(ses.cacheName());
@@ -351,7 +351,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
try (PlatformMemory mem = platformCtx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = platformCtx.writer(out);
+ IgniteObjectRawWriterEx writer = platformCtx.writer(out);
writer.writeString(assemblyName);
writer.writeString(clsName);
@@ -391,12 +391,12 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
* @return Result.
* @throws org.apache.ignite.IgniteCheckedException If failed.
*/
- protected int doInvoke(IgniteInClosureX<PortableRawWriterEx> task, @Nullable PlatformCacheStoreCallback cb)
+ protected int doInvoke(IgniteInClosureX<IgniteObjectRawWriterEx> task, @Nullable PlatformCacheStoreCallback cb)
throws IgniteCheckedException{
try (PlatformMemory mem = platformCtx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = platformCtx.writer(out);
+ IgniteObjectRawWriterEx writer = platformCtx.writer(out);
task.apply(writer);
@@ -438,7 +438,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override protected void invoke0(PortableRawReaderEx reader) {
+ @Override protected void invoke0(IgniteObjectRawReaderEx reader) {
val.set((V)reader.readObjectDetached());
}
}
@@ -464,7 +464,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override protected void invoke0(PortableRawReaderEx reader) {
+ @Override protected void invoke0(IgniteObjectRawReaderEx reader) {
loaded.put((K) reader.readObjectDetached(), (V) reader.readObjectDetached());
}
}
@@ -490,7 +490,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override protected void invoke0(PortableRawReaderEx reader) {
+ @Override protected void invoke0(IgniteObjectRawReaderEx reader) {
clo.apply((K) reader.readObjectDetached(), (V) reader.readObjectDetached());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
index 35d2df4..8513650 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.MarshallerContextImpl;
import org.apache.ignite.internal.portable.GridPortableMarshaller;
import org.apache.ignite.internal.portable.PortableContext;
import org.apache.ignite.internal.portable.PortableMetaDataHandler;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformAbstractConfigurationClosure;
import org.apache.ignite.internal.processors.platform.lifecycle.PlatformLifecycleBean;
import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream;
@@ -39,8 +39,8 @@ import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration;
import org.apache.ignite.marshaller.portable.PortableMarshaller;
import org.apache.ignite.platform.dotnet.PlatformDotNetLifecycleBean;
-import org.apache.ignite.portable.PortableException;
-import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.igniteobject.IgniteObjectException;
+import org.apache.ignite.igniteobject.IgniteObjectMetadata;
import java.util.ArrayList;
import java.util.Collections;
@@ -137,7 +137,7 @@ public class PlatformDotNetConfigurationClosure extends PlatformAbstractConfigur
try (PlatformMemory inMem = memMgr.allocate()) {
PlatformOutputStream out = outMem.output();
- PortableRawWriterEx writer = marshaller().writer(out);
+ IgniteObjectRawWriterEx writer = marshaller().writer(out);
PlatformUtils.writeDotNetConfiguration(writer, interopCfg.unwrap());
@@ -230,12 +230,12 @@ public class PlatformDotNetConfigurationClosure extends PlatformAbstractConfigur
private static GridPortableMarshaller marshaller() {
try {
PortableContext ctx = new PortableContext(new PortableMetaDataHandler() {
- @Override public void addMeta(int typeId, PortableMetadata meta)
- throws PortableException {
+ @Override public void addMeta(int typeId, IgniteObjectMetadata meta)
+ throws IgniteObjectException {
// No-op.
}
- @Override public PortableMetadata metadata(int typeId) throws PortableException {
+ @Override public IgniteObjectMetadata metadata(int typeId) throws IgniteObjectException {
return null;
}
}, null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
index b2dfd1c..17064d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.platform.events;
import org.apache.ignite.events.Event;
import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.PlatformEventFilterListener;
import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
@@ -114,7 +114,7 @@ public class PlatformEventFilterListenerImpl implements PlatformEventFilterListe
try (PlatformMemory mem = ctx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = ctx.writer(out);
+ IgniteObjectRawWriterEx writer = ctx.writer(out);
ctx.writeEvent(writer, evt);
@@ -140,7 +140,7 @@ public class PlatformEventFilterListenerImpl implements PlatformEventFilterListe
try (PlatformMemory mem = ctx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = ctx.writer(out);
+ IgniteObjectRawWriterEx writer = ctx.writer(out);
writer.writeObjectDetached(pred);
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
index 8585526..37bfcae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
@@ -24,8 +24,8 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteEvents;
import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventAdapter;
-import org.apache.ignite.internal.portable.PortableRawReaderEx;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget;
import org.apache.ignite.internal.processors.platform.PlatformEventFilterListener;
import org.apache.ignite.internal.processors.platform.PlatformContext;
@@ -137,7 +137,7 @@ public class PlatformEvents extends PlatformAbstractTarget {
}
/** {@inheritDoc} */
- @Override protected long processInStreamOutLong(int type, PortableRawReaderEx reader)
+ @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader)
throws IgniteCheckedException {
switch (type) {
case OP_RECORD_LOCAL:
@@ -168,7 +168,7 @@ public class PlatformEvents extends PlatformAbstractTarget {
/** {@inheritDoc} */
@SuppressWarnings({"IfMayBeConditional", "ConstantConditions", "unchecked"})
- @Override protected void processInStreamOutStream(int type, PortableRawReaderEx reader, PortableRawWriterEx writer)
+ @Override protected void processInStreamOutStream(int type, IgniteObjectRawReaderEx reader, IgniteObjectRawWriterEx writer)
throws IgniteCheckedException {
switch (type) {
case OP_LOCAL_QUERY: {
@@ -256,7 +256,7 @@ public class PlatformEvents extends PlatformAbstractTarget {
}
/** {@inheritDoc} */
- @Override protected void processOutStream(int type, PortableRawWriterEx writer) throws IgniteCheckedException {
+ @Override protected void processOutStream(int type, IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
switch (type) {
case OP_GET_ENABLED_EVENTS:
writeEventTypes(events.enabledEvents(), writer);
@@ -292,7 +292,7 @@ public class PlatformEvents extends PlatformAbstractTarget {
* @param reader Reader
* @return Event types, or null.
*/
- private int[] readEventTypes(PortableRawReaderEx reader) {
+ private int[] readEventTypes(IgniteObjectRawReaderEx reader) {
return reader.readIntArray();
}
@@ -302,7 +302,7 @@ public class PlatformEvents extends PlatformAbstractTarget {
* @param writer Writer
* @param types Types.
*/
- private void writeEventTypes(int[] types, PortableRawWriterEx writer) {
+ private void writeEventTypes(int[] types, IgniteObjectRawWriterEx writer) {
if (types == null) {
writer.writeIntArray(null);
@@ -349,7 +349,7 @@ public class PlatformEvents extends PlatformAbstractTarget {
}
/** <inheritDoc /> */
- @Override public void write(PortableRawWriterEx writer, Object obj, Throwable err) {
+ @Override public void write(IgniteObjectRawWriterEx writer, Object obj, Throwable err) {
platformCtx.writeEvent(writer, (EventAdapter)obj);
}
@@ -379,7 +379,7 @@ public class PlatformEvents extends PlatformAbstractTarget {
/** <inheritDoc /> */
@SuppressWarnings("unchecked")
- @Override public void write(PortableRawWriterEx writer, Object obj, Throwable err) {
+ @Override public void write(IgniteObjectRawWriterEx writer, Object obj, Throwable err) {
Collection<EventAdapter> events = (Collection<EventAdapter>)obj;
writer.writeInt(events.size());
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
index 67d5bbb..fdc3460 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.processors.platform.messaging;
import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
@@ -62,7 +62,7 @@ public class PlatformMessageFilterImpl extends PlatformAbstractPredicate impleme
try (PlatformMemory mem = ctx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = ctx.writer(out);
+ IgniteObjectRawWriterEx writer = ctx.writer(out);
writer.writeObject(uuid);
writer.writeObject(m);
@@ -83,7 +83,7 @@ public class PlatformMessageFilterImpl extends PlatformAbstractPredicate impleme
try (PlatformMemory mem = ctx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = ctx.writer(out);
+ IgniteObjectRawWriterEx writer = ctx.writer(out);
writer.writeObject(pred);
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java
index 50643e1..4ee7969 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.processors.platform.messaging;
import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
@@ -58,7 +58,7 @@ public class PlatformMessageLocalFilter implements PlatformMessageFilter {
try (PlatformMemory mem = platformCtx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = platformCtx.writer(out);
+ IgniteObjectRawWriterEx writer = platformCtx.writer(out);
writer.writeObject(uuid);
writer.writeObject(m);
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
index 6dfd570..dbbf5da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.processors.platform.messaging;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteMessaging;
-import org.apache.ignite.internal.portable.PortableRawReaderEx;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.message.PlatformMessageFilter;
@@ -84,7 +84,7 @@ public class PlatformMessaging extends PlatformAbstractTarget {
}
/** {@inheritDoc} */
- @Override protected long processInStreamOutLong(int type, PortableRawReaderEx reader)
+ @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader)
throws IgniteCheckedException {
switch (type) {
case OP_SEND:
@@ -135,7 +135,7 @@ public class PlatformMessaging extends PlatformAbstractTarget {
/** {@inheritDoc} */
@SuppressWarnings({"IfMayBeConditional", "ConstantConditions", "unchecked"})
- @Override protected void processInStreamOutStream(int type, PortableRawReaderEx reader, PortableRawWriterEx writer)
+ @Override protected void processInStreamOutStream(int type, IgniteObjectRawReaderEx reader, IgniteObjectRawWriterEx writer)
throws IgniteCheckedException {
switch (type) {
case OP_REMOTE_LISTEN:{
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
index 0b9ee53..6d6cf06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
@@ -23,8 +23,8 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.portable.PortableRawReaderEx;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream;
import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
@@ -84,7 +84,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
try (PlatformMemory mem = platformCtx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = platformCtx.writer(out);
+ IgniteObjectRawWriterEx writer = platformCtx.writer(out);
writer.writeBoolean(srvKeepPortable);
writer.writeObject(svc);
@@ -108,7 +108,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
try (PlatformMemory mem = platformCtx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = platformCtx.writer(out);
+ IgniteObjectRawWriterEx writer = platformCtx.writer(out);
writer.writeBoolean(srvKeepPortable);
@@ -131,7 +131,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
try (PlatformMemory mem = platformCtx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = platformCtx.writer(out);
+ IgniteObjectRawWriterEx writer = platformCtx.writer(out);
writer.writeBoolean(srvKeepPortable);
@@ -152,7 +152,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
* @param ctx Context.
* @param writer Writer.
*/
- private void writeServiceContext(ServiceContext ctx, PortableRawWriterEx writer) {
+ private void writeServiceContext(ServiceContext ctx, IgniteObjectRawWriterEx writer) {
writer.writeString(ctx.name());
writer.writeUuid(ctx.executionId());
writer.writeBoolean(ctx.isCancelled());
@@ -175,7 +175,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
try (PlatformMemory outMem = platformCtx.memory().allocate()) {
PlatformOutputStream out = outMem.output();
- PortableRawWriterEx writer = platformCtx.writer(out);
+ IgniteObjectRawWriterEx writer = platformCtx.writer(out);
writer.writeBoolean(srvKeepPortable);
writer.writeString(mthdName);
@@ -195,7 +195,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
try (PlatformMemory inMem = platformCtx.memory().allocate()) {
PlatformInputStream in = inMem.input();
- PortableRawReaderEx reader = platformCtx.reader(in);
+ IgniteObjectRawReaderEx reader = platformCtx.reader(in);
platformCtx.gateway().serviceInvokeMethod(ptr, outMem.pointer(), inMem.pointer());
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
index bfa4570..b6efb0d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
@@ -22,8 +22,8 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteServices;
-import org.apache.ignite.internal.portable.PortableRawReaderEx;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.dotnet.PlatformDotNetService;
@@ -128,7 +128,7 @@ public class PlatformServices extends PlatformAbstractTarget {
}
/** {@inheritDoc} */
- @Override protected long processInStreamOutLong(int type, PortableRawReaderEx reader)
+ @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader)
throws IgniteCheckedException {
switch (type) {
case OP_DOTNET_DEPLOY: {
@@ -169,7 +169,7 @@ public class PlatformServices extends PlatformAbstractTarget {
}
/** {@inheritDoc} */
- @Override protected void processInStreamOutStream(int type, PortableRawReaderEx reader, PortableRawWriterEx writer)
+ @Override protected void processInStreamOutStream(int type, IgniteObjectRawReaderEx reader, IgniteObjectRawWriterEx writer)
throws IgniteCheckedException {
switch (type) {
case OP_DOTNET_SERVICES: {
@@ -177,7 +177,7 @@ public class PlatformServices extends PlatformAbstractTarget {
PlatformUtils.writeNullableCollection(writer, svcs,
new PlatformWriterClosure<Service>() {
- @Override public void write(PortableRawWriterEx writer, Service svc) {
+ @Override public void write(IgniteObjectRawWriterEx writer, Service svc) {
writer.writeLong(((PlatformService) svc).pointer());
}
},
@@ -197,8 +197,8 @@ public class PlatformServices extends PlatformAbstractTarget {
}
/** {@inheritDoc} */
- @Override protected void processInObjectStreamOutStream(int type, Object arg, PortableRawReaderEx reader,
- PortableRawWriterEx writer) throws IgniteCheckedException {
+ @Override protected void processInObjectStreamOutStream(int type, Object arg, IgniteObjectRawReaderEx reader,
+ IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
switch (type) {
case OP_DOTNET_INVOKE: {
assert arg != null;
@@ -235,13 +235,13 @@ public class PlatformServices extends PlatformAbstractTarget {
}
/** {@inheritDoc} */
- @Override protected void processOutStream(int type, PortableRawWriterEx writer) throws IgniteCheckedException {
+ @Override protected void processOutStream(int type, IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
switch (type) {
case OP_DESCRIPTORS: {
Collection<ServiceDescriptor> descs = services.serviceDescriptors();
PlatformUtils.writeCollection(writer, descs, new PlatformWriterClosure<ServiceDescriptor>() {
- @Override public void write(PortableRawWriterEx writer, ServiceDescriptor d) {
+ @Override public void write(IgniteObjectRawWriterEx writer, ServiceDescriptor d) {
writer.writeString(d.name());
writer.writeString(d.cacheName());
writer.writeInt(d.maxPerNodeCount());
@@ -252,7 +252,7 @@ public class PlatformServices extends PlatformAbstractTarget {
Map<UUID, Integer> top = d.topologySnapshot();
PlatformUtils.writeMap(writer, top, new PlatformWriterBiClosure<UUID, Integer>() {
- @Override public void write(PortableRawWriterEx writer, UUID key, Integer val) {
+ @Override public void write(IgniteObjectRawWriterEx writer, UUID key, Integer val) {
writer.writeUuid(key);
writer.writeInt(val);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java
index c143212..3fdfddf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java
@@ -18,13 +18,12 @@
package org.apache.ignite.internal.processors.platform.transactions;
import java.sql.Timestamp;
-import java.util.Date;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.configuration.TransactionConfiguration;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.utils.PlatformFutureUtils;
@@ -232,7 +231,7 @@ public class PlatformTransactions extends PlatformAbstractTarget {
}
/** {@inheritDoc} */
- @Override protected void processOutStream(int type, PortableRawWriterEx writer) throws IgniteCheckedException {
+ @Override protected void processOutStream(int type, IgniteObjectRawWriterEx writer) throws IgniteCheckedException {
switch (type) {
case OP_CACHE_CONFIG_PARAMETERS:
TransactionConfiguration txCfg = platformCtx.kernalContext().config().getTransactionConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformFutureUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformFutureUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformFutureUtils.java
index 0019986..7cf8adb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformFutureUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformFutureUtils.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.processors.platform.utils;
import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway;
@@ -164,7 +164,7 @@ public class PlatformFutureUtils {
try (PlatformMemory mem = ctx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx outWriter = ctx.writer(out);
+ IgniteObjectRawWriterEx outWriter = ctx.writer(out);
outWriter.writeObjectDetached(res);
@@ -244,7 +244,7 @@ public class PlatformFutureUtils {
try (PlatformMemory mem = ctx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx outWriter = ctx.writer(out);
+ IgniteObjectRawWriterEx outWriter = ctx.writer(out);
outWriter.writeString(err.getClass().getName());
outWriter.writeString(err.getMessage());
@@ -276,7 +276,7 @@ public class PlatformFutureUtils {
try (PlatformMemory mem = ctx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx outWriter = ctx.writer(out);
+ IgniteObjectRawWriterEx outWriter = ctx.writer(out);
writer.write(outWriter, obj, err);
@@ -299,7 +299,7 @@ public class PlatformFutureUtils {
* @param obj Object.
* @param err Error.
*/
- public void write(PortableRawWriterEx writer, Object obj, Throwable err);
+ public void write(IgniteObjectRawWriterEx writer, Object obj, Throwable err);
/**
* Determines whether this writer can write given data.
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformReaderBiClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformReaderBiClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformReaderBiClosure.java
index 79759e9..4bda62a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformReaderBiClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformReaderBiClosure.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.platform.utils;
-import org.apache.ignite.internal.portable.PortableRawReaderEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx;
import org.apache.ignite.lang.IgniteBiTuple;
/**
@@ -30,5 +30,5 @@ public interface PlatformReaderBiClosure<T1, T2> {
* @param reader Reader.
* @return Object.
*/
- IgniteBiTuple<T1, T2> read(PortableRawReaderEx reader);
+ IgniteBiTuple<T1, T2> read(IgniteObjectRawReaderEx reader);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformReaderClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformReaderClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformReaderClosure.java
index 2d9b44a..3bec262 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformReaderClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformReaderClosure.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.platform.utils;
-import org.apache.ignite.internal.portable.PortableRawReaderEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx;
/**
* Reader closure.
@@ -30,5 +30,5 @@ public interface PlatformReaderClosure<T> {
* @param reader Reader.
* @return Object.
*/
- T read(PortableRawReaderEx reader);
+ T read(IgniteObjectRawReaderEx reader);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
index 11d8371..a1d1cae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
@@ -24,8 +24,8 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.portable.PortableRawReaderEx;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.PlatformExtendedException;
import org.apache.ignite.internal.processors.platform.PlatformNativeException;
@@ -96,7 +96,7 @@ public class PlatformUtils {
* @param writer Writer.
* @param col Collection to write.
*/
- public static <T> void writeNullableCollection(PortableRawWriterEx writer, @Nullable Collection<T> col) {
+ public static <T> void writeNullableCollection(IgniteObjectRawWriterEx writer, @Nullable Collection<T> col) {
writeNullableCollection(writer, col, null, null);
}
@@ -107,7 +107,7 @@ public class PlatformUtils {
* @param col Collection to write.
* @param writeClo Writer closure.
*/
- public static <T> void writeNullableCollection(PortableRawWriterEx writer, @Nullable Collection<T> col,
+ public static <T> void writeNullableCollection(IgniteObjectRawWriterEx writer, @Nullable Collection<T> col,
@Nullable PlatformWriterClosure<T> writeClo) {
writeNullableCollection(writer, col, writeClo, null);
}
@@ -120,7 +120,7 @@ public class PlatformUtils {
* @param writeClo Optional writer closure.
* @param filter Optional filter.
*/
- public static <T> void writeNullableCollection(PortableRawWriterEx writer, @Nullable Collection<T> col,
+ public static <T> void writeNullableCollection(IgniteObjectRawWriterEx writer, @Nullable Collection<T> col,
@Nullable PlatformWriterClosure<T> writeClo, @Nullable IgnitePredicate<T> filter) {
if (col != null) {
writer.writeBoolean(true);
@@ -137,7 +137,7 @@ public class PlatformUtils {
* @param writer Writer.
* @param col Collection to write.
*/
- public static <T> void writeCollection(PortableRawWriterEx writer, Collection<T> col) {
+ public static <T> void writeCollection(IgniteObjectRawWriterEx writer, Collection<T> col) {
writeCollection(writer, col, null, null);
}
@@ -148,7 +148,7 @@ public class PlatformUtils {
* @param col Collection to write.
* @param writeClo Writer closure.
*/
- public static <T> void writeCollection(PortableRawWriterEx writer, Collection<T> col,
+ public static <T> void writeCollection(IgniteObjectRawWriterEx writer, Collection<T> col,
@Nullable PlatformWriterClosure<T> writeClo) {
writeCollection(writer, col, writeClo, null);
}
@@ -161,7 +161,7 @@ public class PlatformUtils {
* @param writeClo Optional writer closure.
* @param filter Optional filter.
*/
- public static <T> void writeCollection(PortableRawWriterEx writer, Collection<T> col,
+ public static <T> void writeCollection(IgniteObjectRawWriterEx writer, Collection<T> col,
@Nullable PlatformWriterClosure<T> writeClo, @Nullable IgnitePredicate<T> filter) {
assert col != null;
@@ -202,7 +202,7 @@ public class PlatformUtils {
* @param writer Writer.
* @param map Map to write.
*/
- public static <K, V> void writeNullableMap(PortableRawWriterEx writer, @Nullable Map<K, V> map) {
+ public static <K, V> void writeNullableMap(IgniteObjectRawWriterEx writer, @Nullable Map<K, V> map) {
if (map != null) {
writer.writeBoolean(true);
@@ -218,7 +218,7 @@ public class PlatformUtils {
* @param writer Writer.
* @param map Map to write.
*/
- public static <K, V> void writeMap(PortableRawWriterEx writer, Map<K, V> map) {
+ public static <K, V> void writeMap(IgniteObjectRawWriterEx writer, Map<K, V> map) {
assert map != null;
writeMap(writer, map, null);
@@ -231,7 +231,7 @@ public class PlatformUtils {
* @param map Map to write.
* @param writeClo Writer closure.
*/
- public static <K, V> void writeMap(PortableRawWriterEx writer, Map<K, V> map,
+ public static <K, V> void writeMap(IgniteObjectRawWriterEx writer, Map<K, V> map,
@Nullable PlatformWriterBiClosure<K, V> writeClo) {
assert map != null;
@@ -255,7 +255,7 @@ public class PlatformUtils {
* @param reader Reader.
* @return List.
*/
- public static <T> List<T> readCollection(PortableRawReaderEx reader) {
+ public static <T> List<T> readCollection(IgniteObjectRawReaderEx reader) {
return readCollection(reader, null);
}
@@ -266,7 +266,7 @@ public class PlatformUtils {
* @param readClo Optional reader closure.
* @return List.
*/
- public static <T> List<T> readCollection(PortableRawReaderEx reader, @Nullable PlatformReaderClosure<T> readClo) {
+ public static <T> List<T> readCollection(IgniteObjectRawReaderEx reader, @Nullable PlatformReaderClosure<T> readClo) {
int cnt = reader.readInt();
List<T> res = new ArrayList<>(cnt);
@@ -289,7 +289,7 @@ public class PlatformUtils {
* @param reader Reader.
* @return List.
*/
- public static <T> List<T> readNullableCollection(PortableRawReaderEx reader) {
+ public static <T> List<T> readNullableCollection(IgniteObjectRawReaderEx reader) {
return readNullableCollection(reader, null);
}
@@ -299,7 +299,7 @@ public class PlatformUtils {
* @param reader Reader.
* @return List.
*/
- public static <T> List<T> readNullableCollection(PortableRawReaderEx reader,
+ public static <T> List<T> readNullableCollection(IgniteObjectRawReaderEx reader,
@Nullable PlatformReaderClosure<T> readClo) {
if (!reader.readBoolean())
return null;
@@ -311,7 +311,7 @@ public class PlatformUtils {
* @param reader Reader.
* @return Set.
*/
- public static <T> Set<T> readSet(PortableRawReaderEx reader) {
+ public static <T> Set<T> readSet(IgniteObjectRawReaderEx reader) {
int cnt = reader.readInt();
Set<T> res = U.newHashSet(cnt);
@@ -326,7 +326,7 @@ public class PlatformUtils {
* @param reader Reader.
* @return Set.
*/
- public static <T> Set<T> readNullableSet(PortableRawReaderEx reader) {
+ public static <T> Set<T> readNullableSet(IgniteObjectRawReaderEx reader) {
if (!reader.readBoolean())
return null;
@@ -339,7 +339,7 @@ public class PlatformUtils {
* @param reader Reader.
* @return Map.
*/
- public static <K, V> Map<K, V> readMap(PortableRawReaderEx reader) {
+ public static <K, V> Map<K, V> readMap(IgniteObjectRawReaderEx reader) {
return readMap(reader, null);
}
@@ -350,7 +350,7 @@ public class PlatformUtils {
* @param readClo Reader closure.
* @return Map.
*/
- public static <K, V> Map<K, V> readMap(PortableRawReaderEx reader,
+ public static <K, V> Map<K, V> readMap(IgniteObjectRawReaderEx reader,
@Nullable PlatformReaderBiClosure<K, V> readClo) {
int cnt = reader.readInt();
@@ -377,7 +377,7 @@ public class PlatformUtils {
* @param reader Reader.
* @return Map.
*/
- public static <K, V> Map<K, V> readNullableMap(PortableRawReaderEx reader) {
+ public static <K, V> Map<K, V> readNullableMap(IgniteObjectRawReaderEx reader) {
if (!reader.readBoolean())
return null;
@@ -390,7 +390,7 @@ public class PlatformUtils {
* @param writer Writer.
* @param val Values.
*/
- public static void writeIgniteUuid(PortableRawWriterEx writer, IgniteUuid val) {
+ public static void writeIgniteUuid(IgniteObjectRawWriterEx writer, IgniteUuid val) {
if (val == null)
writer.writeUuid(null);
else {
@@ -483,7 +483,7 @@ public class PlatformUtils {
try (PlatformMemory mem = ctx.memory().allocate()) {
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = ctx.writer(out);
+ IgniteObjectRawWriterEx writer = ctx.writer(out);
int cntPos = writer.reserveInt();
@@ -552,7 +552,7 @@ public class PlatformUtils {
* @param writer Writer.
* @param evt Event.
*/
- private static void writeCacheEntryEvent(PortableRawWriterEx writer, CacheEntryEvent evt) {
+ private static void writeCacheEntryEvent(IgniteObjectRawWriterEx writer, CacheEntryEvent evt) {
writer.writeObjectDetached(evt.getKey());
writer.writeObjectDetached(evt.getOldValue());
writer.writeObjectDetached(evt.getValue());
@@ -564,7 +564,7 @@ public class PlatformUtils {
* @param err Error.
* @param writer Writer.
*/
- public static void writeErrorData(Throwable err, PortableRawWriterEx writer) {
+ public static void writeErrorData(Throwable err, IgniteObjectRawWriterEx writer) {
writeErrorData(err, writer, null);
}
@@ -574,7 +574,7 @@ public class PlatformUtils {
* @param writer Writer.
* @param log Optional logger.
*/
- public static void writeErrorData(Throwable err, PortableRawWriterEx writer, @Nullable IgniteLogger log) {
+ public static void writeErrorData(Throwable err, IgniteObjectRawWriterEx writer, @Nullable IgniteLogger log) {
// Write additional data if needed.
if (err instanceof PlatformExtendedException) {
PlatformExtendedException err0 = (PlatformExtendedException)err;
@@ -659,7 +659,7 @@ public class PlatformUtils {
// Write error data.
PlatformOutputStream out = mem.output();
- PortableRawWriterEx writer = ctx.writer(out);
+ IgniteObjectRawWriterEx writer = ctx.writer(out);
try {
PlatformUtils.writeErrorData(err, writer, ctx.kernalContext().log(PlatformContext.class));
@@ -696,7 +696,7 @@ public class PlatformUtils {
* @param resObj Result.
* @param err Error.
*/
- public static void writeInvocationResult(PortableRawWriterEx writer, Object resObj, Exception err)
+ public static void writeInvocationResult(IgniteObjectRawWriterEx writer, Object resObj, Exception err)
{
if (err == null) {
writer.writeBoolean(true);
@@ -732,7 +732,7 @@ public class PlatformUtils {
* @return Result.
* @throws IgniteCheckedException When invocation result is an error.
*/
- public static Object readInvocationResult(PlatformContext ctx, PortableRawReaderEx reader)
+ public static Object readInvocationResult(PlatformContext ctx, IgniteObjectRawReaderEx reader)
throws IgniteCheckedException {
// 1. Read success flag.
boolean success = reader.readBoolean();
@@ -769,7 +769,7 @@ public class PlatformUtils {
* @param writer Writer.
* @param cfg Configuration.
*/
- public static void writeDotNetConfiguration(PortableRawWriterEx writer, PlatformDotNetConfiguration cfg) {
+ public static void writeDotNetConfiguration(IgniteObjectRawWriterEx writer, PlatformDotNetConfiguration cfg) {
// 1. Write assemblies.
writeNullableCollection(writer, cfg.getAssemblies());
@@ -780,7 +780,7 @@ public class PlatformUtils {
writeNullableCollection(writer, portableCfg.getTypesConfiguration(),
new PlatformWriterClosure<PlatformDotNetPortableTypeConfiguration>() {
- @Override public void write(PortableRawWriterEx writer, PlatformDotNetPortableTypeConfiguration typ) {
+ @Override public void write(IgniteObjectRawWriterEx writer, PlatformDotNetPortableTypeConfiguration typ) {
writer.writeString(typ.getAssemblyName());
writer.writeString(typ.getTypeName());
writer.writeString(typ.getNameMapper());
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformWriterBiClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformWriterBiClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformWriterBiClosure.java
index 6b04ad3..c944345 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformWriterBiClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformWriterBiClosure.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.platform.utils;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
/**
* Interop writer bi-closure.
@@ -30,5 +30,5 @@ public interface PlatformWriterBiClosure<T1, T2> {
* @param val1 Value 1.
* @param val2 Value 2.
*/
- public void write(PortableRawWriterEx writer, T1 val1, T2 val2);
+ public void write(IgniteObjectRawWriterEx writer, T1 val1, T2 val2);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformWriterClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformWriterClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformWriterClosure.java
index a67d70a..2c9ab07 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformWriterClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformWriterClosure.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.platform.utils;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx;
/**
* Interop writer closure.
@@ -29,5 +29,5 @@ public interface PlatformWriterClosure<T> {
* @param writer Writer.
* @param val Value.
*/
- public void write(PortableRawWriterEx writer, T val);
+ public void write(IgniteObjectRawWriterEx writer, T val);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index e26c140..2b54e2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -46,7 +46,8 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.CacheTypeMetadata;
import org.apache.ignite.cache.QueryEntity;
-import org.apache.ignite.cache.QueryEntityIndex;
+import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.cache.QueryIndexType;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.SqlQuery;
@@ -1410,40 +1411,33 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (aliases == null)
aliases = Collections.emptyMap();
- for (QueryEntityIndex idx : qryEntity.getIndexes()) {
+ for (QueryIndex idx : qryEntity.getIndexes()) {
String idxName = idx.getName();
if (idxName == null)
idxName = QueryEntity.defaultIndexName(idx);
- if (idx.getType() == QueryEntityIndex.Type.SORTED || idx.getType() == QueryEntityIndex.Type.GEOSPATIAL) {
- d.addIndex(idxName, idx.getType() == QueryEntityIndex.Type.SORTED ? SORTED : GEO_SPATIAL);
+ if (idx.getIndexType() == QueryIndexType.SORTED || idx.getIndexType() == QueryIndexType.GEOSPATIAL) {
+ d.addIndex(idxName, idx.getIndexType() == QueryIndexType.SORTED ? SORTED : GEO_SPATIAL);
int i = 0;
- for (String field : idx.getFields()) {
- boolean desc = false;
-
- int space = field.indexOf(' ');
-
- if (space != -1) {
- desc = field.toLowerCase().startsWith("desc", space + 1);
-
- field = field.substring(0, space);
- }
+ for (Map.Entry<String, Boolean> entry : idx.getFields().entrySet()) {
+ String field = entry.getKey();
+ boolean asc = entry.getValue();
String alias = aliases.get(field);
if (alias != null)
field = alias;
- d.addFieldToIndex(idxName, field, i++, desc);
+ d.addFieldToIndex(idxName, field, i++, !asc);
}
}
else {
- assert idx.getType() == QueryEntityIndex.Type.FULLTEXT;
+ assert idx.getIndexType() == QueryIndexType.FULLTEXT;
- for (String field : idx.getFields()) {
+ for (String field : idx.getFields().keySet()) {
String alias = aliases.get(field);
if (alias != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
index ea2e1cc..e44acfc 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
@@ -28,11 +28,11 @@ import org.apache.ignite.internal.portable.GridPortableMarshaller;
import org.apache.ignite.internal.portable.PortableContext;
import org.apache.ignite.marshaller.AbstractMarshaller;
import org.apache.ignite.marshaller.MarshallerContext;
-import org.apache.ignite.portable.PortableException;
-import org.apache.ignite.portable.PortableIdMapper;
-import org.apache.ignite.portable.PortableObject;
-import org.apache.ignite.portable.PortableSerializer;
-import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.apache.ignite.igniteobject.IgniteObject;
+import org.apache.ignite.igniteobject.IgniteObjectConfiguration;
+import org.apache.ignite.igniteobject.IgniteObjectException;
+import org.apache.ignite.igniteobject.IgniteObjectIdMapper;
+import org.apache.ignite.igniteobject.IgniteObjectSerializer;
import org.jetbrains.annotations.Nullable;
/**
@@ -79,13 +79,13 @@ public class PortableMarshaller extends AbstractMarshaller {
private Collection<String> clsNames;
/** ID mapper. */
- private PortableIdMapper idMapper;
+ private IgniteObjectIdMapper idMapper;
/** Serializer. */
- private PortableSerializer serializer;
+ private IgniteObjectSerializer serializer;
/** Types. */
- private Collection<PortableTypeConfiguration> typeCfgs;
+ private Collection<IgniteObjectConfiguration> typeCfgs;
/** Whether to convert string to bytes using UTF-8 encoding. */
private boolean convertString = true;
@@ -125,7 +125,7 @@ public class PortableMarshaller extends AbstractMarshaller {
*
* @return ID mapper.
*/
- public PortableIdMapper getIdMapper() {
+ public IgniteObjectIdMapper getIdMapper() {
return idMapper;
}
@@ -134,7 +134,7 @@ public class PortableMarshaller extends AbstractMarshaller {
*
* @param idMapper ID mapper.
*/
- public void setIdMapper(PortableIdMapper idMapper) {
+ public void setIdMapper(IgniteObjectIdMapper idMapper) {
this.idMapper = idMapper;
}
@@ -143,7 +143,7 @@ public class PortableMarshaller extends AbstractMarshaller {
*
* @return Serializer.
*/
- public PortableSerializer getSerializer() {
+ public IgniteObjectSerializer getSerializer() {
return serializer;
}
@@ -152,7 +152,7 @@ public class PortableMarshaller extends AbstractMarshaller {
*
* @param serializer Serializer.
*/
- public void setSerializer(PortableSerializer serializer) {
+ public void setSerializer(IgniteObjectSerializer serializer) {
this.serializer = serializer;
}
@@ -161,7 +161,7 @@ public class PortableMarshaller extends AbstractMarshaller {
*
* @return Types configuration.
*/
- public Collection<PortableTypeConfiguration> getTypeConfigurations() {
+ public Collection<IgniteObjectConfiguration> getTypeConfigurations() {
return typeCfgs;
}
@@ -170,7 +170,7 @@ public class PortableMarshaller extends AbstractMarshaller {
*
* @param typeCfgs Type configurations.
*/
- public void setTypeConfigurations(Collection<PortableTypeConfiguration> typeCfgs) {
+ public void setTypeConfigurations(Collection<IgniteObjectConfiguration> typeCfgs) {
this.typeCfgs = typeCfgs;
}
@@ -198,7 +198,7 @@ public class PortableMarshaller extends AbstractMarshaller {
/**
* If {@code true}, meta data will be collected or all types. If you need to override this behaviour for
- * some specific type, use {@link PortableTypeConfiguration#setMetaDataEnabled(Boolean)} method.
+ * some specific type, use {@link IgniteObjectConfiguration#setMetaDataEnabled(Boolean)} method.
* <p>
* Default value if {@code true}.
*
@@ -216,11 +216,11 @@ public class PortableMarshaller extends AbstractMarshaller {
}
/**
- * If {@code true}, {@link PortableObject} will cache deserialized instance after
- * {@link PortableObject#deserialize()} is called. All consequent calls of this
- * method on the same instance of {@link PortableObject} will return that cached
+ * If {@code true}, {@link IgniteObject} will cache deserialized instance after
+ * {@link IgniteObject#deserialize()} is called. All consequent calls of this
+ * method on the same instance of {@link IgniteObject} will return that cached
* value without actually deserializing portable object. If you need to override this
- * behaviour for some specific type, use {@link PortableTypeConfiguration#setKeepDeserialized(Boolean)}
+ * behaviour for some specific type, use {@link IgniteObjectConfiguration#setKeepDeserialized(Boolean)}
* method.
* <p>
* Default value if {@code true}.
@@ -271,7 +271,7 @@ public class PortableMarshaller extends AbstractMarshaller {
out.write(arr);
}
catch (IOException e) {
- throw new PortableException("Failed to marshal the object: " + obj, e);
+ throw new IgniteObjectException("Failed to marshal the object: " + obj, e);
}
}
@@ -298,7 +298,7 @@ public class PortableMarshaller extends AbstractMarshaller {
return impl.deserialize(buf.toByteArray(), clsLdr);
}
catch (IOException e) {
- throw new PortableException("Failed to unmarshal the object from InputStream", e);
+ throw new IgniteObjectException("Failed to unmarshal the object from InputStream", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java
deleted file mode 100644
index 377fcdc..0000000
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.portable;
-
-import org.apache.ignite.IgnitePortables;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Portable object builder. Provides ability to build portable objects dynamically without having class definitions.
- * <p>
- * Here is an example of how a portable object can be built dynamically:
- * <pre name=code class=java>
- * PortableBuilder builder = Ignition.ignite().portables().builder("org.project.MyObject");
- *
- * builder.setField("fieldA", "A");
- * builder.setField("fieldB", "B");
- *
- * PortableObject portableObj = builder.build();
- * </pre>
- *
- * <p>
- * Also builder can be initialized by existing portable object. This allows changing some fields without affecting
- * other fields.
- * <pre name=code class=java>
- * PortableBuilder builder = Ignition.ignite().portables().builder(person);
- *
- * builder.setField("name", "John");
- *
- * person = builder.build();
- * </pre>
- * </p>
- *
- * If you need to modify nested portable object you can get builder for nested object using
- * {@link #getField(String)}, changes made on nested builder will affect parent object,
- * for example:
- *
- * <pre name=code class=java>
- * PortableBuilder personBuilder = grid.portables().createBuilder(personPortableObj);
- * PortableBuilder addressBuilder = personBuilder.setField("address");
- *
- * addressBuilder.setField("city", "New York");
- *
- * personPortableObj = personBuilder.build();
- *
- * // Should be "New York".
- * String city = personPortableObj.getField("address").getField("city");
- * </pre>
- *
- * @see IgnitePortables#builder(int)
- * @see IgnitePortables#builder(String)
- * @see IgnitePortables#builder(PortableObject)
- */
-public interface PortableBuilder {
- /**
- * Returns value assigned to the specified field.
- * If the value is a portable object instance of {@code GridPortableBuilder} will be returned,
- * which can be modified.
- * <p>
- * Collections and maps returned from this method are modifiable.
- *
- * @param name Field name.
- * @return Filed value.
- */
- public <T> T getField(String name);
-
- /**
- * Sets field value.
- *
- * @param name Field name.
- * @param val Field value (cannot be {@code null}).
- * @see PortableObject#metaData()
- */
- public PortableBuilder setField(String name, Object val);
-
- /**
- * Sets field value with value type specification.
- * <p>
- * Field type is needed for proper metadata update.
- *
- * @param name Field name.
- * @param val Field value.
- * @param type Field type.
- * @see PortableObject#metaData()
- */
- public <T> PortableBuilder setField(String name, @Nullable T val, Class<? super T> type);
-
- /**
- * Sets field value.
- * <p>
- * This method should be used if field is portable object.
- *
- * @param name Field name.
- * @param builder Builder for object field.
- */
- public PortableBuilder setField(String name, @Nullable PortableBuilder builder);
-
- /**
- * Removes field from this builder.
- *
- * @param fieldName Field name.
- * @return {@code this} instance for chaining.
- */
- public PortableBuilder removeField(String fieldName);
-
- /**
- * Sets hash code for resulting portable object returned by {@link #build()} method.
- * <p>
- * If not set {@code 0} is used.
- *
- * @param hashCode Hash code.
- * @return {@code this} instance for chaining.
- */
- public PortableBuilder hashCode(int hashCode);
-
- /**
- * Builds portable object.
- *
- * @return Portable object.
- * @throws PortableException In case of error.
- */
- public PortableObject build() throws PortableException;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java
deleted file mode 100644
index 0f8d78b..0000000
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.portable;
-
-import org.apache.ignite.IgniteException;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Exception indicating portable object serialization error.
- */
-public class PortableException extends IgniteException {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Creates portable exception with error message.
- *
- * @param msg Error message.
- */
- public PortableException(String msg) {
- super(msg);
- }
-
- /**
- * Creates portable exception with {@link Throwable} as a cause.
- *
- * @param cause Cause.
- */
- public PortableException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Creates portable exception with error message and {@link Throwable} as a cause.
- *
- * @param msg Error message.
- * @param cause Cause.
- */
- public PortableException(String msg, @Nullable Throwable cause) {
- super(msg, cause);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
deleted file mode 100644
index 368e415..0000000
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.portable;
-
-import org.apache.ignite.marshaller.portable.PortableMarshaller;
-
-/**
- * Type and field ID mapper for portable objects. Ignite never writes full
- * strings for field or type names. Instead, for performance reasons, Ignite
- * writes integer hash codes for type and field names. It has been tested that
- * hash code conflicts for the type names or the field names
- * within the same type are virtually non-existent and, to gain performance, it is safe
- * to work with hash codes. For the cases when hash codes for different types or fields
- * actually do collide {@code PortableIdMapper} allows to override the automatically
- * generated hash code IDs for the type and field names.
- * <p>
- * Portable ID mapper can be configured for all portable objects via {@link PortableMarshaller#getIdMapper()} method,
- * or for a specific portable type via {@link PortableTypeConfiguration#getIdMapper()} method.
- */
-public interface PortableIdMapper {
- /**
- * Gets type ID for provided class name.
- * <p>
- * If {@code 0} is returned, hash code of class simple name will be used.
- *
- * @param clsName Class name.
- * @return Type ID.
- */
- public int typeId(String clsName);
-
- /**
- * Gets ID for provided field.
- * <p>
- * If {@code 0} is returned, hash code of field name will be used.
- *
- * @param typeId Type ID.
- * @param fieldName Field name.
- * @return Field ID.
- */
- public int fieldId(int typeId, String fieldName);
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
deleted file mode 100644
index 0098ec3..0000000
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.portable;
-
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Exception indicating that class needed for deserialization of portable object does not exist.
- * <p>
- * Thrown from {@link PortableObject#deserialize()} method.
- */
-public class PortableInvalidClassException extends PortableException {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Creates invalid class exception with error message.
- *
- * @param msg Error message.
- */
- public PortableInvalidClassException(String msg) {
- super(msg);
- }
-
- /**
- * Creates invalid class exception with {@link Throwable} as a cause.
- *
- * @param cause Cause.
- */
- public PortableInvalidClassException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Creates invalid class exception with error message and {@link Throwable} as a cause.
- *
- * @param msg Error message.
- * @param cause Cause.
- */
- public PortableInvalidClassException(String msg, @Nullable Throwable cause) {
- super(msg, cause);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
deleted file mode 100644
index 4270885..0000000
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.portable;
-
-/**
- * Interface that allows to implement custom serialization
- * logic for portable objects. Portable objects are not required
- * to implement this interface, in which case Ignite will automatically
- * serialize portable objects using reflection.
- * <p>
- * This interface, in a way, is analogous to {@link java.io.Externalizable}
- * interface, which allows users to override default serialization logic,
- * usually for performance reasons. The only difference here is that portable
- * serialization is already very fast and implementing custom serialization
- * logic for portables does not provide significant performance gains.
- */
-public interface PortableMarshalAware {
- /**
- * Writes fields to provided writer.
- *
- * @param writer Portable object writer.
- * @throws PortableException In case of error.
- */
- public void writePortable(PortableWriter writer) throws PortableException;
-
- /**
- * Reads fields from provided reader.
- *
- * @param reader Portable object reader.
- * @throws PortableException In case of error.
- */
- public void readPortable(PortableReader reader) throws PortableException;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b6d61f/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
deleted file mode 100644
index 4ea808b..0000000
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.portable;
-
-import java.util.Collection;
-import org.apache.ignite.IgnitePortables;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Portable type meta data. Metadata for portable types can be accessed from any of the
- * {@link IgnitePortables#metadata(String)} methods.
- * Having metadata also allows for proper formatting of {@code PortableObject#toString()} method,
- * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
- */
-public interface PortableMetadata {
- /**
- * Gets portable type name.
- *
- * @return Portable type name.
- */
- public String typeName();
-
- /**
- * Gets collection of all field names for this portable type.
- *
- * @return Collection of all field names for this portable type.
- */
- public Collection<String> fields();
-
- /**
- * Gets name of the field type for a given field.
- *
- * @param fieldName Field name.
- * @return Field type name.
- */
- @Nullable public String fieldTypeName(String fieldName);
-
- /**
- * Portable objects can optionally specify custom key-affinity mapping in the
- * configuration. This method returns the name of the field which should be
- * used for the key-affinity mapping.
- *
- * @return Affinity key field name.
- */
- @Nullable public String affinityKeyFieldName();
-}
\ No newline at end of file