ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [25/34] incubator-ignite git commit: # ignite-51
Date Wed, 25 Feb 2015 14:07:05 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index 5a6cd22..7800b02 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -247,13 +247,13 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
         // Put on primary node.
         nearPrimary.put(key, val);
 
-        GridDhtCacheEntry<Integer, String> entryPrimary = dhtPrimary.peekExx(key);
-        GridDhtCacheEntry<Integer, String> entryBackup = dhtBackup.peekExx(key);
+        GridDhtCacheEntry entryPrimary = (GridDhtCacheEntry)dhtPrimary.peekEx(key);
+        GridDhtCacheEntry entryBackup = (GridDhtCacheEntry)dhtBackup.peekEx(key);
 
         assert entryPrimary != null;
         assert entryBackup != null;
-        assert nearOther.peekExx(key) == null;
-        assert dhtOther.peekExx(key) == null;
+        assert nearOther.peekEx(key) == null;
+        assert dhtOther.peekEx(key) == null;
 
         IgniteFuture<Event> futOther =
             waitForLocalEvent(grid(other).events(), nodeEvent(other.id()), EVT_CACHE_ENTRY_EVICTED);
@@ -267,8 +267,8 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
         // Get value on other node, it should be loaded to near cache.
         assertEquals(val, nearOther.get(key, true));
 
-        entryPrimary = dhtPrimary.peekExx(key);
-        entryBackup = dhtBackup.peekExx(key);
+        entryPrimary = (GridDhtCacheEntry)dhtPrimary.peekEx(key);
+        entryBackup = (GridDhtCacheEntry)dhtBackup.peekEx(key);
 
         assert entryPrimary != null;
         assert entryBackup != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
index f8f8ff1..fca74fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
@@ -234,8 +234,8 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
         assertEquals(val, nearBackup.peek(key));
         assertEquals(val, dhtBackup.peek(key));
 
-        GridDhtCacheEntry<Integer, String> entryPrimary = dhtPrimary.peekExx(key);
-        GridDhtCacheEntry<Integer, String> entryBackup = dhtBackup.peekExx(key);
+        GridDhtCacheEntry entryPrimary = (GridDhtCacheEntry)dhtPrimary.peekEx(key);
+        GridDhtCacheEntry entryBackup = (GridDhtCacheEntry)dhtBackup.peekEx(key);
 
         assert entryPrimary != null;
         assert entryBackup != null;
@@ -259,11 +259,11 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
 
         assertEquals(0, nearPrimary.size());
 
-        assertNull(nearPrimary.peekExx(key));
-        assertNull(dhtPrimary.peekExx(key));
+        assertNull(nearPrimary.peekEx(key));
+        assertNull(dhtPrimary.peekEx(key));
 
-        assertNull(nearBackup.peekExx(key));
-        assertNull(dhtBackup.peekExx(key));
+        assertNull(nearBackup.peekEx(key));
+        assertNull(dhtBackup.peekEx(key));
     }
 
     /**
@@ -344,8 +344,8 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
 
             assertNull(msg, nearBackup.peek(key));
             assertNull(msg, dhtBackup.peek(key));
-            assertNull(msg, nearBackup.peekExx(key));
-            assertNull(msg, dhtBackup.peekExx(key));
+            assertNull(msg, nearBackup.peekEx(key));
+            assertNull(msg, dhtBackup.peekEx(key));
         }
 
         for (Integer key : keys) {
@@ -353,8 +353,8 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
 
             assertNull(msg, nearPrimary.peek(key));
             assertNull(msg, dhtPrimary.peek(key));
-            assertNull(msg, nearPrimary.peekExx(key));
-            assertNull(dhtPrimary.peekExx(key));
+            assertNull(msg, nearPrimary.peekEx(key));
+            assertNull(dhtPrimary.peekEx(key));
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
index f88c080..65f526d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
@@ -169,8 +169,8 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest {
      * @param node Node.
      * @return DHT entry.
      */
-    private GridDhtCacheEntry<Object, Object> peekDhtEntry(ClusterNode node) {
-        return (GridDhtCacheEntry<Object, Object>)dht(grid(node).jcache(null)).peekEx(
+    private GridDhtCacheEntry peekDhtEntry(ClusterNode node) {
+        return (GridDhtCacheEntry)dht(grid(node).jcache(null)).peekEx(
             new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME));
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index ae94b12..83984eb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -312,7 +312,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
                 if (aff.mapPartitionToPrimaryAndBackups(aff.partition(i)).contains(last.cluster().localNode())) {
                     GridDhtPartitionTopology<Integer, String> top = dht.topology();
 
-                    for (GridDhtLocalPartition<Integer, String> p : top.localPartitions()) {
+                    for (GridDhtLocalPartition p : top.localPartitions()) {
                         Collection<ClusterNode> moving = top.moving(p.id());
 
                         assert moving.isEmpty() : "Nodes with partition in moving state [part=" + p +
@@ -576,7 +576,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
                 if (aff.mapPartitionToPrimaryAndBackups(aff.partition(i)).contains(last.cluster().localNode())) {
                     GridDhtPartitionTopology<Integer, String> top = dht.topology();
 
-                    for (GridDhtLocalPartition<Integer, String> p : top.localPartitions()) {
+                    for (GridDhtLocalPartition p : top.localPartitions()) {
                         Collection<ClusterNode> moving = top.moving(p.id());
 
                         assert moving.isEmpty() : "Nodes with partition in moving state [part=" + p +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
index 9ff1bf2..2d25742 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
@@ -216,7 +216,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
                 if (aff.mapPartitionToPrimaryAndBackups(aff.partition(i)).contains(g1.cluster().localNode())) {
                     GridDhtPartitionTopology<Integer, String> top = dht.topology();
 
-                    for (GridDhtLocalPartition<Integer, String> p : top.localPartitions())
+                    for (GridDhtLocalPartition p : top.localPartitions())
                         assertEquals("Invalid partition state for partition: " + p, OWNING, p.state());
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
index 0cf6684..a9d402a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
@@ -52,14 +52,14 @@ public class GridCacheDhtTestUtils {
     static void prepareKeys(GridDhtCache<Integer, String> dht, int keyCnt) throws IgniteCheckedException {
         CacheAffinityFunction aff = dht.context().config().getAffinity();
 
-        GridCacheConcurrentMap<Integer, String> cacheMap;
+        GridCacheConcurrentMap cacheMap;
 
         try {
             Field field = GridCacheAdapter.class.getDeclaredField("map");
 
             field.setAccessible(true);
 
-            cacheMap = (GridCacheConcurrentMap<Integer, String>)field.get(dht);
+            cacheMap = (GridCacheConcurrentMap)field.get(dht);
         }
         catch (Exception e) {
             throw new IgniteCheckedException("Failed to get cache map.", e);
@@ -67,10 +67,14 @@ public class GridCacheDhtTestUtils {
 
         GridDhtPartitionTopology<Integer,String> top = dht.topology();
 
+        GridCacheContext ctx = dht.context();
+
         for (int i = 0; i < keyCnt; i++) {
-            cacheMap.putEntry(-1, i, "value" + i, 0);
+            KeyCacheObject cacheKey = ctx.toCacheKeyObject(i);
+
+            cacheMap.putEntry(-1, cacheKey, ctx.toCacheObject("value" + i), 0);
 
-            dht.preloader().request(Collections.singleton(i), -1);
+            dht.preloader().request(Collections.singleton(cacheKey), -1);
 
             GridDhtLocalPartition part = top.localPartition(aff.partition(i), false);
 
@@ -161,6 +165,7 @@ public class GridCacheDhtTestUtils {
      * @param idx Cache index.
      * @param log Logger.
      */
+    @SuppressWarnings("unchecked")
     static void checkDhtTopology(GridDhtCache<Integer, String> dht, int idx, IgniteLogger log) {
         assert dht != null;
         assert idx >= 0;
@@ -168,7 +173,7 @@ public class GridCacheDhtTestUtils {
 
         log.info("Checking balanced state of cache #" + idx);
 
-        CacheAffinity<Integer> aff = dht.affinity();
+        CacheAffinity<Object> aff = (CacheAffinity)dht.affinity();
 
         Ignite ignite = dht.context().grid();
         ClusterNode locNode = ignite.cluster().localNode();
@@ -205,8 +210,8 @@ public class GridCacheDhtTestUtils {
         }
 
         // Check keys.
-        for (GridCacheEntryEx<Integer, String> e : dht.entries()) {
-            GridDhtCacheEntry<Integer, String> entry = (GridDhtCacheEntry<Integer, String>)e;
+        for (GridCacheEntryEx e : dht.entries()) {
+            GridDhtCacheEntry entry = (GridDhtCacheEntry)e;
 
             if (!affParts.contains(entry.partition()))
                 log.warning("Partition of stored entry is obsolete for node: [cache=" + idx + ", entry=" + entry +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
index f8c41f0..f51902a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
@@ -128,7 +128,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
      * @param parts Parts.
      */
     private void checkPartitionUnloadEvents(Collection<Event> evts, Ignite g,
-        Collection<GridDhtLocalPartition<Object, Object>> parts) {
+        Collection<GridDhtLocalPartition> parts) {
         assertEquals(parts.size(), evts.size());
 
         for (Event evt : evts) {
@@ -137,9 +137,9 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
             final int part = unloadEvt.partition();
 
             assertNotNull("Unexpected partition: " + part, F.find(parts, null,
-                new IgnitePredicate<GridDhtLocalPartition<Object, Object>>() {
+                new IgnitePredicate<GridDhtLocalPartition>() {
                     @Override
-                    public boolean apply(GridDhtLocalPartition<Object, Object> e) {
+                    public boolean apply(GridDhtLocalPartition e) {
                         return e.id() == part;
                     }
                 }));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 173940d..590e5e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -243,7 +243,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
 
                     GridCacheAdapter<Object, Object> c = ((IgniteKernal)grid(i)).internalCache();
 
-                    GridCacheEntryEx<Object, Object> entry = c.peekEx(k);
+                    GridCacheEntryEx entry = c.peekEx(k);
 
                     for (int r = 0; r < 3; r++) {
                         try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
index 5fd76e2..eea54bf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
@@ -149,7 +149,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest {
      */
     private void checkTransactions() {
         for (int i = 0; i < 3; i++) {
-            IgniteTxManager<Object, Object> tm = ((IgniteKernal)grid(i)).context().cache().context().tm();
+            IgniteTxManager tm = ((IgniteKernal)grid(i)).context().cache().context().tm();
 
             assertEquals("Uncommitted transactions found on node [idx=" + i + ", mapSize=" + tm.idMapSize() + ']',
                 0, tm.idMapSize());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index 3d67051..08b913c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -387,7 +387,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
                 assertEquals("2", near.get(2));
                 assertEquals("3", near.get(3));
 
-                GridDhtCacheEntry<Integer, String> entry = dht(primaryGrid(2)).peekExx(2);
+                GridDhtCacheEntry entry = (GridDhtCacheEntry)dht(primaryGrid(2)).peekEx(2);
 
                 if (entry != null)
                     assertNull("Unexpected entry: " + entry, entry.rawGetOrUnmarshal(false));
@@ -627,8 +627,8 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
      * @param key Key.
      * @return Near entry.
      */
-    @Nullable private GridNearCacheEntry<Integer, String> nearEntry(int idx, int key) {
-        return this.<Integer, String>near(idx).peekExx(key);
+    @Nullable private GridNearCacheEntry nearEntry(int idx, int key) {
+        return (GridNearCacheEntry)near(idx).peekEx(key);
     }
 
     /**
@@ -670,7 +670,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
         try {
             long topVer = grid(0).cluster().topologyVersion();
 
-            GridNearCacheEntry<Integer, String> nearEntry1 = nearEntry(0, key);
+            GridNearCacheEntry nearEntry1 = nearEntry(0, key);
 
             info("Peeked entry after lock [hash=" + hash(nearEntry1) + ", nearEntry=" + nearEntry1 + ']');
 
@@ -682,7 +682,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
 
             cache.put(key, val);
 
-            GridNearCacheEntry<Integer, String> nearEntry2 = nearEntry(0, key);
+            GridNearCacheEntry nearEntry2 = nearEntry(0, key);
 
             info("Peeked entry after put [hash=" + hash(nearEntry1) + ", nearEntry=" + nearEntry2 + ']');
 
@@ -695,7 +695,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
             assertEquals(val, dht(0).peek(key));
             assertEquals(val, dht(1).peek(key));
 
-            GridNearCacheEntry<Integer, String> nearEntry3 = nearEntry(0, key);
+            GridNearCacheEntry nearEntry3 = nearEntry(0, key);
 
             info("Peeked entry after peeks [hash=" + hash(nearEntry1) + ", nearEntry=" + nearEntry3 + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
index 1df44f8..b346f54 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
@@ -162,7 +162,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
             assert "2".equals(near.get(2));
             assert "3".equals(near.get(3));
 
-            GridCacheEntryEx<Integer, String> entry = dht.peekEx(2);
+            GridCacheEntryEx entry = dht.peekEx(2);
 
             assert entry == null || entry.rawGetOrUnmarshal(false) == null : "Invalid entry: " + entry;
             assert dht.peek(3) != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index f297427..ed44749 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -224,7 +224,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
             if (dht.context().isNear())
                 dht = dht.context().near().dht();
 
-            GridCacheEntryEx<String, Integer> entry = dht.peekEx(key);
+            GridCacheEntryEx entry = dht.peekEx(key);
 
             assert entry != null;
 
@@ -255,7 +255,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
         for (int i = 0; i < gridCount(); i++) {
             info("Checking grid: " + grid(i).localNode().id());
 
-            GridCacheEntryEx<String, Integer> entry = null;
+            GridCacheEntryEx entry = null;
 
             if (cache(i).affinity().isPrimaryOrBackup(grid(i).localNode(), key)) {
                 GridCacheAdapter<String, Integer> dht = internalCache(jcache(i));
@@ -299,7 +299,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
         }
 
         for (int i = 0; i < gridCount(); i++) {
-            GridCacheEntryEx<String, Integer> entry = null;
+            GridCacheEntryEx entry = null;
 
             if (cache(i).affinity().isPrimaryOrBackup(grid(i).localNode(), key)) {
                 GridCacheAdapter<String, Integer> dht = internalCache(jcache(i));
@@ -340,7 +340,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
         }
 
         for (int i = 0; i < gridCount(); i++) {
-            GridCacheEntryEx<String, Integer> entry = null;
+            GridCacheEntryEx entry = null;
 
             if (cache(i).affinity().isPrimaryOrBackup(grid(i).localNode(), key)) {
                 GridCacheAdapter<String, Integer> dht = internalCache(jcache(i));
@@ -405,7 +405,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
             if (dht.context().isNear())
                 dht = dht.context().near().dht();
 
-            GridCacheEntryEx<String, Integer> entry = dht.peekEx(key);
+            GridCacheEntryEx entry = dht.peekEx(key);
 
             assert entry != null;
 
@@ -435,7 +435,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
             if (dht.context().isNear())
                 dht = dht.context().near().dht();
 
-            GridCacheEntryEx<String, Integer> entry = dht.peekEx(key);
+            GridCacheEntryEx entry = dht.peekEx(key);
 
             assert entry != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index 9cc7ed9..90c37e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
 import org.apache.ignite.internal.processors.cache.distributed.dht.*;
 import org.apache.ignite.internal.util.typedef.*;
@@ -147,8 +148,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
         assertNull(cache1.getAndPut(1, "v1"));
         assertNull(cache1.getAndPut(2, "v2"));
 
-        GridDhtCacheEntry<Integer, String> e1 = (GridDhtCacheEntry<Integer, String>)dht(cache1).entryEx(1);
-        GridDhtCacheEntry<Integer, String> e2 = (GridDhtCacheEntry<Integer, String>)dht(cache2).entryEx(2);
+        GridDhtCacheEntry e1 = (GridDhtCacheEntry)dht(cache1).entryEx(1);
+        GridDhtCacheEntry e2 = (GridDhtCacheEntry)dht(cache2).entryEx(2);
 
         assertNotNull(e1.readers());
 
@@ -215,8 +216,12 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
 
         awaitPartitionMapExchange();
 
-        ((IgniteKernal)g1).internalCache(null).preloader().request(F.asList(1, 2), 2).get();
-        ((IgniteKernal)g2).internalCache(null).preloader().request(F.asList(1, 2), 2).get();
+        GridCacheContext ctx = ((IgniteKernal) g1).internalCache(null).context();
+
+        List<KeyCacheObject> cacheKeys = F.asList(ctx.toCacheKeyObject(1), ctx.toCacheKeyObject(2));
+
+        ((IgniteKernal)g1).internalCache(null).preloader().request(cacheKeys, 2).get();
+        ((IgniteKernal)g2).internalCache(null).preloader().request(cacheKeys, 2).get();
 
         IgniteCache<Integer, String> cache1 = g1.jcache(null);
         IgniteCache<Integer, String> cache2 = g2.jcache(null);
@@ -241,7 +246,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
         assertNull(near(cache1).peekNearOnly(1));
         assertNull(near(cache2).peekNearOnly(1));
 
-        GridDhtCacheEntry<Integer, String> e1 = (GridDhtCacheEntry<Integer, String>)dht(cache1).entryEx(1);
+        GridDhtCacheEntry e1 = (GridDhtCacheEntry)dht(cache1).entryEx(1);
 
         // Store second value in cache.
         assertNull(cache1.getAndPut(2, "v2"));
@@ -257,7 +262,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
         assertNull(near(cache1).peekNearOnly(2));
         assertNull(near(cache2).peekNearOnly(2));
 
-        GridDhtCacheEntry<Integer, String> c2e2 = (GridDhtCacheEntry<Integer, String>)dht(cache2).entryEx(2);
+        GridDhtCacheEntry c2e2 = (GridDhtCacheEntry)dht(cache2).entryEx(2);
 
         // Nodes are backups of each other, so no readers should be added.
         assertFalse(c2e2.readers().contains(n1.id()));
@@ -397,8 +402,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
         // Store a values in cache.
         assertNull(cache1.getAndPut(1, "v1"));
 
-        GridDhtCacheEntry<Integer, String> e1 = (GridDhtCacheEntry<Integer, String>)dht(cache1).peekEx(1);
-        GridDhtCacheEntry<Integer, String> e2 = (GridDhtCacheEntry<Integer, String>)dht(cache2).peekEx(1);
+        GridDhtCacheEntry e1 = (GridDhtCacheEntry)dht(cache1).peekEx(1);
+        GridDhtCacheEntry e2 = (GridDhtCacheEntry)dht(cache2).peekEx(1);
 
         assert e1 != null;
         assert e2 != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index 23b6aa5..fbf4f5f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -266,7 +266,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
 
         assertNull(near(pri).peekEx(CNTR_KEY));
 
-        final GridCacheEntryEx<String, Integer> dhtEntry = dht(pri).peekEx(CNTR_KEY);
+        final GridCacheEntryEx dhtEntry = dht(pri).peekEx(CNTR_KEY);
 
         assertNotNull(dhtEntry);
 
@@ -310,7 +310,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
 
                                 Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP);
 
-                                GridCacheEntryEx<String, Integer> dhtNear = near(pri).peekEx(CNTR_KEY);
+                                GridCacheEntryEx dhtNear = near(pri).peekEx(CNTR_KEY);
 
                                 try (Transaction tx = pri.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
                                     if (DEBUG)
@@ -385,7 +385,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
 
                             UUID nearId = near.cluster().localNode().id();
 
-                            GridCacheEntryEx<String, Integer> nearEntry = near(near).peekEx(CNTR_KEY);
+                            GridCacheEntryEx nearEntry = near(near).peekEx(CNTR_KEY);
 
                             try {
                                 startLatch.countDown();
@@ -504,7 +504,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
         for (Map.Entry<String, Integer> e : cntrs.entrySet())
             assertEquals("Counter check failed on grid [grid=" + e.getKey() +
                 ", dhtEntry=" + dht(G.ignite(e.getKey())).peekEx(CNTR_KEY) +
-                ", nearEntry=" + near(G.ignite(e.getKey())).peekExx(CNTR_KEY) + ']',
+                ", nearEntry=" + near(G.ignite(e.getKey())).peekEx(CNTR_KEY) + ']',
                 exp, e.getValue().intValue());
 
         X.println("*** ");
@@ -556,7 +556,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
 
         assertNull(near(pri).peekEx(CNTR_KEY));
 
-        GridCacheEntryEx<String, Integer> dhtEntry = dht(pri).peekEx(CNTR_KEY);
+        GridCacheEntryEx dhtEntry = dht(pri).peekEx(CNTR_KEY);
 
         assertNotNull(dhtEntry);
 
@@ -627,7 +627,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
 
             UUID nearId = ignite.cluster().localNode().id();
 
-            GridCacheEntryEx<String, Integer> nearEntry = near(near).peekEx(CNTR_KEY);
+            GridCacheEntryEx nearEntry = near(near).peekEx(CNTR_KEY);
 
             try {
                 for (int i = 0; i < RETRIES; i++) {
@@ -713,7 +713,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
 
                     Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP);
 
-                    GridCacheEntryEx<String, Integer> dhtNear = near(pri).peekEx(CNTR_KEY);
+                    GridCacheEntryEx dhtNear = near(pri).peekEx(CNTR_KEY);
 
                     try (Transaction tx = pri.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
                         if (DEBUG)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index 969692e..c3c78c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
@@ -160,7 +160,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             cache1.put(1, "val1");
             cache1.put(2, "val2");
 
-            GridCacheEntryEx<Integer, String> e1 = cache1.peekEx(1);
+            GridCacheEntryEx e1 = cache1.peekEx(1);
 
             assert e1 != null;
 
@@ -193,7 +193,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             assertEquals("val1", cache2.peek(1));
             assertEquals("val2", cache2.peek(2));
 
-            GridCacheEntryEx<Integer, String> e2 = cache2.peekEx(1);
+            GridCacheEntryEx e2 = cache2.peekEx(1);
 
             assert e2 != null;
             assert e2 != e1;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 3110cbc..f4cbdf5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -1019,7 +1019,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
 
             GridCacheAdapter<Object, Object> cache = grid.context().cache().internalCache();
 
-            GridCacheEntryEx<Object, Object> e = cache.peekEx(key);
+            GridCacheEntryEx e = cache.peekEx(key);
 
             if (e == null && cache.context().isNear())
                 e = cache.context().near().dht().peekEx(key);
@@ -1030,7 +1030,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
                 found = true;
 
                 if (wait) {
-                    final GridCacheEntryEx<Object, Object> e0 = e;
+                    final GridCacheEntryEx e0 = e;
 
                     GridTestUtils.waitForCondition(new PA() {
                         @Override public boolean apply() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java
index c09e3db..bf7f94e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java
@@ -208,7 +208,7 @@ public abstract class IgniteCacheExpiryPolicyWithStoreAbstractTest extends Ignit
 
             GridCacheAdapter<Object, Object> cache = grid.context().cache().internalCache();
 
-            GridCacheEntryEx<Object, Object> e = cache.peekEx(key);
+            GridCacheEntryEx e = cache.peekEx(key);
 
             if (e == null && cache.context().isNear())
                 e = cache.context().near().dht().peekEx(key);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java
index a666423..583069b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java
@@ -329,7 +329,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
 
                 for (int key = 0; key < cnt * threads; key++) {
                     if (aff.isPrimary(locNode, key) || aff.isBackup(locNode, key)) {
-                        GridCacheEntryEx<Integer, Integer> entry = cache0.peekEx(key);
+                        GridCacheEntryEx entry = cache0.peekEx(key);
 
                         assertNotNull("Missing entry for key: " + key, entry);
                         assertEquals((Integer)(key < 100 ? -1 : key), entry.rawGetOrUnmarshal(false));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
index 2af01bf..7125b51 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
@@ -191,7 +191,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
             for (int j = 0; j < NODES_CNT; j++) {
                 GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
                     "ctx");
-                Collection<IgniteInternalTx<Object, Object>> txs = ctx.tm().txs();
+                Collection<IgniteInternalTx> txs = ctx.tm().txs();
 
                 assert txs.isEmpty() : "Incomplete transactions: " + txs;
             }
@@ -279,7 +279,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
             for (int j = 0; j < NODES_CNT; j++) {
                 GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
                     "ctx");
-                Collection<IgniteInternalTx<Object, Object>> txs = ctx.tm().txs();
+                Collection<IgniteInternalTx> txs = ctx.tm().txs();
 
                 assert txs.isEmpty() : "Incomplete transactions: " + txs;
             }
@@ -359,7 +359,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
             for (int j = 0; j < NODES_CNT; j++) {
                 GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
                     "ctx");
-                Collection<IgniteInternalTx<Object, Object>> txs = ctx.tm().txs();
+                Collection<IgniteInternalTx> txs = ctx.tm().txs();
 
                 assert txs.isEmpty() : "Incomplete transactions: " + txs;
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
index 8ba8966..f1f58f9 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
@@ -47,18 +47,18 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> {
             ctx,
             new GridCacheSharedContext<>(
                 ctx,
-                new IgniteTxManager<K, V>(),
+                new IgniteTxManager(),
                 new GridCacheVersionManager<K, V>(),
-                new GridCacheMvccManager<K, V>(),
+                new GridCacheMvccManager(),
                 new GridCacheDeploymentManager<K, V>(),
                 new GridCachePartitionExchangeManager<K, V>(),
-                new GridCacheIoManager<K, V>()
+                new GridCacheIoManager()
             ),
             defaultCacheConfiguration(),
-            new GridCacheEventManager<K, V>(),
-            new GridCacheSwapManager<K, V>(false),
+            new GridCacheEventManager(),
+            new GridCacheSwapManager(false),
             new IgniteCacheOsSerializationManager<K, V>(),
-            new GridCacheStoreManager<K, V>(null,
+            new GridCacheStoreManager(null,
                 new IdentityHashMap<CacheStore, ThreadLocal>(),
                 null,
                 new CacheConfiguration()),

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index e3da0b7..640a978 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -2086,9 +2086,10 @@ public class IgniteH2Indexing implements GridQueryIndexing {
             if (cctx.isNear())
                 cctx = cctx.near().dht().context();
 
-            GridCacheSwapEntry e = cctx.swap().read(key, true, true);
+            // TODO IGNITE-51.
+            GridCacheSwapEntry e = cctx.swap().read(cctx.toCacheKeyObject(key), true, true);
 
-            return e != null ? e.value() : null;
+            return e != null ? e.value().value(cctx) : null;
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
index 160bdd6..6134281 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
@@ -266,12 +266,12 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest {
         for (long i = from; i < to; i++) {
             cache.promote(i);
 
-            GridCacheEntryEx<Long, Long> entry = dht(cache).entryEx(i);
+            GridCacheEntryEx entry = dht(cache).entryEx(i);
 
             assert entry != null;
             assert entry.key() != null;
 
-            Long val = entry.rawGet();
+            Long val = entry.rawGet().value(entry.context());
 
             assertNotNull("Value null for key: " + i, val);
             assertEquals(entry.key(), val);
@@ -313,13 +313,13 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest {
 
             GridCacheContext<Long, Object> ctx = cache.dht().context();
 
-            GridCloseableIterator<Map.Entry<byte[], GridCacheSwapEntry<Object>>> it = ctx.swap().iterator(part, true);
+            GridCloseableIterator<Map.Entry<byte[], GridCacheSwapEntry>> it = ctx.swap().iterator(part, true);
 
             assert it != null || vals.isEmpty();
 
             if (it != null) {
                 while (it.hasNext()) {
-                    Map.Entry<byte[], GridCacheSwapEntry<Object>> swapEntry = it.next();
+                    Map.Entry<byte[], GridCacheSwapEntry> swapEntry = it.next();
 
                     Long key = ctx.marshaller().unmarshal(swapEntry.getKey(), ctx.deploy().globalLoader());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
index d78c3a1..826df6a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -635,15 +636,15 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
         for (int i = lowerBound; i < upperBound; i++) {
             cache.promote(i);
 
-            GridCacheEntryEx<Integer, CacheValue> entry = dht(cache).entryEx(i);
+            GridCacheEntryEx entry = dht(cache).entryEx(i);
 
             assert entry != null;
             assert entry.key() != null;
 
-            CacheValue val = entry.rawGet();
+            CacheValue val = CU.value(entry.rawGet(), entry.context());
 
             assert val != null;
-            assert entry.key() == val.value();
+            assert CU.value(entry.key(), entry.context()) == val.value();
             assert entry.version().equals(versions.get(i));
         }
     }


Mime
View raw message