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:30 UTC
[03/38] incubator-ignite git commit: # Renaming
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a228c7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
index 4653e85..b599a48 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -257,7 +257,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
res.setResponse(taskRestRes);
fut.onDone(res);
}
- catch (GridPortableException e) {
+ catch (PortableException e) {
fut.onDone(new GridException("Failed to marshal task result: " +
desc.result(), e));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a228c7d6/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 57c3b43..299e9f9 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
@@ -37,7 +37,7 @@ import java.io.*;
* specifying {@link #setUserObject(Object) userObject} as well, which can be used
* to pass in any additional information required for authentication.
*/
-public class GridSecurityCredentials implements Externalizable, GridPortableMarshalAware {
+public class GridSecurityCredentials implements Externalizable, PortableMarshalAware {
/** */
private static final long serialVersionUID = -2655741071578326256L;
@@ -176,14 +176,14 @@ public class GridSecurityCredentials implements Externalizable, GridPortableMars
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws GridPortableException {
+ @Override public void writePortable(GridPortableWriter writer) throws PortableException {
writer.rawWriter().writeObject(login);
writer.rawWriter().writeObject(password);
writer.rawWriter().writeObject(userObj);
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws GridPortableException {
+ @Override public void readPortable(GridPortableReader 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/a228c7d6/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
index a7ea04f..2367147 100644
--- 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
@@ -18,7 +18,7 @@ import org.jetbrains.annotations.*;
public interface GridPortableRawReaderEx extends GridPortableRawReader {
/**
* @return Object.
- * @throws org.apache.ignite.portables.GridPortableException In case of error.
+ * @throws org.apache.ignite.portables.PortableException In case of error.
*/
- @Nullable public Object readObjectDetached() throws GridPortableException;
+ @Nullable public Object readObjectDetached() throws PortableException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a228c7d6/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
index 18e761b..7e8dd85 100644
--- 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
@@ -19,9 +19,9 @@ import org.jetbrains.annotations.*;
public interface GridPortableRawWriterEx extends GridPortableRawWriter, AutoCloseable {
/**
* @param obj Object to write.
- * @throws org.apache.ignite.portables.GridPortableException In case of error.
+ * @throws org.apache.ignite.portables.PortableException In case of error.
*/
- public void writeObjectDetached(@Nullable Object obj) throws GridPortableException;
+ public void writeObjectDetached(@Nullable Object obj) throws PortableException;
/**
* @return Output stream.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a228c7d6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
index 0520d9a..b259529 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
@@ -51,7 +51,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb
IgniteConfiguration cfg = super.getConfiguration(gridName);
if (portableEnabled()) {
- GridPortableConfiguration pCfg = new GridPortableConfiguration();
+ PortableConfiguration pCfg = new PortableConfiguration();
pCfg.setClassNames(Arrays.asList(TestValue.class.getName()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a228c7d6/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 9dbfbb5..aabd175 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
@@ -55,7 +55,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
IgniteConfiguration cfg = super.getConfiguration(gridName);
if (portableEnabled()) {
- GridPortableConfiguration pCfg = new GridPortableConfiguration();
+ PortableConfiguration pCfg = new PortableConfiguration();
pCfg.setClassNames(Arrays.asList(TestValue.class.getName()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a228c7d6/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 8bccf2e..299a2a3 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
@@ -62,7 +62,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
cacheConfiguration(TRANSACTIONAL_CACHE_NAME, TRANSACTIONAL));
if (portableEnabled()) {
- GridPortableConfiguration pCfg = new GridPortableConfiguration();
+ PortableConfiguration pCfg = new PortableConfiguration();
pCfg.setClassNames(Arrays.asList(Key.class.getName(), Person.class.getName()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a228c7d6/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 03ae4d0..3e6b207 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
@@ -55,7 +55,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
if (portables) {
- GridPortableConfiguration portableCfg = new GridPortableConfiguration();
+ PortableConfiguration portableCfg = new PortableConfiguration();
portableCfg.setTypeConfigurations(Arrays.asList(
new GridPortableTypeConfiguration(TestObject.class.getName())));
@@ -251,7 +251,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
/**
*
*/
- private static class TestObject implements GridPortableMarshalAware, Serializable {
+ private static class TestObject implements PortableMarshalAware, Serializable {
/** */
private int val;
@@ -283,12 +283,12 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void writePortable(GridPortableWriter writer) throws GridPortableException {
+ @Override public void writePortable(GridPortableWriter writer) throws PortableException {
writer.writeInt("val", val);
}
/** {@inheritDoc} */
- @Override public void readPortable(GridPortableReader reader) throws GridPortableException {
+ @Override public void readPortable(GridPortableReader reader) throws PortableException {
val = reader.readInt("val");
}
}