You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/05 09:44:33 UTC
[06/38] incubator-ignite git commit: # Renaming
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientMetaDataResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientMetaDataResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientMetaDataResponse.java
index 2cb89ce..4326b7a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientMetaDataResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientMetaDataResponse.java
@@ -19,25 +19,25 @@ import java.util.*;
*/
public class GridClientMetaDataResponse implements PortableMarshalAware {
/** */
- private Map<Integer, GridPortableMetadata> meta;
+ private Map<Integer, PortableMetadata> meta;
/**
* @param meta Portable objects metadata.
*/
- public void metaData(Map<Integer, GridPortableMetadata> meta) {
+ public void metaData(Map<Integer, PortableMetadata> meta) {
this.meta = meta;
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
- GridPortableRawWriter raw = writer.rawWriter();
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
+ PortableRawWriter raw = writer.rawWriter();
raw.writeMap(meta);
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
- GridPortableRawReader raw = reader.rawReader();
+ @Override public void readPortable(PortableReader reader) throws PortableException {
+ PortableRawReader raw = reader.rawReader();
meta = raw.readMap();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeBean.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeBean.java
index 74fcb6e..406da1a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeBean.java
@@ -247,8 +247,8 @@ public class GridClientNodeBean implements Externalizable, PortableMarshalAware
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
- GridPortableRawWriter raw = writer.rawWriter();
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
+ PortableRawWriter raw = writer.rawWriter();
raw.writeInt(tcpPort);
raw.writeInt(replicaCnt);
@@ -263,8 +263,8 @@ public class GridClientNodeBean implements Externalizable, PortableMarshalAware
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
- GridPortableRawReader raw = reader.rawReader();
+ @Override public void readPortable(PortableReader reader) throws PortableException {
+ PortableRawReader raw = reader.rawReader();
tcpPort = raw.readInt();
replicaCnt = raw.readInt();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeMetricsBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeMetricsBean.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeMetricsBean.java
index 1be72ef..0ad18b1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeMetricsBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeMetricsBean.java
@@ -1341,8 +1341,8 @@ public class GridClientNodeMetricsBean implements Externalizable, PortableMarsha
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
- GridPortableRawWriter raw = writer.rawWriter();
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
+ PortableRawWriter raw = writer.rawWriter();
raw.writeLong(lastUpdateTime);
raw.writeInt(maxActiveJobs);
@@ -1399,8 +1399,8 @@ public class GridClientNodeMetricsBean implements Externalizable, PortableMarsha
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
- GridPortableRawReader raw = reader.rawReader();
+ @Override public void readPortable(PortableReader reader) throws PortableException {
+ PortableRawReader raw = reader.rawReader();
lastUpdateTime = raw.readLong();
maxActiveJobs = raw.readInt();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPortableMetaData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPortableMetaData.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPortableMetaData.java
index a256051..daa72ed 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPortableMetaData.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPortableMetaData.java
@@ -59,8 +59,8 @@ public class GridClientPortableMetaData implements PortableMarshalAware {
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
- GridPortableRawWriter raw = writer.rawWriter();
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
+ PortableRawWriter raw = writer.rawWriter();
raw.writeInt(typeId);
raw.writeString(typeName);
@@ -69,8 +69,8 @@ public class GridClientPortableMetaData implements PortableMarshalAware {
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
- GridPortableRawReader raw = reader.rawReader();
+ @Override public void readPortable(PortableReader reader) throws PortableException {
+ PortableRawReader raw = reader.rawReader();
typeId = raw.readInt();
typeName = raw.readString();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPutMetaDataRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPutMetaDataRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPutMetaDataRequest.java
index 3699913..43f7f3f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPutMetaDataRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPutMetaDataRequest.java
@@ -32,19 +32,19 @@ public class GridClientPutMetaDataRequest extends GridClientAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
super.writePortable(writer);
- GridPortableRawWriter raw = writer.rawWriter();
+ PortableRawWriter raw = writer.rawWriter();
raw.writeCollection(meta);
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
+ @Override public void readPortable(PortableReader reader) throws PortableException {
super.readPortable(reader);
- GridPortableRawReader raw = reader.rawReader();
+ PortableRawReader raw = reader.rawReader();
meta = raw.readCollection();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientResponse.java
index 6bc1db9..b228d7f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientResponse.java
@@ -85,10 +85,10 @@ public class GridClientResponse extends GridClientAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
super.writePortable(writer);
- GridPortableRawWriter raw = writer.rawWriter();
+ PortableRawWriter raw = writer.rawWriter();
raw.writeInt(successStatus);
raw.writeString(errorMsg);
@@ -96,10 +96,10 @@ public class GridClientResponse extends GridClientAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
+ @Override public void readPortable(PortableReader reader) throws PortableException {
super.readPortable(reader);
- GridPortableRawReader raw = reader.rawReader();
+ PortableRawReader raw = reader.rawReader();
successStatus = raw.readInt();
errorMsg = raw.readString();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskRequest.java
index e8d452e..21a9b27 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskRequest.java
@@ -94,10 +94,10 @@ public class GridClientTaskRequest extends GridClientAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
super.writePortable(writer);
- GridPortableRawWriterEx raw = (GridPortableRawWriterEx)writer.rawWriter();
+ PortableRawWriterEx raw = (PortableRawWriterEx)writer.rawWriter();
raw.writeString(taskName);
raw.writeBoolean(keepPortables);
@@ -109,10 +109,10 @@ public class GridClientTaskRequest extends GridClientAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
+ @Override public void readPortable(PortableReader reader) throws PortableException {
super.readPortable(reader);
- GridPortableRawReaderEx raw = (GridPortableRawReaderEx)reader.rawReader();
+ PortableRawReaderEx raw = (PortableRawReaderEx)reader.rawReader();
taskName = raw.readString();
keepPortables = raw.readBoolean();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskResultBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskResultBean.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskResultBean.java
index 666a0dc..ed00f8a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskResultBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskResultBean.java
@@ -92,8 +92,8 @@ public class GridClientTaskResultBean implements Externalizable, PortableMarshal
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
- GridPortableRawWriterEx raw = (GridPortableRawWriterEx)writer.rawWriter();
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
+ PortableRawWriterEx raw = (PortableRawWriterEx)writer.rawWriter();
raw.writeString(id);
raw.writeBoolean(finished);
@@ -104,8 +104,8 @@ public class GridClientTaskResultBean implements Externalizable, PortableMarshal
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
- GridPortableRawReaderEx raw = (GridPortableRawReaderEx)reader.rawReader();
+ @Override public void readPortable(PortableReader reader) throws PortableException {
+ PortableRawReaderEx raw = (PortableRawReaderEx)reader.rawReader();
id = raw.readString();
finished = raw.readBoolean();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTopologyRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTopologyRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTopologyRequest.java
index 761bcbd..1672cbf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTopologyRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTopologyRequest.java
@@ -111,10 +111,10 @@ public class GridClientTopologyRequest extends GridClientAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
super.writePortable(writer);
- GridPortableRawWriter raw = writer.rawWriter();
+ PortableRawWriter raw = writer.rawWriter();
raw.writeUuid(nodeId);
raw.writeString(nodeIp);
@@ -123,10 +123,10 @@ public class GridClientTopologyRequest extends GridClientAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
+ @Override public void readPortable(PortableReader reader) throws PortableException {
super.readPortable(reader);
- GridPortableRawReader raw = reader.rawReader();
+ PortableRawReader raw = reader.rawReader();
nodeId = raw.readUuid();
nodeIp = raw.readString();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheClientQueryResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheClientQueryResult.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheClientQueryResult.java
index 1200d97..d8c2afa 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheClientQueryResult.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheClientQueryResult.java
@@ -90,8 +90,8 @@ public class GridCacheClientQueryResult implements PortableMarshalAware, Seriali
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
- GridPortableRawWriter rawWriter = writer.rawWriter();
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
+ PortableRawWriter rawWriter = writer.rawWriter();
rawWriter.writeBoolean(last);
rawWriter.writeLong(qryId);
@@ -100,8 +100,8 @@ public class GridCacheClientQueryResult implements PortableMarshalAware, Seriali
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
- GridPortableRawReader rawReader = reader.rawReader();
+ @Override public void readPortable(PortableReader reader) throws PortableException {
+ PortableRawReader rawReader = reader.rawReader();
last = rawReader.readBoolean();
qryId = rawReader.readLong();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
index c55651f..f1825dd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
@@ -56,7 +56,7 @@ public class GridPortableMetadataHandler extends GridRestCommandHandlerAdapter {
GridRestResponse res = new GridRestResponse();
- Map<Integer, GridPortableMetadata> meta = ctx.portable().metadata(metaReq.typeIds());
+ Map<Integer, PortableMetadata> meta = ctx.portable().metadata(metaReq.typeIds());
GridClientMetaDataResponse metaRes = new GridClientMetaDataResponse();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
index d9a608b..ef87b58 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
@@ -48,7 +48,7 @@ public class VisorPortableMetadataCollectorTask extends VisorOneNodeTask<Long, I
final Collection<VisorPortableMetadata> data = new ArrayList<>(p.metadata().size());
- for(GridPortableMetadata metadata: p.metadata()) {
+ for(PortableMetadata metadata: p.metadata()) {
final VisorPortableMetadata type = new VisorPortableMetadata();
type.typeName(metadata.typeName());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/security/GridSecurityCredentials.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/security/GridSecurityCredentials.java b/modules/core/src/main/java/org/gridgain/grid/security/GridSecurityCredentials.java
index 299e9f9..2cccfbc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/security/GridSecurityCredentials.java
+++ b/modules/core/src/main/java/org/gridgain/grid/security/GridSecurityCredentials.java
@@ -176,14 +176,14 @@ public class GridSecurityCredentials implements Externalizable, PortableMarshalA
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
writer.rawWriter().writeObject(login);
writer.rawWriter().writeObject(password);
writer.rawWriter().writeObject(userObj);
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
+ @Override public void readPortable(PortableReader reader) throws PortableException {
login = reader.rawReader().readObject();
password = reader.rawReader().readObject();
userObj = reader.rawReader().readObject();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
index 47dfb92..fc1a530 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
@@ -8617,7 +8617,7 @@ public abstract class GridUtils {
public static boolean isPortableType(Class<?> cls) {
assert cls != null;
- return GridPortableObject.class.isAssignableFrom(cls) ||
+ return PortableObject.class.isAssignableFrom(cls) ||
PORTABLE_CLS.contains(cls) ||
cls.isEnum() ||
(cls.isArray() && cls.getComponentType().isEnum());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawReaderEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawReaderEx.java b/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawReaderEx.java
deleted file mode 100644
index 2367147..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawReaderEx.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.util.portable;
-
-import org.apache.ignite.portables.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Extended reader interface.
- */
-public interface GridPortableRawReaderEx extends GridPortableRawReader {
- /**
- * @return Object.
- * @throws org.apache.ignite.portables.PortableException In case of error.
- */
- @Nullable public Object readObjectDetached() throws PortableException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawWriterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawWriterEx.java b/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawWriterEx.java
deleted file mode 100644
index 7e8dd85..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawWriterEx.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.util.portable;
-
-import org.apache.ignite.portables.*;
-import org.gridgain.grid.kernal.processors.portable.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Extended writer interface.
- */
-public interface GridPortableRawWriterEx extends GridPortableRawWriter, AutoCloseable {
- /**
- * @param obj Object to write.
- * @throws org.apache.ignite.portables.PortableException In case of error.
- */
- public void writeObjectDetached(@Nullable Object obj) throws PortableException;
-
- /**
- * @return Output stream.
- */
- public GridPortableOutputStream out();
-
- /**
- * Cleans resources.
- */
- @Override public void close();
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/util/portable/PortableRawReaderEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/portable/PortableRawReaderEx.java b/modules/core/src/main/java/org/gridgain/grid/util/portable/PortableRawReaderEx.java
new file mode 100644
index 0000000..fe69fd2
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/util/portable/PortableRawReaderEx.java
@@ -0,0 +1,24 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.util.portable;
+
+import org.apache.ignite.portables.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Extended reader interface.
+ */
+public interface PortableRawReaderEx extends PortableRawReader {
+ /**
+ * @return Object.
+ * @throws org.apache.ignite.portables.PortableException In case of error.
+ */
+ @Nullable public Object readObjectDetached() throws PortableException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/main/java/org/gridgain/grid/util/portable/PortableRawWriterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/portable/PortableRawWriterEx.java b/modules/core/src/main/java/org/gridgain/grid/util/portable/PortableRawWriterEx.java
new file mode 100644
index 0000000..c8afcb6
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/util/portable/PortableRawWriterEx.java
@@ -0,0 +1,35 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.util.portable;
+
+import org.apache.ignite.portables.*;
+import org.gridgain.grid.kernal.processors.portable.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Extended writer interface.
+ */
+public interface PortableRawWriterEx extends PortableRawWriter, AutoCloseable {
+ /**
+ * @param obj Object to write.
+ * @throws org.apache.ignite.portables.PortableException In case of error.
+ */
+ public void writeObjectDetached(@Nullable Object obj) throws PortableException;
+
+ /**
+ * @return Output stream.
+ */
+ public GridPortableOutputStream out();
+
+ /**
+ * Cleans resources.
+ */
+ @Override public void close();
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
index aabd175..b25fcbd 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
@@ -296,7 +296,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
/** {@inheritDoc} */
@Override void checkValue(Object val) {
- GridPortableObject obj = (GridPortableObject)val;
+ PortableObject obj = (PortableObject)val;
assertEquals(expVal, obj.field("val"));
}
@@ -377,7 +377,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
/** {@inheritDoc} */
@Override void checkValue(Object val) {
- GridPortableObject obj = (GridPortableObject)val;
+ PortableObject obj = (PortableObject)val;
assertEquals(expVal, obj.field("val"));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
index 299a2a3..1f81b42 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
@@ -187,8 +187,8 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
GridCacheProjection prj;
if (portableEnabled()) {
- prj = cache.projection(new IgnitePredicate<GridCacheEntry<GridPortableObject, GridPortableObject>>() {
- @Override public boolean apply(GridCacheEntry<GridPortableObject, GridPortableObject> e) {
+ prj = cache.projection(new IgnitePredicate<GridCacheEntry<PortableObject, PortableObject>>() {
+ @Override public boolean apply(GridCacheEntry<PortableObject, PortableObject> e) {
Key key = e.getKey().deserialize();
Person val = e.peek().deserialize();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1515c5aa/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
index 3e6b207..8f6bdcf 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
@@ -58,7 +58,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
PortableConfiguration portableCfg = new PortableConfiguration();
portableCfg.setTypeConfigurations(Arrays.asList(
- new GridPortableTypeConfiguration(TestObject.class.getName())));
+ new PortableTypeConfiguration(TestObject.class.getName())));
cfg.setPortableConfiguration(portableCfg);
}
@@ -283,12 +283,12 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws PortableException {
+ @Override public void writePortable(PortableWriter writer) throws PortableException {
writer.writeInt("val", val);
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws PortableException {
+ @Override public void readPortable(PortableReader reader) throws PortableException {
val = reader.readInt("val");
}
}