ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [32/51] [abbrv] incubator-ignite git commit: #ignite-758: Small refactoring.
Date Mon, 20 Apr 2015 16:18:16 GMT
#ignite-758: Small refactoring.


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

Branch: refs/heads/ignite-446
Commit: 1cd81b35d29d289b144bb412723c16bb1d78cadd
Parents: d50b6f0
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Apr 17 13:33:58 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Apr 17 13:33:58 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/internal/IgniteEx.java    |   2 +-
 .../processors/cache/CacheLockImpl.java         |  18 +--
 .../processors/cache/CacheOperationContext.java |   6 +-
 .../processors/cache/GridCacheAdapter.java      |   4 +-
 .../processors/cache/GridCacheContext.java      |  14 +-
 .../processors/cache/GridCacheGateway.java      |   2 +-
 .../processors/cache/IgniteCacheProxy.java      | 149 +++++++++----------
 .../processors/cache/IgniteInternalCache.java   |   6 +-
 .../cache/query/GridCacheQueryManager.java      |   1 -
 .../datastreamer/DataStreamerCacheUpdaters.java |   2 +-
 .../GridCacheAtomicStampedImpl.java             |   2 +-
 .../processors/igfs/IgfsDataManager.java        |   2 +-
 .../handlers/cache/GridCacheCommandHandler.java |   4 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |  12 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |   2 +-
 .../processors/igfs/IgfsStreamsSelfTest.java    |   2 +-
 .../cache/hibernate/HibernateRegionFactory.java |   2 +-
 .../HibernateTransactionalAccessStrategy.java   |   2 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |   2 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |   2 +-
 20 files changed, 113 insertions(+), 123 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/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 3bb2ec4..4845d51 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
@@ -51,7 +51,7 @@ public interface IgniteEx extends Ignite {
 
     /**
      * 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.IgniteInternalCache#name()} method on default instance returns <tt>null</tt>.
+     * The {@link IgniteInternalCache#name()} method on default instance returns <tt>null</tt>.
      *
      * @param <K> Key type.
      * @param <V> Value type.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/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 0090640..718cba4 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
@@ -37,8 +37,8 @@ class CacheLockImpl<K, V> implements Lock {
     /** */
     private final IgniteInternalCache<K, V> delegate;
 
-    /** Projection. */
-    private final CacheOperationContext prj;
+    /** Operation context. */
+    private final CacheOperationContext opCtx;
 
     /** */
     private final Collection<? extends K> keys;
@@ -52,20 +52,20 @@ class CacheLockImpl<K, V> implements Lock {
     /**
      * @param gate Gate.
      * @param delegate Delegate.
-     * @param prj Projection.
+     * @param opCtx Operation context.
      * @param keys Keys.
      */
-    CacheLockImpl(GridCacheGateway<K, V> gate, IgniteInternalCache<K, V> delegate, CacheOperationContext prj,
+    CacheLockImpl(GridCacheGateway<K, V> gate, IgniteInternalCache<K, V> delegate, CacheOperationContext opCtx,
         Collection<? extends K> keys) {
         this.gate = gate;
         this.delegate = delegate;
-        this.prj = prj;
+        this.opCtx = opCtx;
         this.keys = keys;
     }
 
     /** {@inheritDoc} */
     @Override public void lock() {
-        CacheOperationContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             delegate.lockAll(keys, 0);
@@ -98,7 +98,7 @@ class CacheLockImpl<K, V> implements Lock {
 
     /** {@inheritDoc} */
     @Override public boolean tryLock() {
-        CacheOperationContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             boolean res = delegate.lockAll(keys, -1);
@@ -124,7 +124,7 @@ class CacheLockImpl<K, V> implements Lock {
         if (time <= 0)
             return tryLock();
 
-        CacheOperationContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             IgniteInternalFuture<Boolean> fut = delegate.lockAllAsync(keys, unit.toMillis(time));
@@ -167,7 +167,7 @@ class CacheLockImpl<K, V> implements Lock {
 
     /** {@inheritDoc} */
     @Override public void unlock() {
-        CacheOperationContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             if (lockedThread != Thread.currentThread()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
index 764a058..3c64a50 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
@@ -39,10 +39,10 @@ public class CacheOperationContext implements Serializable {
     /** Client ID which operates over this projection, if any, */
     private final UUID subjId;
 
-    /** */
+    /** Keep portable flag. */
     private final boolean keepPortable;
 
-    /** */
+    /** Expiricy policy. */
     private final ExpiryPolicy expiryPlc;
 
     /**
@@ -110,6 +110,7 @@ public class CacheOperationContext implements Serializable {
     /**
      * See {@link IgniteInternalCache#forSubjectId(UUID)}.
      *
+     * @param subjId Subject id.
      * @return New instance of CacheOperationContext with specific subject id.
      */
     public CacheOperationContext forSubjectId(UUID subjId) {
@@ -130,6 +131,7 @@ public class CacheOperationContext implements Serializable {
     /**
      * See {@link IgniteInternalCache#setSkipStore(boolean)}.
      *
+     * @param skipStore Skip store flag.
      * @return New instance of CacheOperationContext with skip store flag.
      */
     public CacheOperationContext setSkipStore(boolean skipStore) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/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 dc9455a..a860503 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
@@ -4400,7 +4400,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
      */
     public final IgniteInternalFuture<V> getAsync(final K key, boolean deserializePortable) {
         try {
-         checkJta();
+            checkJta();
         }
         catch (IgniteCheckedException e) {
             return new GridFinishedFuture<>(e);
@@ -4447,7 +4447,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             taskName,
             deserializePortable,
             false);
-                }
+    }
 
     /**
      * @param entry Entry.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 382d599..a9988d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -158,7 +158,7 @@ public class GridCacheContext<K, V> implements Externalizable {
      * Thread local projection. If it's set it means that method call was initiated
      * by child projection of initial cache.
      */
-    private ThreadLocal<CacheOperationContext> prjPerCall = new ThreadLocal<>();
+    private ThreadLocal<CacheOperationContext> opCtxPerCall = new ThreadLocal<>();
 
     /** Cache name. */
     private String cacheName;
@@ -1207,18 +1207,18 @@ public class GridCacheContext<K, V> implements Externalizable {
      */
     public void operationContextPerCall(@Nullable CacheOperationContext opCtx) {
         if (nearContext())
-            dht().near().context().prjPerCall.set(opCtx);
+            dht().near().context().opCtxPerCall.set(opCtx);
         else
-            prjPerCall.set(opCtx);
+            opCtxPerCall.set(opCtx);
     }
 
     /**
-     * Gets thread local projection.
+     * Gets thread local cache operation context.
      *
      * @return Operation context per call.
      */
     public CacheOperationContext operationContextPerCall() {
-        return nearContext() ? dht().near().context().prjPerCall.get() : prjPerCall.get();
+        return nearContext() ? dht().near().context().opCtxPerCall.get() : opCtxPerCall.get();
     }
 
     /**
@@ -1258,9 +1258,9 @@ public class GridCacheContext<K, V> implements Externalizable {
         if (nearContext())
             return dht().near().context().skipStore();
 
-        CacheOperationContext prj = prjPerCall.get();
+        CacheOperationContext opCtx = opCtxPerCall.get();
 
-        return (prj != null && prj.skipStore());
+        return (opCtx != null && opCtx.skipStore());
     }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index a1c9dcd..b654afd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -165,7 +165,7 @@ public class GridCacheGateway<K, V> {
             // Unwind eviction notifications.
             CU.unwindEvicts(ctx);
 
-            // Return back previous thread local projection per call.
+            // Return back previous thread local operation context per call.
             ctx.operationContextPerCall(prev);
         }
         finally {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/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 3b28de7..64d19ba 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
@@ -71,8 +71,8 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     @GridToStringInclude
     private IgniteInternalCache<K, V> delegate;
 
-    /** Projection. */
-    private CacheOperationContext prjCtx;
+    /** Operation context. */
+    private CacheOperationContext opCtx;
 
     /** */
     @GridToStringExclude
@@ -92,13 +92,13 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /**
      * @param ctx Context.
      * @param delegate Delegate.
-     * @param prjCtx Projection.
+     * @param opCtx Operation context.
      * @param async Async support flag.
      */
     public IgniteCacheProxy(
         GridCacheContext<K, V> ctx,
         IgniteInternalCache<K, V> delegate,
-        CacheOperationContext prjCtx,
+        CacheOperationContext opCtx,
         boolean async
     ) {
         super(async);
@@ -108,10 +108,11 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
         this.ctx = ctx;
         this.delegate = delegate;
-        this.prjCtx = prjCtx == null ? new CacheOperationContext() : prjCtx;
+        this.opCtx = opCtx == null ? new CacheOperationContext() : opCtx;
 
         gate = ctx.gate();
-        legacyProxy = new GridCacheProxyImpl<>(ctx, delegate, prjCtx);
+
+        legacyProxy = new GridCacheProxyImpl<>(ctx, delegate, opCtx);
     }
 
     /**
@@ -130,7 +131,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public CacheMetrics metrics() {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             return ctx.cache().metrics();
@@ -142,7 +143,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public CacheMetrics metrics(ClusterGroup grp) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             List<CacheMetrics> metrics = new ArrayList<>(grp.nodes().size());
@@ -167,7 +168,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public CacheMetricsMXBean mxBean() {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             return ctx.cache().mxBean();
@@ -189,7 +190,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Nullable @Override public Entry<K, V> randomEntry() {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             return ctx.cache().randomEntry();
@@ -201,10 +202,10 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public IgniteCache<K, V> withExpiryPolicy(ExpiryPolicy plc) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
-            CacheOperationContext prj0 = prjCtx.withExpiryPolicy(plc);
+            CacheOperationContext prj0 = opCtx.withExpiryPolicy(plc);
 
             return new IgniteCacheProxy<>(ctx, delegate, prj0, isAsync());
         }
@@ -221,7 +222,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public void loadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync())
@@ -241,7 +242,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public void localLoadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync())
@@ -261,7 +262,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Nullable @Override public V getAndPutIfAbsent(K key, V val) throws CacheException {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -288,12 +289,12 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public Lock lockAll(final Collection<? extends K> keys) {
-        return new CacheLockImpl<>(gate, delegate, prjCtx, keys);
+        return new CacheLockImpl<>(gate, delegate, opCtx, keys);
     }
 
     /** {@inheritDoc} */
     @Override public boolean isLocalLocked(K key, boolean byCurrThread) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             return byCurrThread ? delegate.isLockedByThread(key) : delegate.isLocked(key);
@@ -316,8 +317,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
         if (filter instanceof ScanQuery) {
             IgniteBiPredicate<K, V> p = ((ScanQuery)filter).getFilter();
 
-            qry = ctx.queries().createScanQuery(p != null ? p : ACCEPT_ALL,
-                    prjCtx != null ? prjCtx.isKeepPortable() : false);
+            qry = ctx.queries().createScanQuery(p != null ? p : ACCEPT_ALL, opCtx.isKeepPortable());
 
             if (grp != null)
                 qry.projection(grp);
@@ -327,8 +327,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
         else if (filter instanceof TextQuery) {
             TextQuery p = (TextQuery)filter;
 
-            qry = ctx.queries().createFullTextQuery(p.getType(), p.getText(),
-                    prjCtx != null ? prjCtx.isKeepPortable() : false);
+            qry = ctx.queries().createFullTextQuery(p.getType(), p.getText(), opCtx.isKeepPortable());
 
             if (grp != null)
                 qry.projection(grp);
@@ -336,7 +335,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
             fut = qry.execute();
         }
         else if (filter instanceof SpiQuery) {
-            qry = ctx.queries().createSpiQuery(prjCtx != null ? prjCtx.isKeepPortable() : false);
+            qry = ctx.queries().createSpiQuery(opCtx.isKeepPortable());
 
             if (grp != null)
                 qry.projection(grp);
@@ -450,7 +449,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     @Override public <R> QueryCursor<R> query(Query<R> qry) {
         A.notNull(qry, "qry");
 
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             ctx.checkSecurity(SecurityPermission.CACHE_READ);
@@ -512,7 +511,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public Iterable<Entry<K, V>> localEntries(CachePeekMode... peekModes) throws CacheException {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             return delegate.localEntries(peekModes);
@@ -527,7 +526,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public QueryMetrics queryMetrics() {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             return delegate.context().queries().metrics();
@@ -539,7 +538,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public void localEvict(Collection<? extends K> keys) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             delegate.evictAll(keys);
@@ -551,7 +550,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Nullable @Override public V localPeek(K key, CachePeekMode... peekModes) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             return delegate.localPeek(key, peekModes, null);
@@ -567,7 +566,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public void localPromote(Set<? extends K> keys) throws CacheException {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 delegate.promoteAll(keys);
@@ -583,7 +582,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public int size(CachePeekMode... peekModes) throws CacheException {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             if (isAsync()) {
@@ -604,7 +603,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public int localSize(CachePeekMode... peekModes) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             return delegate.localSize(peekModes);
@@ -620,7 +619,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public V get(K key) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -643,7 +642,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public Map<K, V> getAll(Set<? extends K> keys) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -669,7 +668,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
      */
     public Map<K, V> getAll(Collection<? extends K> keys) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -696,7 +695,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
      * @return Entry set.
      */
     public Set<Entry<K, V>> entrySetx(CacheEntryPredicate... filter) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             return delegate.entrySetx(filter);
@@ -708,7 +707,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public boolean containsKey(K key) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             if (isAsync()) {
@@ -726,7 +725,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public boolean containsKeys(Set<? extends K> keys) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             if (isAsync()) {
@@ -748,7 +747,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
         boolean replaceExisting,
         @Nullable final CompletionListener completionLsnr
     ) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             IgniteInternalFuture<?> fut = ctx.cache().loadAll(keys, replaceExisting);
@@ -776,7 +775,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public void put(K key, V val) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync())
@@ -796,7 +795,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public V getAndPut(K key, V val) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -819,7 +818,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public void putAll(Map<? extends K, ? extends V> map) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync())
@@ -839,7 +838,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public boolean putIfAbsent(K key, V val) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -862,7 +861,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public boolean remove(K key) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -885,7 +884,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public boolean remove(K key, V oldVal) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -908,7 +907,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public V getAndRemove(K key) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -931,7 +930,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public boolean replace(K key, V oldVal, V newVal) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -954,7 +953,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public boolean replace(K key, V val) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -977,7 +976,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public V getAndReplace(K key, V val) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -1000,7 +999,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /** {@inheritDoc} */
     @Override public void removeAll(Set<? extends K> keys) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync())
@@ -1019,7 +1018,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public void removeAll() {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             if (isAsync())
@@ -1037,7 +1036,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public void clear(K key) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             if (isAsync())
@@ -1055,7 +1054,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public void clearAll(Set<? extends K> keys) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             if (isAsync())
@@ -1073,7 +1072,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public void clear() {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             if (isAsync())
@@ -1091,7 +1090,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public void localClear(K key) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             delegate.clearLocally(key);
@@ -1103,7 +1102,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public void localClearAll(Set<? extends K> keys) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             for (K key : keys)
@@ -1118,7 +1117,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     @Override public <T> T invoke(K key, EntryProcessor<K, V, T> entryProcessor, Object... args)
         throws EntryProcessorException {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -1156,7 +1155,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     @Override public <T> T invoke(K key, CacheEntryProcessor<K, V, T> entryProcessor, Object... args)
         throws EntryProcessorException {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -1195,7 +1194,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
                                                                    EntryProcessor<K, V, T> entryProcessor,
                                                                    Object... args) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -1220,7 +1219,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
         CacheEntryProcessor<K, V, T> entryProcessor,
         Object... args) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -1245,7 +1244,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
         Map<? extends K, ? extends EntryProcessor<K, V, T>> map,
         Object... args) {
         try {
-            CacheOperationContext prev = gate.enter(prjCtx);
+            CacheOperationContext prev = gate.enter(opCtx);
 
             try {
                 if (isAsync()) {
@@ -1337,7 +1336,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public void registerCacheEntryListener(CacheEntryListenerConfiguration<K, V> lsnrCfg) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             ctx.continuousQueries().executeJCacheQuery(lsnrCfg, false);
@@ -1352,7 +1351,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public void deregisterCacheEntryListener(CacheEntryListenerConfiguration<K, V> lsnrCfg) {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             ctx.continuousQueries().cancelJCacheQuery(lsnrCfg);
@@ -1367,7 +1366,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override public Iterator<Cache.Entry<K, V>> iterator() {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
             return ctx.cache().igniteIterator();
@@ -1379,7 +1378,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
     /** {@inheritDoc} */
     @Override protected IgniteCache<K, V> createAsyncInstance() {
-        return new IgniteCacheProxy<>(ctx, delegate, prjCtx, true);
+        return new IgniteCacheProxy<>(ctx, delegate, opCtx, true);
     }
 
     /**
@@ -1406,14 +1405,11 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
      * @return Projection for portable objects.
      */
     public <K1, V1> IgniteCache<K1, V1> keepPortable() {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
-            CacheOperationContext prj = new CacheOperationContext(
-                prjCtx != null ? prjCtx.skipStore() : false,
-                prjCtx != null ? prjCtx.subjectId() : null,
-                true,
-                prjCtx != null ? prjCtx.expiry() : null);
+            CacheOperationContext prj =
+                new CacheOperationContext(opCtx.skipStore(), opCtx.subjectId(), true, opCtx.expiry());
 
             return new IgniteCacheProxy<>((GridCacheContext<K1, V1>)ctx,
                 (GridCacheAdapter<K1, V1>)delegate,
@@ -1429,19 +1425,16 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
      * @return Cache with skip store enabled.
      */
     public IgniteCache<K, V> skipStore() {
-        CacheOperationContext prev = gate.enter(prjCtx);
+        CacheOperationContext prev = gate.enter(opCtx);
 
         try {
-            boolean skip = prjCtx != null && prjCtx.skipStore();
+            boolean skip = opCtx != null && opCtx.skipStore();
 
             if (skip)
                 return this;
 
-            CacheOperationContext prj0 = new CacheOperationContext(
-                true,
-                prjCtx != null ? prjCtx.subjectId() : null,
-                prjCtx != null && prjCtx.isKeepPortable(),
-                prjCtx != null ? prjCtx.expiry() : null);
+            CacheOperationContext prj0 =
+                new CacheOperationContext(true, opCtx.subjectId(), opCtx.isKeepPortable(), opCtx.expiry());
 
             return new IgniteCacheProxy<>(ctx,
                 delegate,
@@ -1482,7 +1475,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
         out.writeObject(delegate);
 
-        out.writeObject(prjCtx);
+        out.writeObject(opCtx);
     }
 
     /** {@inheritDoc} */
@@ -1492,7 +1485,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
 
         delegate = (IgniteInternalCache<K, V>)in.readObject();
 
-        prjCtx = (CacheOperationContext)in.readObject();
+        opCtx = (CacheOperationContext)in.readObject();
 
         gate = ctx.gate();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/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 31b3b12..fe371ce 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
@@ -208,7 +208,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.
+     * @return New internal cache instance based on this one, but with skip store flag enabled.
      */
     public IgniteInternalCache<K, V> setSkipStore(boolean skipStore);
 
@@ -247,7 +247,7 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> {
      * (<code>org.apache.ignite.configuration.CacheConfiguration#isPortableEnabled()</code> returns {@code true}. If not,
      * this method is no-op and will return current projection.
      *
-     * @return Projection for portable objects.
+     * @return New internal cache instance for portable objects.
      */
     public <K1, V1> IgniteInternalCache<K1, V1> keepPortable();
 
@@ -1319,7 +1319,7 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> {
 
     /**
      * Gets the number of all entries cached on this node. This method will return the count of
-     * all cache entries and has O(1) complexity on base {@link IgniteInternalCache} projection. It is essentially the
+     * all cache entries and has O(1) complexity on base {@link IgniteInternalCache}. It is essentially the
      * size of cache key set and is semantically identical to {{@code Cache.keySet().size()}.
      * <p>
      * NOTE: this operation is not distributed and returns only the number of entries cached on this node.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index ecf57d2..e158e4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -2957,7 +2957,6 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                 keepPortable);
     }
 
-
     /**
      * Creates user's SQL fields query for given clause. For more information refer to
      * {@link CacheQuery} documentation.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
index 59bb01f..4950a1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
@@ -50,7 +50,7 @@ public class DataStreamerCacheUpdaters {
     }
 
     /**
-     * Updates cache using batched methods {@link IgniteCache#putAll(java.util.Map)}and
+     * Updates cache using batched methods {@link IgniteCache#putAll(Map)}and
      * {@link IgniteCache#removeAll()}. Can cause deadlocks if the same keys are getting
      * updated concurrently. Performance is generally better than in {@link #individual()}.
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
index a3c4041..a898e58 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
@@ -119,7 +119,7 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt
      * @param ctx Cache context.
      */
     public GridCacheAtomicStampedImpl(String name, GridCacheInternalKey key, IgniteInternalCache<GridCacheInternalKey,
-                    GridCacheAtomicStampedValue<T, S>> atomicView, GridCacheContext ctx) {
+            GridCacheAtomicStampedValue<T, S>> atomicView, GridCacheContext ctx) {
         assert key != null;
         assert atomicView != null;
         assert ctx != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
index 2cf25e7..319b696 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -64,7 +64,7 @@ public class IgfsDataManager extends IgfsManager {
     /** IGFS. */
     private IgfsEx igfs;
 
-    /** Data cache projection. */
+    /** Data internal cache. */
     private IgniteInternalCache<IgfsBlockKey, byte[]> dataCachePrj;
 
     /** Data cache. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/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 a745036..1f24023 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
@@ -545,7 +545,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
             throw new IgniteCheckedException(
                 "Failed to find cache for given cache name (null for default cache): " + cacheName);
 
-        return (IgniteInternalCache<Object, Object>)cache;
+        return cache;
     }
 
     /**
@@ -871,7 +871,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
             if (ttl != null && ttl > 0) {
                 Duration duration = new Duration(MILLISECONDS, ttl);
 
-                c = ((IgniteInternalCache<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration));
+                c = c.withExpiryPolicy(new ModifiedExpiryPolicy(duration));
             }
 
             return c.putAsync(key, val);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
index ed8cd0d..068a46c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
@@ -139,8 +139,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
 
                         return key.id % 2 == 0;
                     }
-                }, false
-            );
+                }, false);
 
             Collection<Map.Entry<Key, Person>> res = qry.execute().get();
 
@@ -186,8 +185,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
 
                             return key.id % 2 == 0;
                         }
-                    }, false
-                );
+                    }, false);
 
                 for (int i = 0; i < 250; i++) {
                     Collection<Map.Entry<Key, Person>> res = qry.execute().get();
@@ -231,8 +229,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
 
                         return val % 2 == 0;
                     }
-                }, false
-            );
+                }, false);
 
             Collection<Map.Entry<String, Long>> res = qry.execute().get();
 
@@ -287,8 +284,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
 
                         return key % 2 == 0;
                     }
-                }, false
-            );
+                }, false);
 
             Collection<Map.Entry<Integer, byte[]>> res = qry.execute().get();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
index 1f86474..8b09c71 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
@@ -309,7 +309,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
         for (int i = 0; i < GRID_CNT; i++) {
             IgniteEx g = grid(i);
 
-            IgniteInternalCache cache = (IgniteInternalCache)g.cachex(DATA_CACHE_NAME).cache();
+            IgniteInternalCache cache = g.cachex(DATA_CACHE_NAME).cache();
 
             assert cache.isIgfsDataCache();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
index 254161a..57b1010 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
@@ -153,7 +153,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
      * @throws IgniteCheckedException In case of exception.
      */
     public void testConfiguration() throws IgniteCheckedException {
-        GridCacheAdapter metaCache = getFieldValue(fs, "meta", "metaCache");
+        IgniteInternalCache metaCache = getFieldValue(fs, "meta", "metaCache");
         GridCacheAdapter dataCache = getFieldValue(fs, "data", "dataCache");
 
         assertNotNull(metaCache);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java
index 8bdb509..699f227 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java
@@ -48,7 +48,7 @@ import static org.hibernate.cache.spi.access.AccessType.*;
  * org.apache.ignite.hibernate.grid_name=&lt;grid name&gt;
  * </pre>
  * Each Hibernate cache region must be associated with some {@link org.apache.ignite.internal.processors.cache.IgniteInternalCache}, by default it is assumed that
- * for each cache region there is a {@link org.apache.ignite.internal.processors.cache.IgniteInternalCache} with the same name. Also it is possible to define
+ * for each cache region there is a {@link IgniteInternalCache} with the same name. Also it is possible to define
  * region to cache mapping using properties with prefix {@code org.apache.ignite.hibernate.region_cache}.
  * For example if for region with name "region1" cache with name "cache1" should be used then following
  * Hibernate property should be specified:

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java
index eee9832..b8cb0a4 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.*;
  * Implementation of {@link AccessType#TRANSACTIONAL} cache access strategy.
  * <p>
  * It is supposed that this strategy is used in JTA environment and Hibernate and
- * {@link org.apache.ignite.internal.processors.cache.IgniteInternalCache} corresponding to the L2 cache region are configured to use the same transaction manager.
+ * {@link IgniteInternalCache} corresponding to the L2 cache region are configured to use the same transaction manager.
  * <p>
  * Configuration of L2 cache and per-entity cache access strategy can be set in the
  * Hibernate configuration file:

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
index 08300e0..7d06fe6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
@@ -102,7 +102,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract
 
         // Create query.
         final CacheQuery<List<?>> sumQry = c.context().queries().
-                createSqlFieldsQuery("select _val from Integer", false).timeout(TEST_TIMEOUT);
+            createSqlFieldsQuery("select _val from Integer", false).timeout(TEST_TIMEOUT);
 
         final R1<List<?>, Integer> rmtRdc = new R1<List<?>, Integer>() {
             /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cd81b35/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
index f185d77..34e86ff 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
@@ -174,7 +174,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom
      */
     public void testAverageQuery() throws Exception {
         CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).getCache(null).context().queries().
-                createSqlFieldsQuery("select age from Person", false);
+            createSqlFieldsQuery("select age from Person", false);
 
         Collection<IgniteBiTuple<Integer, Integer>> res = qry.execute(new AverageRemoteReducer()).get();
 


Mime
View raw message