ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [2/5] incubator-ignite git commit: ignite-96 wip (entire project compilable)
Date Sat, 07 Feb 2015 15:12:18 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/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 40f13a2..985dba9 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
@@ -43,7 +43,7 @@ import org.apache.ignite.spi.indexing.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.io.*;
 import java.sql.*;
 import java.util.*;
@@ -734,12 +734,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
     @SuppressWarnings({"unchecked"})
     private GridCloseableIterator<IgniteBiTuple<K, V>> scanIterator(final GridCacheQueryAdapter<?> qry)
         throws IgniteCheckedException {
-        IgnitePredicate<Entry<K, V>> filter = null;
+        IgnitePredicate<Cache.Entry<K, V>> filter = null;
 
         if (qry.projectionFilter() != null) {
-            filter = new P1<Entry<K, V>>() {
-                @Override public boolean apply(Entry<K, V> e) {
-                    return qry.projectionFilter().apply((Entry<Object, Object>)e);
+            filter = new P1<Cache.Entry<K, V>>() {
+                @Override public boolean apply(Cache.Entry<K, V> e) {
+                    return qry.projectionFilter().apply((Cache.Entry<Object, Object>)e);
                 }
             };
         }
@@ -860,7 +860,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
      */
     private GridIterator<IgniteBiTuple<K, V>> swapIterator(GridCacheQueryAdapter<?> qry)
         throws IgniteCheckedException {
-        IgnitePredicate<Entry<Object, Object>> prjPred = qry.projectionFilter();
+        IgnitePredicate<Cache.Entry<Object, Object>> prjPred = qry.projectionFilter();
 
         IgniteBiPredicate<K, V> filter = qry.scanFilter();
 
@@ -874,7 +874,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
      * @return Offheap iterator.
      */
     private GridIterator<IgniteBiTuple<K, V>> offheapIterator(GridCacheQueryAdapter<?> qry) {
-        IgnitePredicate<Entry<Object, Object>> prjPred = qry.projectionFilter();
+        IgnitePredicate<Cache.Entry<Object, Object>> prjPred = qry.projectionFilter();
 
         IgniteBiPredicate<K, V> filter = qry.scanFilter();
 
@@ -899,7 +899,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
      */
     private GridIteratorAdapter<IgniteBiTuple<K, V>> scanIterator(
         @Nullable final Iterator<Map.Entry<byte[], byte[]>> it,
-        @Nullable final IgnitePredicate<Entry<Object, Object>> prjPred,
+        @Nullable final IgnitePredicate<Cache.Entry<Object, Object>> prjPred,
         @Nullable final IgniteBiPredicate<K, V> filter,
         final boolean keepPortable) {
         if (it == null)
@@ -938,9 +938,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                     final LazySwapEntry e = new LazySwapEntry(it.next());
 
                     if (prjPred != null) {
-                        Entry<K, V> Entry = new GridCacheScanSwapEntry(e);
+                        Cache.Entry<K, V> Entry = new GridCacheScanSwapEntry(e);
 
-                        if (!prjPred.apply((Entry<Object, Object>)Entry))
+                        if (!prjPred.apply((Cache.Entry<Object, Object>)Entry))
                             continue;
                     }
 
@@ -1000,7 +1000,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
 
             try {
                 // Preparing query closures.
-                IgnitePredicate<Entry<Object, Object>> prjFilter = qryInfo.projectionPredicate();
+                IgnitePredicate<Cache.Entry<Object, Object>> prjFilter = qryInfo.projectionPredicate();
                 IgniteClosure<Object, Object> trans = (IgniteClosure<Object, Object>)qryInfo.transformer();
                 IgniteReducer<Object, Object> rdc = (IgniteReducer<Object, Object>)qryInfo.reducer();
 
@@ -1167,7 +1167,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
 
             try {
                 // Preparing query closures.
-                IgnitePredicate<Entry<Object, Object>> prjFilter = qryInfo.projectionPredicate();
+                IgnitePredicate<Cache.Entry<Object, Object>> prjFilter = qryInfo.projectionPredicate();
                 IgniteClosure<Map.Entry<K, V>, Object> trans = (IgniteClosure<Map.Entry<K, V>, Object>)qryInfo.transformer();
                 IgniteReducer<Map.Entry<K, V>, Object> rdc = (IgniteReducer<Map.Entry<K, V>, Object>)qryInfo.reducer();
 
@@ -1756,7 +1756,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
     @Nullable private GridIndexingQueryFilter projectionFilter(GridCacheQueryAdapter<?> qry) {
         assert qry != null;
 
-        final IgnitePredicate<Entry<Object, Object>> prjFilter = qry.projectionFilter();
+        final IgnitePredicate<Cache.Entry<Object, Object>> prjFilter = qry.projectionFilter();
 
         if (prjFilter == null || F.isAlwaysTrue(prjFilter))
             return null;
@@ -1769,9 +1769,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                 return new IgniteBiPredicate<K, V>() {
                     @Override public boolean apply(K k, V v) {
                         try {
-                            Entry<K, V> entry = context().cache().entry(k);
+                            Cache.Entry<K, V> entry = context().cache().entry(k);
 
-                            return entry != null && prjFilter.apply((Entry<Object, Object>)entry);
+                            return entry != null && prjFilter.apply((Cache.Entry<Object, Object>)entry);
                         }
                         catch (GridDhtInvalidPartitionException ignore) {
                             return false;
@@ -2438,7 +2438,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
         private static final long serialVersionUID = 7410163202728985912L;
 
         /** */
-        private IgnitePredicate<Entry<Object, Object>> prjPred;
+        private IgnitePredicate<Cache.Entry<Object, Object>> prjPred;
 
         /** */
         private IgniteBiPredicate<K, V> filter;
@@ -2452,7 +2452,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
          * @param keepPortable Keep portable flag.
          */
         private OffheapIteratorClosure(
-            @Nullable IgnitePredicate<Entry<Object, Object>> prjPred,
+            @Nullable IgnitePredicate<Cache.Entry<Object, Object>> prjPred,
             @Nullable IgniteBiPredicate<K, V> filter,
             boolean keepPortable) {
             assert prjPred != null || filter != null;
@@ -2469,9 +2469,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
             LazyOffheapEntry e = new LazyOffheapEntry(keyPtr, valPtr);
 
             if (prjPred != null) {
-                Entry<K, V> Entry = new GridCacheScanSwapEntry(e);
+                Cache.Entry<K, V> entry = new GridCacheScanSwapEntry(e);
 
-                if (!prjPred.apply((Entry<Object, Object>)Entry))
+                if (!prjPred.apply((Cache.Entry<Object, Object>)entry))
                     return null;
             }
 
@@ -2551,7 +2551,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
     /**
      *
      */
-    private class GridCacheScanSwapEntry implements Entry<K, V> {
+    private class GridCacheScanSwapEntry implements Cache.Entry<K, V> {
         /** */
         private static final long serialVersionUID = 1262515168518736214L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index dc80971..5f9c8be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.io.*;
 import java.nio.*;
 import java.util.*;
@@ -67,7 +67,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
 
     /** */
     @GridDirectTransient
-    private IgnitePredicate<Entry<Object, Object>> prjFilter;
+    private IgnitePredicate<Cache.Entry<Object, Object>> prjFilter;
 
     /** */
     private byte[] prjFilterBytes;
@@ -201,7 +201,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
         String clause,
         String clsName,
         IgniteBiPredicate<Object, Object> keyValFilter,
-        IgnitePredicate<Entry<Object, Object>> prjFilter,
+        IgnitePredicate<Cache.Entry<Object, Object>> prjFilter,
         IgniteReducer<Object, Object> rdc,
         IgniteClosure<Object, Object> trans,
         int pageSize,
@@ -376,7 +376,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
     }
 
     /** {@inheritDoc} */
-    public IgnitePredicate<Entry<Object, Object>> projectionFilter() {
+    public IgnitePredicate<Cache.Entry<Object, Object>> projectionFilter() {
         return prjFilter;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
index b8e5cd5..528bde6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
@@ -31,7 +31,7 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.plugin.security.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.event.*;
 import java.util.*;
 import java.util.concurrent.locks.*;
@@ -55,7 +55,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements CacheContinuousQue
     private final Object topic;
 
     /** Projection predicate */
-    private final IgnitePredicate<Entry<K, V>> prjPred;
+    private final IgnitePredicate<Cache.Entry<K, V>> prjPred;
 
     /** Keep portable flag. */
     private final boolean keepPortable;
@@ -94,7 +94,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements CacheContinuousQue
      * @param prjPred Projection predicate.
      */
     GridCacheContinuousQueryAdapter(GridCacheContext<K, V> ctx, Object topic,
-        @Nullable IgnitePredicate<Entry<K, V>> prjPred) {
+        @Nullable IgnitePredicate<Cache.Entry<K, V>> prjPred) {
         assert ctx != null;
         assert topic != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
index bfec4e6..fcfd3b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.marshaller.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.event.*;
 import java.io.*;
 
@@ -37,7 +37,7 @@ import static org.apache.ignite.internal.processors.cache.GridCacheValueBytes.*;
  * Entry implementation.
  */
 @SuppressWarnings("TypeParameterHidesVisibleType")
-public class GridCacheContinuousQueryEntry<K, V> implements Entry<K, V>, GridCacheDeployable, Externalizable,
+public class GridCacheContinuousQueryEntry<K, V> implements Cache.Entry<K, V>, GridCacheDeployable, Externalizable,
     CacheContinuousQueryEntry<K, V> {
     /** */
     private static final long serialVersionUID = 0L;
@@ -53,7 +53,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements Entry<K, V>, GridCac
     /** Cache entry. */
     @SuppressWarnings("TransientFieldNotInitialized")
     @GridToStringExclude
-    private final transient Entry<K, V> impl;
+    private final transient Cache.Entry<K, V> impl;
 
     /** Key. */
     @GridToStringInclude
@@ -107,7 +107,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements Entry<K, V>, GridCac
      * @param evtType Event type.
      */
     GridCacheContinuousQueryEntry(GridCacheContext<K, V> ctx,
-        Entry<K, V> impl,
+        Cache.Entry<K, V> impl,
         K key,
         @Nullable V newVal,
         @Nullable GridCacheValueBytes newValBytes,
@@ -132,7 +132,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements Entry<K, V>, GridCac
     /**
      * @return Cache entry.
      */
-    Entry<K, V> entry() {
+    Cache.Entry<K, V> entry() {
         return impl;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
index 2ae2998..52356f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
@@ -30,7 +30,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.event.*;
 import java.io.*;
 import java.util.*;
@@ -58,7 +58,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
     private IgnitePredicate<CacheContinuousQueryEntry<K, V>> filter;
 
     /** Projection predicate */
-    private IgnitePredicate<Entry<K, V>> prjPred;
+    private IgnitePredicate<Cache.Entry<K, V>> prjPred;
 
     /** Deployable object for filter. */
     private DeployableObject filterDep;
@@ -113,7 +113,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
         Object topic,
         IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<K, V>>> cb,
         @Nullable IgnitePredicate<CacheContinuousQueryEntry<K, V>> filter,
-        @Nullable IgnitePredicate<Entry<K, V>> prjPred,
+        @Nullable IgnitePredicate<Cache.Entry<K, V>> prjPred,
         boolean internal,
         boolean entryLsnr,
         boolean sync,
@@ -282,7 +282,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
                 GridCacheProjectionImpl.FullFilter<K, V> filter = (GridCacheProjectionImpl.FullFilter<K, V>)prjPred;
 
                 GridCacheProjectionImpl.KeyValueFilter<K, V> kvFilter = filter.keyValueFilter();
-                IgnitePredicate<? super Entry<K, V>> entryFilter = filter.entryFilter();
+                IgnitePredicate<? super Cache.Entry<K, V>> entryFilter = filter.entryFilter();
 
                 boolean ret = true;
 
@@ -464,7 +464,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
         if (b)
             prjPredDep = (DeployableObject)in.readObject();
         else
-            prjPred = (IgnitePredicate<Entry<K, V>>)in.readObject();
+            prjPred = (IgnitePredicate<Cache.Entry<K, V>>)in.readObject();
 
         internal = in.readBoolean();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
index 5321a16..23913e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
@@ -28,7 +28,7 @@ import org.apache.ignite.resources.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.configuration.*;
 import javax.cache.event.*;
 import java.io.*;
@@ -102,7 +102,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt
      * @param prjPred Projection predicate.
      * @return New continuous query.
      */
-    public CacheContinuousQuery<K, V> createQuery(@Nullable IgnitePredicate<Entry<K, V>> prjPred) {
+    public CacheContinuousQuery<K, V> createQuery(@Nullable IgnitePredicate<Cache.Entry<K, V>> prjPred) {
         Object topic = TOPIC_CACHE.topic(topicPrefix, cctx.localNodeId(), seq.getAndIncrement());
 
         return new GridCacheContinuousQueryAdapter<>(cctx, topic, prjPred);
@@ -363,7 +363,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt
                 cctx.projectionPerCall(cctx.cache().<K, V>keepPortable0());
             }
 
-            Set<Entry<K, V>> entries;
+            Set<Cache.Entry<K, V>> entries;
 
             if (cctx.isReplicated())
                 entries = internal ? cctx.cache().entrySetx() :
@@ -374,7 +374,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt
 
             boolean evt = !internal && cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_OBJECT_READ);
 
-            for (Entry<K, V> e : entries) {
+            for (Cache.Entry<K, V> e : entries) {
                 GridCacheContinuousQueryEntry<K, V> qryEntry = new GridCacheContinuousQueryEntry<>(cctx,
                     e,
                     e.getKey(),

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
index f462ba0..23dd368 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
@@ -28,7 +28,7 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.transactions.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.util.*;
 
 /**
@@ -502,7 +502,7 @@ public interface IgniteInternalTx<K, V> extends AutoCloseable, GridTimeoutObject
          GridCacheContext<K, V> ctx,
          boolean failFast,
          K key,
-         @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws GridCacheFilterFailedException;
+         @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) throws GridCacheFilterFailedException;
 
     /**
      * @return Start version.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index d04649b..1905922 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -29,7 +29,7 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.expiry.*;
 import javax.cache.processor.*;
 import java.io.*;
@@ -102,7 +102,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable,
 
     /** Put filters. */
     @GridToStringInclude
-    private IgnitePredicate<Entry<K, V>>[] filters;
+    private IgnitePredicate<Cache.Entry<K, V>>[] filters;
 
     /** Flag indicating whether filters passed. Used for fast-commit transactions. */
     private boolean filtersPassed;
@@ -217,7 +217,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable,
         Object[] invokeArgs,
         long ttl,
         GridCacheEntryEx<K, V> entry,
-        IgnitePredicate<Entry<K, V>>[] filters,
+        IgnitePredicate<Cache.Entry<K, V>>[] filters,
         GridCacheVersion drVer) {
         assert ctx != null;
         assert tx != null;
@@ -725,14 +725,14 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable,
     /**
      * @return Put filters.
      */
-    public IgnitePredicate<Entry<K, V>>[] filters() {
+    public IgnitePredicate<Cache.Entry<K, V>>[] filters() {
         return filters;
     }
 
     /**
      * @param filters Put filters.
      */
-    public void filters(IgnitePredicate<Entry<K, V>>[] filters) {
+    public void filters(IgnitePredicate<Cache.Entry<K, V>>[] filters) {
         filterBytes = null;
 
         this.filters = filters;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index daa4e5f..b2a7da4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -37,7 +37,7 @@ import org.apache.ignite.portables.*;
 import org.apache.ignite.transactions.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.expiry.*;
 import javax.cache.processor.*;
 import java.io.*;
@@ -288,7 +288,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         GridCacheContext<K, V> cacheCtx,
         boolean failFast,
         K key,
-        IgnitePredicate<Entry<K, V>>[] filter
+        IgnitePredicate<Cache.Entry<K, V>>[] filter
     ) throws GridCacheFilterFailedException {
         IgniteTxEntry<K, V> e = txMap == null ? null : txMap.get(cacheCtx.txKey(key));
 
@@ -1100,7 +1100,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         Map<K, GridCacheVersion> missed,
         int keysCnt,
         boolean deserializePortable,
-        IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException {
+        IgnitePredicate<Cache.Entry<K, V>>[] filter) throws IgniteCheckedException {
         assert !F.isEmpty(keys);
         assert keysCnt == keys.size();
         assert cached == null || F.first(keys).equals(cached.key());
@@ -1374,7 +1374,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         final Map<K, GridCacheVersion> missedMap,
         @Nullable final Collection<K> redos,
         final boolean deserializePortable,
-        final IgnitePredicate<Entry<K, V>>[] filter
+        final IgnitePredicate<Cache.Entry<K, V>>[] filter
     ) {
         assert redos != null || pessimistic();
 
@@ -1558,7 +1558,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         Collection<? extends K> keys,
         @Nullable GridCacheEntryEx<K, V> cached,
         final boolean deserializePortable,
-        final IgnitePredicate<Entry<K, V>>[] filter) {
+        final IgnitePredicate<Cache.Entry<K, V>>[] filter) {
         if (F.isEmpty(keys))
             return new GridFinishedFuture<>(cctx.kernalContext(), Collections.<K, V>emptyMap());
 
@@ -1811,7 +1811,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         boolean retval,
         @Nullable GridCacheEntryEx<K, V> cached,
         long ttl,
-        IgnitePredicate<Entry<K, V>>[] filter
+        IgnitePredicate<Cache.Entry<K, V>>[] filter
     ) {
         return (IgniteInternalFuture<GridCacheReturn<V>>)putAllAsync0(cacheCtx,
             map,
@@ -1872,7 +1872,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
      * @throws IgniteCheckedException If failed.
      */
     private boolean filter(GridCacheEntryEx<K, V> cached,
-        IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException {
+        IgnitePredicate<Cache.Entry<K, V>>[] filter) throws IgniteCheckedException {
         return pessimistic() || cached.context().isAll(cached, filter);
     }
 
@@ -1907,7 +1907,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         @Nullable Object[] invokeArgs,
         boolean retval,
         boolean lockOnly,
-        IgnitePredicate<Entry<K, V>>[] filter,
+        IgnitePredicate<Cache.Entry<K, V>>[] filter,
         final GridCacheReturn<V> ret,
         Collection<K> enlisted,
         @Nullable Map<? extends K, GridCacheDrInfo<V>> drPutMap,
@@ -2308,7 +2308,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         boolean retval,
         boolean read,
         long accessTtl,
-        IgnitePredicate<Entry<K, V>>[] filter,
+        IgnitePredicate<Cache.Entry<K, V>>[] filter,
         boolean computeInvoke
     ) throws IgniteCheckedException {
         for (K k : keys) {
@@ -2483,7 +2483,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         @Nullable final Map<? extends K, GridCacheDrInfo<V>> drMap,
         final boolean retval,
         @Nullable GridCacheEntryEx<K, V> cached,
-        @Nullable final IgnitePredicate<Entry<K, V>>[] filter) {
+        @Nullable final IgnitePredicate<Cache.Entry<K, V>>[] filter) {
         assert filter == null || invokeMap == null;
 
         cacheCtx.checkSecurity(GridSecurityPermission.CACHE_PUT);
@@ -2693,7 +2693,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         Collection<? extends K> keys,
         @Nullable GridCacheEntryEx<K, V> cached,
         boolean retval,
-        IgnitePredicate<Entry<K, V>>[] filter
+        IgnitePredicate<Cache.Entry<K, V>>[] filter
     ) {
         return removeAllAsync0(cacheCtx, keys, null, cached, retval, filter);
     }
@@ -2713,7 +2713,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         @Nullable Map<? extends  K, GridCacheVersion> drMap,
         @Nullable GridCacheEntryEx<K, V> cached,
         final boolean retval,
-        @Nullable final IgnitePredicate<Entry<K, V>>[] filter) {
+        @Nullable final IgnitePredicate<Cache.Entry<K, V>>[] filter) {
         cacheCtx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
 
         final Collection<? extends K> keys0;
@@ -3101,7 +3101,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
         Object[] invokeArgs,
         GridCacheEntryEx<K, V> entry,
         @Nullable ExpiryPolicy expiryPlc,
-        IgnitePredicate<Entry<K, V>>[] filter,
+        IgnitePredicate<Cache.Entry<K, V>>[] filter,
         boolean filtersSet,
         long drTtl,
         long drExpireTime,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
index fb8fdf6..69fc808 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.processors.cache.version.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.processor.*;
 import java.util.*;
 
@@ -77,7 +77,7 @@ public interface IgniteTxLocalEx<K, V> extends IgniteInternalTx<K, V> {
         Collection<? extends K> keys,
         @Nullable GridCacheEntryEx<K, V> cached,
         boolean deserializePortable,
-        IgnitePredicate<Entry<K, V>>[] filter);
+        IgnitePredicate<Cache.Entry<K, V>>[] filter);
 
     /**
      * @param cacheCtx Cache context.
@@ -94,7 +94,7 @@ public interface IgniteTxLocalEx<K, V> extends IgniteInternalTx<K, V> {
         boolean retval,
         @Nullable GridCacheEntryEx<K, V> cached,
         long ttl,
-        IgnitePredicate<Entry<K, V>>[] filter);
+        IgnitePredicate<Cache.Entry<K, V>>[] filter);
 
     /**
      * @param cacheCtx Cache context.
@@ -120,7 +120,7 @@ public interface IgniteTxLocalEx<K, V> extends IgniteInternalTx<K, V> {
         Collection<? extends K> keys,
         @Nullable GridCacheEntryEx<K, V> cached,
         boolean retval,
-        IgnitePredicate<Entry<K, V>>[] filter);
+        IgnitePredicate<Cache.Entry<K, V>>[] filter);
 
     /**
      * @param cacheCtx Cache context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
index 98237ea..e90f767 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
@@ -20,7 +20,8 @@ package org.apache.ignite.internal.util.typedef;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.lang.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
+
 
 /**
  * Defines {@code alias} for <tt>GridPredicate&lt;Entry&lt;K, V&gt;&gt;</tt> by extending
@@ -30,4 +31,4 @@ import javax.cache.Cache.*;
  * @see org.apache.ignite.lang.IgnitePredicate
  * @see GridFunc
  */
-public interface PCE<K, V> extends IgnitePredicate<Entry<K, V>> { /* No-op. */ }
+public interface PCE<K, V> extends IgnitePredicate<Cache.Entry<K, V>> { /* No-op. */ }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
index 7a42972..e3605fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
@@ -30,7 +30,7 @@ import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.io.*;
 import java.util.*;
 
@@ -189,11 +189,11 @@ public class VisorCache implements Serializable {
         int size = ca.size();
         int near = ca.nearSize();
 
-        Set<Entry> set = ca.entrySet();
+        Set<Cache.Entry> set = ca.entrySet();
 
         long memSz = 0;
 
-        Iterator<Entry> it = set.iterator();
+        Iterator<Cache.Entry> it = set.iterator();
 
         int sz = sample > 0 ? sample : DFLT_CACHE_SIZE_SAMPLING;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
index 80772a2..4366b61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.visor.*;
 import org.apache.ignite.lang.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.util.*;
 
 /**
@@ -70,11 +70,11 @@ public class VisorCacheSwapBackupsTask extends VisorOneNodeTask<Set<String>, Map
                 CacheAffinity<Object> aff = g.affinity(c.name());
 
                 if (names.contains(cacheName)) {
-                    Set<Entry> entries = c.entrySet();
+                    Set<Cache.Entry> entries = c.entrySet();
 
                     int before = entries.size(), after = before;
 
-                    for (Entry entry: entries) {
+                    for (Cache.Entry entry : entries) {
                         if (aff.isBackup(locNode, entry.getKey()) && c.evict(entry.getKey()))
                             after--;
                     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 3886e45..1ff1953 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -26,7 +26,6 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
@@ -36,17 +35,14 @@ import org.apache.ignite.transactions.*;
 import org.jetbrains.annotations.*;
 
 import javax.cache.*;
-import javax.cache.Cache.*;
 import javax.cache.expiry.*;
 import javax.cache.processor.*;
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.*;
 
 import static java.util.concurrent.TimeUnit.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*;
 import static org.apache.ignite.events.EventType.*;
 import static org.apache.ignite.testframework.GridTestUtils.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
@@ -3531,8 +3527,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         assertEquals(3, primKeys.size());
         assertTrue(primKeys.containsAll(keys));
 
-        primKeys = cache(0).projection(new P1<Entry<String, Integer>>() {
-            @Override public boolean apply(Entry<String, Integer> e) {
+        primKeys = cache(0).projection(new P1<Cache.Entry<String, Integer>>() {
+            @Override public boolean apply(Cache.Entry<String, Integer> e) {
                 return !e.getKey().equals(keys.get(0));
             }
         }).primaryKeySet();
@@ -3549,8 +3545,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         assertEquals(3, primVals.size());
         assertTrue(primVals.containsAll(F.asList(0, 1, 2)));
 
-        primVals = cache(0).projection(new P1<Entry<String, Integer>>() {
-            @Override public boolean apply(Entry<String, Integer> e) {
+        primVals = cache(0).projection(new P1<Cache.Entry<String, Integer>>() {
+            @Override public boolean apply(Cache.Entry<String, Integer> e) {
                 return !e.getKey().equals(keys.get(0));
             }
         }).primaryValues();
@@ -3562,12 +3558,12 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         // Entry set checks.
         // -----------------
 
-        Set<Entry<String, Integer>> primEntries = cache(0).primaryEntrySet();
+        Set<Cache.Entry<String, Integer>> primEntries = cache(0).primaryEntrySet();
 
         assertEquals(3, primEntries.size());
 
-        primEntries = cache(0).projection(new P1<Entry<String, Integer>>() {
-            @Override public boolean apply(Entry<String, Integer> e) {
+        primEntries = cache(0).projection(new P1<Cache.Entry<String, Integer>>() {
+            @Override public boolean apply(Cache.Entry<String, Integer> e) {
                 return !e.getKey().equals(keys.get(0));
             }
         }).primaryEntrySet();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index 8b3b1c5..5c2f1e5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -37,7 +37,7 @@ import org.apache.ignite.transactions.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.configuration.*;
 import java.util.*;
 import java.util.concurrent.atomic.*;
@@ -508,9 +508,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
     /**
      * Filters cache entry projections leaving only ones with keys containing 'key'.
      */
-    protected static IgnitePredicate<Entry<String, Integer>> entryKeyFilter =
-        new P1<Entry<String, Integer>>() {
-        @Override public boolean apply(Entry<String, Integer> entry) {
+    protected static IgnitePredicate<Cache.Entry<String, Integer>> entryKeyFilter =
+        new P1<Cache.Entry<String, Integer>>() {
+        @Override public boolean apply(Cache.Entry<String, Integer> entry) {
             return entry.getKey().contains("key");
         }
     };
@@ -518,9 +518,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
     /**
      * Filters cache entry projections leaving only ones with keys not containing 'key'.
      */
-    protected static IgnitePredicate<Entry<String, Integer>> entryKeyFilterInv =
-        new P1<Entry<String, Integer>>() {
-        @Override public boolean apply(Entry<String, Integer> entry) {
+    protected static IgnitePredicate<Cache.Entry<String, Integer>> entryKeyFilterInv =
+        new P1<Cache.Entry<String, Integer>>() {
+        @Override public boolean apply(Cache.Entry<String, Integer> entry) {
             return !entry.getKey().contains("key");
         }
     };
@@ -528,9 +528,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
     /**
      * Filters cache entry projections leaving only ones with values less than 50.
      */
-    protected static final IgnitePredicate<Entry<String, Integer>> lt50 =
-        new P1<Entry<String, Integer>>() {
-            @Override public boolean apply(Entry<String, Integer> entry) {
+    protected static final IgnitePredicate<Cache.Entry<String, Integer>> lt50 =
+        new P1<Cache.Entry<String, Integer>>() {
+            @Override public boolean apply(Cache.Entry<String, Integer> entry) {
                 Integer i = entry.getValue();
 
                 return i != null && i < 50;
@@ -540,9 +540,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
     /**
      * Filters cache entry projections leaving only ones with values greater or equal than 100.
      */
-    protected static final IgnitePredicate<Entry<String, Integer>> gte100 =
-        new P1<Entry<String, Integer>>() {
-            @Override public boolean apply(Entry<String, Integer> entry) {
+    protected static final IgnitePredicate<Cache.Entry<String, Integer>> gte100 =
+        new P1<Cache.Entry<String, Integer>>() {
+            @Override public boolean apply(Cache.Entry<String, Integer> entry) {
                 Integer i = entry.getValue();
 
                 return i != null && i >= 100;
@@ -556,9 +556,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
     /**
      * Filters cache entry projections leaving only ones with values greater or equal than 200.
      */
-    protected static final IgnitePredicate<Entry<String, Integer>> gte200 =
-        new P1<Entry<String, Integer>>() {
-            @Override public boolean apply(Entry<String, Integer> entry) {
+    protected static final IgnitePredicate<Cache.Entry<String, Integer>> gte200 =
+        new P1<Cache.Entry<String, Integer>>() {
+            @Override public boolean apply(Cache.Entry<String, Integer> entry) {
                 Integer i = entry.getValue();
 
                 return i != null && i >= 200;
@@ -573,7 +573,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
      * {@link org.apache.ignite.lang.IgniteInClosure} for calculating sum.
      */
     @SuppressWarnings({"PublicConstructorInNonPublicClass"})
-    protected static final class SumVisitor implements CI1<Entry<String, Integer>> {
+    protected static final class SumVisitor implements CI1<Cache.Entry<String, Integer>> {
         /** */
         private final AtomicInteger sum;
 
@@ -585,7 +585,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void apply(Entry<String, Integer> entry) {
+        @Override public void apply(Cache.Entry<String, Integer> entry) {
             if (entry.getValue() != null) {
                 Integer i = entry.getValue();
 
@@ -600,7 +600,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
      * {@link org.apache.ignite.lang.IgniteReducer} for calculating sum.
      */
     @SuppressWarnings({"PublicConstructorInNonPublicClass"})
-    protected static final class SumReducer implements R1<Entry<String, Integer>, Integer> {
+    protected static final class SumReducer implements R1<Cache.Entry<String, Integer>, Integer> {
         /** */
         private int sum;
 
@@ -610,7 +610,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public boolean collect(Entry<String, Integer> entry) {
+        @Override public boolean collect(Cache.Entry<String, Integer> entry) {
             if (entry.getValue() != null) {
                 Integer i = entry.getValue();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
index bff07dc..1b10843 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
@@ -93,7 +93,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
 
         int idx = 0;
 
-        for (Entry<Integer, String> e : c.entrySet()) {
+        for (Cache.Entry<Integer, String> e : c.entrySet()) {
             assertNotNull(e.getValue());
 
             idx++;
@@ -132,7 +132,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
 
         int idx = 0;
 
-        for (Entry<Integer, String> e : c.entrySet()) {
+        for (Cache.Entry<Integer, String> e : c.entrySet()) {
             assertNotNull(e.getValue());
 
             idx++;
@@ -161,7 +161,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
                 int start = 2 * 1024 * tid;
 
                 Iterator<String> it1 = null;
-                Iterator<Entry<Integer, String>> it2 = null;
+                Iterator<Cache.Entry<Integer, String>> it2 = null;
                 Iterator<Integer> it3 = null;
 
                 boolean created = false;
@@ -212,7 +212,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
 
                 int idx = 0;
 
-                for (Entry<Integer, String> e : c.entrySet()) {
+                for (Cache.Entry<Integer, String> e : c.entrySet()) {
                     assertNotNull(e.getValue());
 
                     idx++;
@@ -257,7 +257,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
                 int start = 2 * 1024 * tid;
 
                 Iterator<String> it1 = null;
-                Iterator<Entry<Integer, String>> it2 = null;
+                Iterator<Cache.Entry<Integer, String>> it2 = null;
                 Iterator<Integer> it3 = null;
 
                 boolean forgot = false;
@@ -307,7 +307,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
 
                 int idx = 0;
 
-                for (Entry<Integer, String> e : c.entrySet()) {
+                for (Cache.Entry<Integer, String> e : c.entrySet()) {
                     assertNotNull(e.getValue());
 
                     idx++;
@@ -344,7 +344,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
                 @SuppressWarnings("UnusedAssignment")
                 @Override public Object call() throws Exception {
                     Iterator<String> it1 = c.values().iterator();
-                    Iterator<Entry<Integer, String>> it2 = c.entrySet().iterator();
+                    Iterator<Cache.Entry<Integer, String>> it2 = c.entrySet().iterator();
                     Iterator<Integer> it3 = c.keySet().iterator();
 
                     for (int i = 0; i < 1000; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index 771237b..4e84d72 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -39,7 +39,6 @@ import org.apache.ignite.testframework.junits.common.*;
 import org.apache.ignite.transactions.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index 8dda1c9..9df8e55 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
@@ -30,7 +30,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.io.*;
 import java.util.*;
 
@@ -277,7 +277,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
      * @return Extras size.
      * @throws Exception If failed.
      */
-    private int extrasSize(Entry entry) throws Exception {
+    private int extrasSize(Cache.Entry entry) throws Exception {
         assert false : "ignite-96";
 
         return -1;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java
index e6e0f19..aee494a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
 
@@ -86,16 +86,16 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest {
      * @param prj Projection.
      * @param c Visitor closure.
      */
-    private void iterate(CacheProjection<Integer, Integer> prj, IgniteInClosure<Entry<Integer, Integer>> c) {
+    private void iterate(CacheProjection<Integer, Integer> prj, IgniteInClosure<Cache.Entry<Integer, Integer>> c) {
         prj.forEach(c);
     }
 
     /**
      * @return Empty filter.
      */
-    private IgniteInClosure<Entry<Integer, Integer>> emptyFilter() {
-        return new CI1<Entry<Integer, Integer>>() {
-            @Override public void apply(Entry<Integer, Integer> e) {
+    private IgniteInClosure<Cache.Entry<Integer, Integer>> emptyFilter() {
+        return new CI1<Cache.Entry<Integer, Integer>>() {
+            @Override public void apply(Cache.Entry<Integer, Integer> e) {
                 // No-op
             }
         };
@@ -112,7 +112,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest {
 
         assert cache.size() == SMALL_ENTRY_CNT;
 
-        IgniteInClosure<Entry<Integer, Integer>> c = emptyFilter();
+        IgniteInClosure<Cache.Entry<Integer, Integer>> c = emptyFilter();
 
         // Warmup.
         for (int i = 0; i < 10; i ++)
@@ -141,7 +141,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest {
 
         assert cache.size() == LARGE_ENTRY_CNT;
 
-        IgniteInClosure<Entry<Integer, Integer>> c = emptyFilter();
+        IgniteInClosure<Cache.Entry<Integer, Integer>> c = emptyFilter();
 
         // Warmup.
         for (int i = 0; i < 3; i++)
@@ -170,7 +170,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest {
 
         assert cache.size() == LARGE_ENTRY_CNT;
 
-        IgniteInClosure<Entry<Integer, Integer>> c = emptyFilter();
+        IgniteInClosure<Cache.Entry<Integer, Integer>> c = emptyFilter();
 
         CacheProjection<Integer, Integer> prj = cache.projection(new P2<Integer, Integer>() {
             @Override public boolean apply(Integer key, Integer val) {
@@ -210,8 +210,8 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest {
 
         final BoxedInt cnt = new BoxedInt();
 
-        IgniteInClosure<Entry<Integer, Integer>> c = new CI1<Entry<Integer, Integer>>() {
-            @Override public void apply(Entry<Integer, Integer> t) {
+        IgniteInClosure<Cache.Entry<Integer, Integer>> c = new CI1<Cache.Entry<Integer, Integer>>() {
+            @Override public void apply(Cache.Entry<Integer, Integer> t) {
                 if (t.getValue() < SMALL_ENTRY_CNT)
                     cnt.increment();
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
index ee7480e..d98c16a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
@@ -33,7 +33,6 @@ import org.apache.ignite.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
 import javax.cache.*;
-import javax.cache.Cache.*;
 import javax.cache.configuration.*;
 import javax.cache.integration.*;
 import java.util.*;
@@ -188,7 +187,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS
         }
 
         /** {@inheritDoc} */
-        @Override public boolean evictAllowed(Entry entry) {
+        @Override public boolean evictAllowed(Cache.Entry entry) {
             return false;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
index 3114e41..df2fb56 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.testframework.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.processor.*;
 import java.io.*;
 import java.util.concurrent.*;
@@ -377,9 +377,9 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
     /**
      *
      */
-    protected static class TestFilter implements IgnitePredicate<Entry<Integer, Integer>> {
+    protected static class TestFilter implements IgnitePredicate<Cache.Entry<Integer, Integer>> {
         /** {@inheritDoc} */
-        @Override public boolean apply(Entry<Integer, Integer> e) {
+        @Override public boolean apply(Cache.Entry<Integer, Integer> e) {
             if (e == null) {
                 failed = true;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
index d803fd9..8fcb829 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.transactions.*;
 import org.jetbrains.annotations.*;
 import org.junit.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.processor.*;
 import java.util.*;
 import java.util.concurrent.locks.*;
@@ -616,7 +616,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb
      *
      */
     @SuppressWarnings("PublicInnerClass")
-    public static class TestEntryPredicate implements IgnitePredicate<Entry<Integer, Integer>> {
+    public static class TestEntryPredicate implements IgnitePredicate<Cache.Entry<Integer, Integer>> {
         /** */
         private Integer expVal;
 
@@ -628,7 +628,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb
         }
 
         /** {@inheritDoc} */
-        @Override public boolean apply(Entry<Integer, Integer> e) {
+        @Override public boolean apply(Cache.Entry<Integer, Integer> e) {
             assertEquals(expVal, e.getValue());
 
             return true;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
index 74d8fae..ae3599d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.portables.*;
 import org.apache.ignite.testframework.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.processor.*;
 import java.io.*;
 import java.util.*;
@@ -252,7 +252,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
     /**
      *
      */
-    protected abstract static class TestPredicate implements P1<Entry<Integer, Object>> {
+    protected abstract static class TestPredicate implements P1<Cache.Entry<Integer, Object>> {
         /** */
         protected String expVal;
 
@@ -269,7 +269,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
         }
 
         /** {@inheritDoc} */
-        @Override public final boolean apply(Entry<Integer, Object> e) {
+        @Override public final boolean apply(Cache.Entry<Integer, Object> e) {
             assertNotNull(e);
 
             Object val = e.getValue();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
index 95f12d5..285ee52 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
@@ -33,7 +33,7 @@ import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
@@ -124,7 +124,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
                         info("Started evicting...");
 
                         for (int i = 0; i < 3000 && !done.get(); i++) {
-                            Entry<Integer, Object> entry = randomEntry(ignite1);
+                            Cache.Entry<Integer, Object> entry = randomEntry(ignite1);
 
                             if (entry != null)
                                 ignite1.cache(null).evict(entry.getKey());
@@ -164,12 +164,12 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
             info("Evicting on constant topology.");
 
             for (int i = 0; i < 1000; i++) {
-                Entry<Integer, Object> entry = randomEntry(ignite1);
+                Cache.Entry<Integer, Object> entry = randomEntry(ignite1);
 
-//                if (entry != null) // TODO ignite-96
-//                    entry.evict();
-//                else
-//                    info("Entry is null.");
+                if (entry != null)
+                    cache1.evict(entry.getKey());
+                else
+                    info("Entry is null.");
             }
 
             sleepUntilCashesEqualize(ignite1, ignite2, oldSize);
@@ -207,7 +207,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
      * @param g Grid.
      * @return Random entry from cache.
      */
-    @Nullable private Entry<Integer, Object> randomEntry(Ignite g) {
+    @Nullable private Cache.Entry<Integer, Object> randomEntry(Ignite g) {
         IgniteKernal g1 = (IgniteKernal)g;
 
         return g1.<Integer, Object>internalCache().randomEntry();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
index 44f78d0..3cbe044 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
@@ -27,7 +27,7 @@ import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import javax.cache.expiry.*;
 import javax.cache.processor.*;
 import java.util.*;
@@ -338,12 +338,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
     }
 
     /** @inheritDoc */
-    @Override public Entry<K, V> wrap() {
+    @Override public Cache.Entry<K, V> wrap() {
         assert false; return null;
     }
 
     /** {@inheritDoc} */
-    @Override public Entry<K, V> wrapFilterLocked() throws IgniteCheckedException {
+    @Override public Cache.Entry<K, V> wrapFilterLocked() throws IgniteCheckedException {
         assert false; return null;
     }
 
@@ -369,20 +369,20 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
     }
 
     /** @inheritDoc */
-    @Override public boolean invalidate(@Nullable IgnitePredicate<Entry<K, V>>[] filter)
+    @Override public boolean invalidate(@Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter)
         throws GridCacheEntryRemovedException, IgniteCheckedException {
         assert false; return false;
     }
 
     /** @inheritDoc */
-    @Override public boolean compact(@Nullable IgnitePredicate<Entry<K, V>>[] filter)
+    @Override public boolean compact(@Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter)
         throws GridCacheEntryRemovedException, IgniteCheckedException {
         assert false;  return false;
     }
 
     /** @inheritDoc */
     @Override public boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer,
-        @Nullable IgnitePredicate<Entry<K, V>>[] filter) {
+        @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) {
         assert false; return false;
     }
 
@@ -414,20 +414,20 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         UUID subjId,
         Object transformClo,
         String taskName,
-        IgnitePredicate<Entry<K, V>>[] filter,
+        IgnitePredicate<Cache.Entry<K, V>>[] filter,
         @Nullable IgniteCacheExpiryPolicy expiryPlc) {
         return val;
     }
 
     /** @inheritDoc */
-    @Override public V innerReload(IgnitePredicate<Entry<K, V>>[] filter) {
+    @Override public V innerReload(IgnitePredicate<Cache.Entry<K, V>>[] filter) {
         return val;
     }
 
     /** @inheritDoc */
     @Override public GridCacheUpdateTxResult<V> innerSet(@Nullable IgniteInternalTx<K, V> tx, UUID evtNodeId, UUID affNodeId,
         @Nullable V val, @Nullable byte[] valBytes, boolean writeThrough, boolean retval, long ttl,
-        boolean evt, boolean metrics, long topVer, IgnitePredicate<Entry<K, V>>[] filter, GridDrType drType,
+        boolean evt, boolean metrics, long topVer, IgnitePredicate<Cache.Entry<K, V>>[] filter, GridDrType drType,
         long drExpireTime, @Nullable GridCacheVersion drVer, UUID subjId, String taskName) throws IgniteCheckedException,
         GridCacheEntryRemovedException {
         return new GridCacheUpdateTxResult<>(true, rawPut(val, ttl));
@@ -443,7 +443,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         @Nullable ExpiryPolicy expiryPlc,
         boolean evt,
         boolean metrics,
-        @Nullable IgnitePredicate<Entry<K, V>>[] filter,
+        @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter,
         boolean intercept,
         UUID subjId,
         String taskName)
@@ -467,7 +467,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         boolean metrics,
         boolean primary,
         boolean checkVer,
-        @Nullable IgnitePredicate<Entry<K, V>>[] filter,
+        @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter,
         GridDrType drType,
         long drTtl,
         long drExpireTime,
@@ -491,7 +491,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
     /** @inheritDoc */
     @Override public GridCacheUpdateTxResult<V> innerRemove(@Nullable IgniteInternalTx<K, V> tx, UUID evtNodeId,
         UUID affNodeId, boolean writeThrough, boolean retval, boolean evt, boolean metrics, long topVer,
-        IgnitePredicate<Entry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion drVer, UUID subjId,
+        IgnitePredicate<Cache.Entry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion drVer, UUID subjId,
         String taskName)
         throws IgniteCheckedException, GridCacheEntryRemovedException {
         obsoleteVer = ver;
@@ -505,7 +505,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
 
     /** @inheritDoc */
     @Override public boolean clear(GridCacheVersion ver, boolean readers,
-        @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException {
+        @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) throws IgniteCheckedException {
         if (ver == null || ver.equals(this.ver)) {
             val = null;
 
@@ -587,26 +587,26 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
     }
 
     /** @inheritDoc */
-    @Override public V peek(GridCachePeekMode mode, IgnitePredicate<Entry<K, V>>[] filter) {
+    @Override public V peek(GridCachePeekMode mode, IgnitePredicate<Cache.Entry<K, V>>[] filter) {
         return val;
     }
 
     /** @inheritDoc */
     @Override public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode,
-        IgnitePredicate<Entry<K, V>>[] filter, IgniteInternalTx<K, V> tx)
+        IgnitePredicate<Cache.Entry<K, V>>[] filter, IgniteInternalTx<K, V> tx)
         throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException {
         return F.t(val);
     }
 
     /** @inheritDoc */
-    @Override public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<Entry<K, V>>[] filter)
+    @Override public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<Cache.Entry<K, V>>[] filter)
         throws GridCacheEntryRemovedException {
         return val;
     }
 
     /** @inheritDoc */
     @Override public V peekFailFast(GridCachePeekMode mode,
-        IgnitePredicate<Entry<K, V>>[] filter) {
+        IgnitePredicate<Cache.Entry<K, V>>[] filter) {
         assert false; return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
index 02b2644..1a9aa9b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
@@ -31,7 +31,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.apache.ignite.transactions.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
@@ -410,7 +410,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest {
         for (int i = 1; i <= maxKeyValue(); i++) {
             for (int k = 0; k < 3; k++) {
                 try {
-                    Entry<Integer, String> e1 = null;
+                    Cache.Entry<Integer, String> e1 = null;
 
                     String v1 = null;
 
@@ -427,7 +427,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest {
                             v1 = e1.getValue();
                         }
                         else {
-                            Entry<Integer, String> e2 = cache.entry(i);
+                            Cache.Entry<Integer, String> e2 = cache.entry(i);
 
                             String v2 = e2.getValue();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
index cead3f7..2b8957b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.util.*;
 
 /**
@@ -69,7 +69,7 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr
             for (int i = 0; i < entryCnt; i++)
                 cache.put(String.valueOf(i), i);
 
-            Collection<Entry<String, Integer>> entries = new ArrayList<>(10_000);
+            Collection<Cache.Entry<String, Integer>> entries = new ArrayList<>(10_000);
 
             for (int i = 0; i < 10_000; i++)
                 entries.add(cache.randomEntry());
@@ -78,7 +78,7 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr
             startGrid(2);
             startGrid(3);
 
-            for (Entry<String, Integer> entry : entries)
+            for (Cache.Entry<String, Integer> entry : entries)
                 entry.getValue();
 
             for (int i = 0; i < entryCnt; i++)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
index e5d86f4..588d765 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
@@ -29,7 +29,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.transactions.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.*;
@@ -654,8 +654,8 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe
 
                 assert e != null;
 
-                IgnitePredicate<Entry<String, Integer>> noPeekVal = F.cacheNoPeekValue();
-                IgnitePredicate<Entry<String, Integer>> hasPeekVal = F.cacheHasPeekValue();
+                IgnitePredicate<Cache.Entry<String, Integer>> noPeekVal = F.cacheNoPeekValue();
+                IgnitePredicate<Cache.Entry<String, Integer>> hasPeekVal = F.cacheHasPeekValue();
 
                 String key = e.getKey();
                 Integer val = e.getValue();
@@ -685,8 +685,8 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe
 
                 assert e != null;
 
-                IgnitePredicate<Entry<String, Integer>> noPeekVal = F.cacheNoPeekValue();
-                IgnitePredicate<Entry<String, Integer>> hasPeekVal = F.cacheHasPeekValue();
+                IgnitePredicate<Cache.Entry<String, Integer>> noPeekVal = F.cacheNoPeekValue();
+                IgnitePredicate<Cache.Entry<String, Integer>> hasPeekVal = F.cacheHasPeekValue();
 
                 String key = e.getKey();
                 Integer val = e.getValue();
@@ -721,8 +721,8 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe
 
                 assert e != null;
 
-                IgnitePredicate<Entry<String, Integer>> noPeekVal = F.cacheNoPeekValue();
-                IgnitePredicate<Entry<String, Integer>> hasPeekVal = F.cacheHasPeekValue();
+                IgnitePredicate<Cache.Entry<String, Integer>> noPeekVal = F.cacheNoPeekValue();
+                IgnitePredicate<Cache.Entry<String, Integer>> hasPeekVal = F.cacheHasPeekValue();
 
                 String key = e.getKey();
                 Integer val = e.getValue();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
index 9706798..ffbffea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
@@ -31,7 +31,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.apache.ignite.transactions.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.util.*;
 
 import static org.apache.ignite.IgniteState.*;
@@ -114,7 +114,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac
                 IGNITEs.set(i, startGrid(i));
             }
 
-            Entry e = cache(i).entry(KEY);
+            Cache.Entry e = cache(i).entry(KEY);
 
             assert !cache(i).isLocked(KEY) : "Entry is locked for grid [idx=" + i + ", entry=" + e + ']';
         }
@@ -257,7 +257,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac
 
         assert !checkCache.lock(KEY, -1);
 
-        Entry e = checkCache.entry(KEY);
+        Cache.Entry e = checkCache.entry(KEY);
 
         assert cache.isLocked(KEY) : "Entry is not locked for grid [idx=" + checkIdx + ", entry=" + e + ']';
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
index 996ac73..56878cd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
@@ -30,7 +30,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.jdk8.backport.*;
 
-import javax.cache.Cache.*;
 import javax.cache.configuration.*;
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
index 6a3a9e6..a186238 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
@@ -29,7 +29,7 @@ import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
@@ -194,7 +194,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
                             GridCache<Integer, Integer> cache = g2.cache(null);
 
                             for (int j = 0; j < KEY_CNT; j++) {
-                                Entry<Integer, Integer> entry = cache.entry(j);
+                                Cache.Entry<Integer, Integer> entry = cache.entry(j);
 
                                 assert entry != null;
 
@@ -238,7 +238,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
                         done.set(true);
 
                         for (int j = 0; j < KEY_CNT; j++) {
-                            Entry<Integer, Integer> entry = cache.entry(j);
+                            Cache.Entry<Integer, Integer> entry = cache.entry(j);
 
                             assert entry != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
index 6ca0342..d4d63e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.testframework.*;
 import org.apache.ignite.transactions.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.util.*;
 import java.util.concurrent.*;
 
@@ -85,10 +85,10 @@ public abstract class GridCacheGroupLockPartitionedAbstractSelfTest extends Grid
 
         for (int i = 0; i < 3; i++) {
             try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 10)) {
-                Set<Entry<CacheAffinityKey<Integer>, Integer>> set =
+                Set<Cache.Entry<CacheAffinityKey<Integer>, Integer>> set =
                     cache.entrySet(cache(0).affinity().partition(affinityKey));
 
-                for (Entry<CacheAffinityKey<Integer>, Integer> entry : set) {
+                for (Cache.Entry<CacheAffinityKey<Integer>, Integer> entry : set) {
                     Integer old = entry.getValue();
 
                     if (old != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/386a973d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
index 0c95574..4625d43 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.util.typedef.*;
 
-import javax.cache.Cache.*;
+import javax.cache.*;
 import java.util.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
@@ -120,12 +120,12 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
                 if (offheapTiered(nodeCache))
                     continue;
 
-                Set<Entry<String, Integer>> partEntrySet = nodeCache.entrySet(part);
+                Set<Cache.Entry<String, Integer>> partEntrySet = nodeCache.entrySet(part);
 
                 if (nodeCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key)) {
                     Collection<String> cp = new LinkedList<>(vals);
 
-                    for (Entry<String, Integer> e : partEntrySet) {
+                    for (Cache.Entry<String, Integer> e : partEntrySet) {
                         String eKey = e.getKey();
 
                         assertTrue("Got unexpected key:" + eKey, cp.contains(eKey));
@@ -164,13 +164,13 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
 
                 // First node with this partition will remove first key from partition.
                 if (nodeCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key)) {
-                    Set<Entry<String, Integer>> partEntrySet = nodeCache.entrySet(part);
+                    Set<Cache.Entry<String, Integer>> partEntrySet = nodeCache.entrySet(part);
 
-                    Iterator<Entry<String, Integer>> it = partEntrySet.iterator();
+                    Iterator<Cache.Entry<String, Integer>> it = partEntrySet.iterator();
 
                     assertTrue(it.hasNext());
 
-                    Entry<String, Integer> next = it.next();
+                    Cache.Entry<String, Integer> next = it.next();
 
                     deleted.add(next.getKey());
 
@@ -230,7 +230,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
                 if (offheapTiered(nodeCache))
                     continue;
 
-                Set<Entry<String, Integer>> partEntrySet = nodeCache.entrySet(part);
+                Set<Cache.Entry<String, Integer>> partEntrySet = nodeCache.entrySet(part);
 
                 if (nodeCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key)) {
                     assertTrue(partEntrySet.contains(nodeCache.entry(key)));


Mime
View raw message