#ignite-758: rename InternalCache to 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/228736f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/228736f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/228736f5 Branch: refs/heads/ignite-758 Commit: 228736f53f99737384fb354879a4455989136604 Parents: 9b0a8ac Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 16 16:25:16 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 16 16:25:16 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgniteEx.java | 10 +- .../apache/ignite/internal/IgniteKernal.java | 10 +- .../internal/managers/GridManagerAdapter.java | 2 +- .../processors/cache/CacheLockImpl.java | 4 +- .../cache/CacheProjectionContext.java | 8 +- .../processors/cache/GridCacheAdapter.java | 14 +- .../processors/cache/GridCacheProcessor.java | 14 +- .../processors/cache/GridCacheProxyImpl.java | 10 +- .../processors/cache/GridCacheUtils.java | 6 +- .../processors/cache/IgniteCacheProxy.java | 10 +- .../processors/cache/IgniteInternalCache.java | 1860 ++++++++++++++++++ .../processors/cache/InternalCache.java | 1860 ------------------ .../CacheDataStructuresManager.java | 8 +- .../cache/query/GridCacheQueryManager.java | 12 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../datastructures/DataStructuresProcessor.java | 24 +- .../datastructures/GridCacheAtomicLongImpl.java | 4 +- .../GridCacheAtomicReferenceImpl.java | 4 +- .../GridCacheAtomicSequenceImpl.java | 4 +- .../GridCacheAtomicStampedImpl.java | 6 +- .../GridCacheCountDownLatchImpl.java | 4 +- .../datastructures/GridCacheSetImpl.java | 2 +- .../processors/igfs/IgfsDataManager.java | 4 +- .../processors/igfs/IgfsMetaManager.java | 8 +- .../handlers/cache/GridCacheCommandHandler.java | 60 +- .../service/GridServiceProcessor.java | 2 +- .../processors/task/GridTaskProcessor.java | 6 +- .../visor/cache/VisorCacheMetadataTask.java | 2 +- .../internal/visor/cache/VisorCacheMetrics.java | 2 +- .../visor/cache/VisorCacheRebalanceTask.java | 2 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../ignite/startup/BasicWarmupClosure.java | 20 +- .../internal/GridInternalCacheRemoveTest.java | 41 - .../internal/IgniteInternalCacheRemoveTest.java | 41 + .../dht/IgniteCacheMultiTxLockSelfTest.java | 2 +- .../processors/igfs/IgfsSizeSelfTest.java | 2 +- .../cache/GridCacheCommandHandlerSelfTest.java | 8 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../hadoop/jobtracker/HadoopJobTracker.java | 14 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 8 +- .../HibernateAccessStrategyAdapter.java | 10 +- .../hibernate/HibernateCollectionRegion.java | 2 +- .../cache/hibernate/HibernateEntityRegion.java | 2 +- .../hibernate/HibernateGeneralDataRegion.java | 2 +- .../hibernate/HibernateNaturalIdRegion.java | 2 +- .../HibernateNonStrictAccessStrategy.java | 4 +- .../hibernate/HibernateQueryResultsRegion.java | 2 +- .../HibernateReadOnlyAccessStrategy.java | 2 +- .../HibernateReadWriteAccessStrategy.java | 2 +- .../ignite/cache/hibernate/HibernateRegion.java | 4 +- .../cache/hibernate/HibernateRegionFactory.java | 10 +- .../hibernate/HibernateTimestampsRegion.java | 2 +- .../HibernateTransactionalAccessStrategy.java | 4 +- .../HibernateTransactionalDataRegion.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- 56 files changed, 2079 insertions(+), 2079 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java index d6ce020..3bb2ec4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java @@ -36,7 +36,7 @@ public interface IgniteEx extends Ignite { * * @return Utility cache. */ - public <K extends GridCacheUtilityKey, V> InternalCache<K, V> utilityCache(); + public <K extends GridCacheUtilityKey, V> IgniteInternalCache<K, V> utilityCache(); /** * Gets the cache instance for the given name if one is configured or @@ -47,17 +47,17 @@ public interface IgniteEx extends Ignite { * @param name Cache name. * @return Cache instance for given name or <tt>null</tt> if one does not exist. */ - @Nullable public <K, V> InternalCache<K, V> cachex(@Nullable String name); + @Nullable public <K, V> IgniteInternalCache<K, V> cachex(@Nullable String name); /** * Gets default cache instance if one is configured or <tt>null</tt> otherwise returning even non-public caches. - * The {@link org.apache.ignite.internal.processors.cache.InternalCache#name()} method on default instance returns <tt>null</tt>. + * The {@link org.apache.ignite.internal.processors.cache.IgniteInternalCache#name()} method on default instance returns <tt>null</tt>. * * @param <K> Key type. * @param <V> Value type. * @return Default cache instance. */ - @Nullable public <K, V> InternalCache<K, V> cachex(); + @Nullable public <K, V> IgniteInternalCache<K, V> cachex(); /** * Gets configured cache instance that satisfy all provided predicates including non-public caches. If no @@ -66,7 +66,7 @@ public interface IgniteEx extends Ignite { * @param p Predicates. If none provided - all configured caches will be returned. * @return Configured cache instances that satisfy all provided predicates. */ - public Collection<InternalCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super InternalCache<?, ?>>... p); + public Collection<IgniteInternalCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super IgniteInternalCache<?, ?>>... p); /** * Checks if the event type is user-recordable. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 0238345..7694835 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -2222,7 +2222,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { * @param name Cache name. * @return Cache. */ - public <K, V> InternalCache<K, V> getCache(@Nullable String name) { + public <K, V> IgniteInternalCache<K, V> getCache(@Nullable String name) { guard(); try { @@ -2456,7 +2456,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public <K extends GridCacheUtilityKey, V> InternalCache<K, V> utilityCache() { + @Override public <K extends GridCacheUtilityKey, V> IgniteInternalCache<K, V> utilityCache() { guard(); try { @@ -2468,7 +2468,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public <K, V> InternalCache<K, V> cachex(@Nullable String name) { + @Override public <K, V> IgniteInternalCache<K, V> cachex(@Nullable String name) { guard(); try { @@ -2480,7 +2480,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public <K, V> InternalCache<K, V> cachex() { + @Override public <K, V> IgniteInternalCache<K, V> cachex() { guard(); try { @@ -2492,7 +2492,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public Collection<InternalCache<?, ?>> cachesx(IgnitePredicate<? super InternalCache<?, ?>>[] p) { + @Override public Collection<IgniteInternalCache<?, ?>> cachesx(IgnitePredicate<? super IgniteInternalCache<?, ?>>[] p) { guard(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java index 1d36da8..e837c39 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java @@ -512,7 +512,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan @Nullable @Override public <V> V readValueFromOffheapAndSwap(@Nullable String spaceName, Object key, @Nullable ClassLoader ldr) { try { - InternalCache<Object, V> cache = ctx.cache().cache(spaceName); + IgniteInternalCache<Object, V> cache = ctx.cache().cache(spaceName); GridCacheContext cctx = ((GridCacheProxyImpl)cache).context(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java index b06aee5..b22befb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java @@ -35,7 +35,7 @@ class CacheLockImpl<K, V> implements Lock { private final GridCacheGateway<K, V> gate; /** */ - private final InternalCache<K, V> delegate; + private final IgniteInternalCache<K, V> delegate; /** Projection. */ private final CacheProjectionContext prj; @@ -55,7 +55,7 @@ class CacheLockImpl<K, V> implements Lock { * @param prj Projection. * @param keys Keys. */ - CacheLockImpl(GridCacheGateway<K, V> gate, InternalCache<K, V> delegate, CacheProjectionContext prj, + CacheLockImpl(GridCacheGateway<K, V> gate, IgniteInternalCache<K, V> delegate, CacheProjectionContext prj, Collection<? extends K> keys) { this.gate = gate; this.delegate = delegate; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java index 86ab204..7d355a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java @@ -80,7 +80,7 @@ public class CacheProjectionContext implements Serializable { } /** - * See {@link InternalCache#keepPortable()}. + * See {@link IgniteInternalCache#keepPortable()}. * * @return New instance of CacheProjectionContext with keep portable flag. */ @@ -102,7 +102,7 @@ public class CacheProjectionContext implements Serializable { } /** - * See {@link InternalCache#forSubjectId(UUID)}. + * See {@link IgniteInternalCache#forSubjectId(UUID)}. * * @return New instance of CacheProjectionContext with specific subject id. */ @@ -122,7 +122,7 @@ public class CacheProjectionContext implements Serializable { } /** - * See {@link InternalCache#setSkipStore(boolean)}. + * See {@link IgniteInternalCache#setSkipStore(boolean)}. * * @return New instance of CacheProjectionContext with skip store flag. */ @@ -142,7 +142,7 @@ public class CacheProjectionContext implements Serializable { } /** - * See {@link InternalCache#withExpiryPolicy(ExpiryPolicy)}. + * See {@link IgniteInternalCache#withExpiryPolicy(ExpiryPolicy)}. * * @param plc {@link ExpiryPolicy} to associate with this projection. * @return New instance of CacheProjectionContext with skip store flag. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 e38e83b..6f14351 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 @@ -71,7 +71,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.*; * Adapter for different cache implementations. */ @SuppressWarnings("unchecked") -public abstract class GridCacheAdapter<K, V> implements InternalCache<K, V>, Externalizable { +public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -371,8 +371,8 @@ public abstract class GridCacheAdapter<K, V> implements InternalCache<K, V>, Ext /** {@inheritDoc} */ @SuppressWarnings({"unchecked", "RedundantCast"}) - @Override public <K1, V1> InternalCache<K1, V1> cache() { - return (InternalCache<K1, V1>)this; + @Override public <K1, V1> IgniteInternalCache<K1, V1> cache() { + return (IgniteInternalCache<K1, V1>)this; } /** {@inheritDoc} */ @@ -3225,7 +3225,7 @@ public abstract class GridCacheAdapter<K, V> implements InternalCache<K, V>, Ext // Delegate to near if dht. if (e.isDht() && CU.isNearEnabled(ctx)) { - InternalCache<K, V> near = ctx.isDht() ? ctx.dht().near() : ctx.near(); + IgniteInternalCache<K, V> near = ctx.isDht() ? ctx.dht().near() : ctx.near(); return near.isLockedByThread(key) || e.lockedByThread(); } @@ -5042,7 +5042,7 @@ public abstract class GridCacheAdapter<K, V> implements InternalCache<K, V>, Ext /** {@inheritDoc} */ @Override public Integer applyx(Object o) throws IgniteCheckedException { - InternalCache<Object, Object> cache = ((IgniteEx)ignite).cachex(cacheName); + IgniteInternalCache<Object, Object> cache = ((IgniteEx)ignite).cachex(cacheName); assert cache != null : cacheName; @@ -5079,7 +5079,7 @@ public abstract class GridCacheAdapter<K, V> implements InternalCache<K, V>, Ext } /** - * Internal callable which performs {@link InternalCache#size()} or {@link InternalCache#primarySize()} + * Internal callable which performs {@link IgniteInternalCache#size()} or {@link IgniteInternalCache#primarySize()} * operation on a cache with the given name. */ @GridInternal @@ -5115,7 +5115,7 @@ public abstract class GridCacheAdapter<K, V> implements InternalCache<K, V>, Ext /** {@inheritDoc} */ @Override public Integer apply(Object o) { - InternalCache<Object, Object> cache = ((IgniteEx)ignite).cachex(cacheName); + IgniteInternalCache<Object, Object> cache = ((IgniteEx)ignite).cachex(cacheName); return primaryOnly ? cache.primarySize() : cache.size(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index d8c9517..9b064ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2429,7 +2429,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @param <V> type of values. * @return Default cache. */ - public <K, V> InternalCache<K, V> cache() { + public <K, V> IgniteInternalCache<K, V> cache() { return cache(null); } @@ -2440,7 +2440,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @return Cache instance for given name. */ @SuppressWarnings("unchecked") - public <K, V> InternalCache<K, V> cache(@Nullable String name) { + public <K, V> IgniteInternalCache<K, V> cache(@Nullable String name) { if (log.isDebugEnabled()) log.debug("Getting cache for name: " + name); @@ -2452,9 +2452,9 @@ public class GridCacheProcessor extends GridProcessorAdapter { /** * @return All configured cache instances. */ - public Collection<InternalCache<?, ?>> caches() { - return F.viewReadOnly(jCacheProxies.values(), new IgniteClosure<IgniteCacheProxy<?, ?>, InternalCache<?, ?>>() { - @Override public InternalCache<?, ?> apply(IgniteCacheProxy<?, ?> entries) { + public Collection<IgniteInternalCache<?, ?>> caches() { + return F.viewReadOnly(jCacheProxies.values(), new IgniteClosure<IgniteCacheProxy<?, ?>, IgniteInternalCache<?, ?>>() { + @Override public IgniteInternalCache<?, ?> apply(IgniteCacheProxy<?, ?> entries) { return entries.legacyProxy(); } }); @@ -2488,7 +2488,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * * @return Utility cache for atomic data structures. */ - public <K, V> InternalCache<K, V> atomicsCache() { + public <K, V> IgniteInternalCache<K, V> atomicsCache() { return cache(CU.ATOMICS_CACHE_NAME); } @@ -2499,7 +2499,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @return Cache instance for given name. */ @SuppressWarnings("unchecked") - public <K, V> InternalCache<K, V> publicCache(@Nullable String name) { + public <K, V> IgniteInternalCache<K, V> publicCache(@Nullable String name) { if (log.isDebugEnabled()) log.debug("Getting public cache for name: " + name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 310bf6e..ab237bf 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 @@ -43,7 +43,7 @@ import java.util.*; /** * Cache proxy. */ -public class GridCacheProxyImpl<K, V> implements InternalCache<K, V>, Externalizable { +public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -59,7 +59,7 @@ public class GridCacheProxyImpl<K, V> implements InternalCache<K, V>, Externaliz /** Delegate object. */ @GridToStringExclude - private InternalCache<K, V> delegate; + private IgniteInternalCache<K, V> delegate; /** Projection. */ @GridToStringExclude @@ -83,7 +83,7 @@ public class GridCacheProxyImpl<K, V> implements InternalCache<K, V>, Externaliz * @param delegate Delegate object. * @param prj Optional projection which will be passed to gateway. */ - public GridCacheProxyImpl(GridCacheContext<K, V> ctx, InternalCache<K, V> delegate, + public GridCacheProxyImpl(GridCacheContext<K, V> ctx, IgniteInternalCache<K, V> delegate, @Nullable CacheProjectionContext prj) { assert ctx != null; assert delegate != null; @@ -109,7 +109,7 @@ public class GridCacheProxyImpl<K, V> implements InternalCache<K, V>, Externaliz /** * @return Proxy delegate. */ - public InternalCache<K, V> delegate() { + public IgniteInternalCache<K, V> delegate() { return delegate; } @@ -126,7 +126,7 @@ public class GridCacheProxyImpl<K, V> implements InternalCache<K, V>, Externaliz } /** {@inheritDoc} */ - @Override public <K1, V1> InternalCache<K1, V1> cache() { + @Override public <K1, V1> IgniteInternalCache<K1, V1> cache() { return cache.cache(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index fb06eee..9bc7574 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -1159,7 +1159,7 @@ public class GridCacheUtils { * @param isolation Isolation. * @return New transaction. */ - public static IgniteInternalTx txStartInternal(GridCacheContext ctx, InternalCache prj, + public static IgniteInternalTx txStartInternal(GridCacheContext ctx, IgniteInternalCache prj, TransactionConcurrency concurrency, TransactionIsolation isolation) { assert ctx != null; assert prj != null; @@ -1595,8 +1595,8 @@ public class GridCacheUtils { * @param clo Closure. * @throws IgniteCheckedException If failed. */ - public static <K, V> void inTx(InternalCache<K, V> cache, TransactionConcurrency concurrency, - TransactionIsolation isolation, IgniteInClosureX<InternalCache<K ,V>> clo) throws IgniteCheckedException { + public static <K, V> void inTx(IgniteInternalCache<K, V> cache, TransactionConcurrency concurrency, + TransactionIsolation isolation, IgniteInClosureX<IgniteInternalCache<K ,V>> clo) throws IgniteCheckedException { try (IgniteInternalTx tx = cache.txStartEx(concurrency, isolation);) { clo.applyx(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index eb027c0..7fa0a51 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -69,7 +69,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V /** Delegate. */ @GridToStringInclude - private InternalCache<K, V> delegate; + private IgniteInternalCache<K, V> delegate; /** Projection. */ private CacheProjectionContext prjCtx; @@ -97,7 +97,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V */ public IgniteCacheProxy( GridCacheContext<K, V> ctx, - InternalCache<K, V> delegate, + IgniteInternalCache<K, V> delegate, CacheProjectionContext prjCtx, boolean async ) { @@ -1326,7 +1326,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V /** * */ - public InternalCache delegate() { + public IgniteInternalCache delegate() { return delegate; } @@ -1402,7 +1402,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V * </ul> <p> For example, if you use {@link Integer} as a key and {@code Value} class as a value (which will be * stored in portable format), you should acquire following projection to avoid deserialization: * <pre> - * InternalCache<Integer, GridPortableObject> prj = cache.keepPortable(); + * IgniteInternalCache<Integer, GridPortableObject> prj = cache.keepPortable(); * * // Value is not deserialized and returned in portable format. * GridPortableObject po = prj.get(1); @@ -1498,7 +1498,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { ctx = (GridCacheContext<K, V>)in.readObject(); - delegate = (InternalCache<K, V>)in.readObject(); + delegate = (IgniteInternalCache<K, V>)in.readObject(); prjCtx = (CacheProjectionContext)in.readObject();
