ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [40/50] [abbrv] incubator-ignite git commit: #ignite-683: Revert renaming replace methods in GridCacheProjectionEx.
Date Tue, 14 Apr 2015 14:25:56 GMT
#ignite-683: Revert renaming replace methods in GridCacheProjectionEx.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b3d371c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b3d371c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b3d371c2

Branch: refs/heads/ignite-218
Commit: b3d371c28ffaebec123df57d4239d1d91bebbe9a
Parents: b026f2c
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Apr 13 15:01:13 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Apr 13 15:01:13 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheAdapter.java   | 4 ++--
 .../internal/processors/cache/GridCacheProjectionEx.java     | 4 ++--
 .../internal/processors/cache/GridCacheProjectionImpl.java   | 8 ++++----
 .../ignite/internal/processors/cache/GridCacheProxyImpl.java | 8 ++++----
 .../cache/distributed/dht/atomic/GridDhtAtomicCache.java     | 6 +++---
 .../cache/distributed/near/GridNearAtomicCache.java          | 8 ++++----
 .../processors/cache/local/atomic/GridLocalAtomicCache.java  | 4 ++--
 7 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3d371c2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 1aee044..0a11f50 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2944,7 +2944,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheReturn replace(final K key, final V oldVal, final V newVal)
+    @Override public GridCacheReturn replacex(final K key, final V oldVal, final V newVal)
         throws IgniteCheckedException
     {
         A.notNull(key, "key", oldVal, "oldVal", newVal, "newVal");
@@ -3006,7 +3006,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<GridCacheReturn> replaceAsync(final K key,
final V oldVal, final V newVal)
+    @Override public IgniteInternalFuture<GridCacheReturn> replacexAsync(final K key,
final V oldVal, final V newVal)
     {
         A.notNull(key, "key", oldVal, "oldVal", newVal, "newVal");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3d371c2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
index fe8b78b..d7db04e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
@@ -95,7 +95,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K,
V> {
      *      flag.
      * @throws NullPointerException If either key or value are {@code null}.
      */
-    public IgniteInternalFuture<GridCacheReturn> replaceAsync(K key, V oldVal, V newVal);
+    public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal, V newVal);
 
     /**
      * Stores given key-value pair in cache only if only if the previous value is equal to
the
@@ -116,7 +116,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K,
V> {
      * @throws NullPointerException If either key or value are {@code null}.
      * @throws IgniteCheckedException If replace operation failed.
      */
-    public GridCacheReturn replace(K key, V oldVal, V newVal) throws IgniteCheckedException;
+    public GridCacheReturn replacex(K key, V oldVal, V newVal) throws IgniteCheckedException;
 
     /**
      * Removes given key mapping from cache if one exists and value is equal to the passed
in value.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3d371c2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index 29b0506..b3f5562 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -586,15 +586,15 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K,
V
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<GridCacheReturn> replaceAsync(K key, V oldVal,
V newVal) {
+    @Override public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal,
V newVal) {
         A.notNull(key, "key", oldVal, "oldVal", newVal, "newVal");
 
-        return cache.replaceAsync(key, oldVal, newVal);
+        return cache.replacexAsync(key, oldVal, newVal);
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheReturn replace(K key, V oldVal, V newVal) throws IgniteCheckedException
{
-        return replaceAsync(key, oldVal, newVal).get();
+    @Override public GridCacheReturn replacex(K key, V oldVal, V newVal) throws IgniteCheckedException
{
+        return replacexAsync(key, oldVal, newVal).get();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3d371c2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index e629a94..f388d98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -1160,11 +1160,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K,
V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<GridCacheReturn> replaceAsync(K key, V oldVal,
V newVal) {
+    @Override public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal,
V newVal) {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            return delegate.replaceAsync(key, oldVal, newVal);
+            return delegate.replacexAsync(key, oldVal, newVal);
         }
         finally {
             gate.leave(prev);
@@ -1172,11 +1172,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K,
V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheReturn replace(K key, V oldVal, V newVal) throws IgniteCheckedException
{
+    @Override public GridCacheReturn replacex(K key, V oldVal, V newVal) throws IgniteCheckedException
{
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            return delegate.replace(key, oldVal, newVal);
+            return delegate.replacex(key, oldVal, newVal);
         }
         finally {
             gate.leave(prev);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3d371c2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 7e67032..786900e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -412,8 +412,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheReturn replace(K key, V oldVal, V newVal) throws IgniteCheckedException
{
-        return replaceAsync(key, oldVal, newVal).get();
+    @Override public GridCacheReturn replacex(K key, V oldVal, V newVal) throws IgniteCheckedException
{
+        return replacexAsync(key, oldVal, newVal).get();
     }
 
     /** {@inheritDoc} */
@@ -426,7 +426,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<GridCacheReturn> replaceAsync(K key, V oldVal,
V newVal) {
+    @Override public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal,
V newVal) {
         return updateAllAsync0(F.asMap(key, newVal),
             null,
             null,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3d371c2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index e650f77..9356af1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -465,8 +465,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheReturn replace(K key, V oldVal, V newVal) throws IgniteCheckedException
{
-        return dht.replace(key, oldVal, newVal);
+    @Override public GridCacheReturn replacex(K key, V oldVal, V newVal) throws IgniteCheckedException
{
+        return dht.replacex(key, oldVal, newVal);
     }
 
     /** {@inheritDoc} */
@@ -477,8 +477,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<GridCacheReturn> replaceAsync(K key, V oldVal,
V newVal) {
-        return dht.replaceAsync(key, oldVal, newVal);
+    @Override public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal,
V newVal) {
+        return dht.replacexAsync(key, oldVal, newVal);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3d371c2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 6a0a219..bdbdb27 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -211,7 +211,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public GridCacheReturn replace(K key, V oldVal, V newVal) throws IgniteCheckedException
{
+    @Override public GridCacheReturn replacex(K key, V oldVal, V newVal) throws IgniteCheckedException
{
         A.notNull(key, "key", oldVal, "oldVal", newVal, "newVal");
 
         return (GridCacheReturn)updateAllInternal(UPDATE,
@@ -251,7 +251,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<GridCacheReturn> replaceAsync(K key, V oldVal,
V newVal) {
+    @Override public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal,
V newVal) {
         A.notNull(key, "key", oldVal, "oldVal", newVal, "newVal");
 
         return updateAllAsync0(F.asMap(key, newVal),


Mime
View raw message