#ignite-758: IgniteInternalCache.setSkipStore returns IgniteInternalCache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5e77bb2e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e77bb2e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e77bb2e Branch: refs/heads/ignite-646 Commit: 5e77bb2eb6677f86b01f09e6d670095c69aea1d0 Parents: 337c531 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 17 12:36:56 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Apr 17 12:36:56 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/IgniteInternalCache.java | 8 ++++---- .../rest/handlers/cache/GridCacheCommandHandler.java | 2 +- .../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e77bb2e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java index e16af22..31b3b12 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java @@ -210,7 +210,7 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> { * @param skipStore Skip store flag. * @return New projection based on this one, but with skip store flag enabled. */ - public GridCacheProxyImpl<K, V> setSkipStore(boolean skipStore); + public IgniteInternalCache<K, V> setSkipStore(boolean skipStore); /** * Creates projection that will operate with portable objects. @@ -249,7 +249,7 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> { * * @return Projection for portable objects. */ - public <K1, V1> GridCacheProxyImpl<K1, V1> keepPortable(); + public <K1, V1> IgniteInternalCache<K1, V1> keepPortable(); /** * Returns {@code true} if this map contains no key-value mappings. @@ -1505,7 +1505,7 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> { * @param subjId Client ID. * @return Internal projection. */ - GridCacheProxyImpl<K, V> forSubjectId(UUID subjId); + IgniteInternalCache<K, V> forSubjectId(UUID subjId); /** * Store DR data. * @@ -1699,7 +1699,7 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> { * @param plc {@link ExpiryPolicy} to associate with this projection. * @return New projection based on this one, but with the specified expiry policy. */ - public GridCacheProxyImpl<K, V> withExpiryPolicy(ExpiryPolicy plc); + public IgniteInternalCache<K, V> withExpiryPolicy(ExpiryPolicy plc); /** * @param key Key. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e77bb2e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java index c28c876..a745036 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java @@ -523,7 +523,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { * @throws IgniteCheckedException If cache not found. */ protected IgniteInternalCache<Object, Object> localCache(String cacheName) throws IgniteCheckedException { - IgniteInternalCache<Object, Object> cache = (IgniteInternalCache<Object, Object>)ctx.cache().cache(cacheName); + IgniteInternalCache<Object, Object> cache = ctx.cache().cache(cacheName); if (cache == null) throw new IgniteCheckedException( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e77bb2e/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index e6219dc..d4c38b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -78,7 +78,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testCacheGetFailsSyncNotify() throws Exception { - GridRestCommandHandler hnd = new TestableCacheCommandHandler(((IgniteKernal)grid()).context(), "getAsync"); + GridRestCommandHandler hnd = new TestableCacheCommandHandler(grid().context(), "getAsync"); GridRestCacheRequest req = new GridRestCacheRequest();
