http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicSequenceExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicSequenceExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicSequenceExample.java index 1971b78..d4ad2ce 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicSequenceExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicSequenceExample.java @@ -55,7 +55,7 @@ public final class CacheAtomicSequenceExample { final String seqName = UUID.randomUUID().toString(); // Initialize atomic sequence in grid. - GridCacheAtomicSequence seq = g.cache(CACHE_NAME).dataStructures().atomicSequence(seqName, 0, true); + CacheAtomicSequence seq = g.cache(CACHE_NAME).dataStructures().atomicSequence(seqName, 0, true); // First value of atomic sequence on this node. long firstVal = seq.get(); @@ -96,7 +96,7 @@ public final class CacheAtomicSequenceExample { /** {@inheritDoc} */ @Override public void run() { try { - GridCacheAtomicSequence seq = Ignition.ignite().cache(cacheName).dataStructures(). + CacheAtomicSequence seq = Ignition.ignite().cache(cacheName).dataStructures(). atomicSequence(seqName, 0, true); for (int i = 0; i < RETRIES; i++)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java index f049c8e..eb70edd 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java @@ -58,7 +58,7 @@ public final class CacheAtomicStampedExample { String stamp = UUID.randomUUID().toString(); // Initialize atomic stamped in cache. - GridCacheAtomicStamped<String, String> stamped = g.cache(CACHE_NAME).dataStructures(). + CacheAtomicStamped<String, String> stamped = g.cache(CACHE_NAME).dataStructures(). atomicStamped(stampedName, val, stamp, true); System.out.println("Atomic stamped initial [value=" + stamped.value() + ", stamp=" + stamped.stamp() + ']'); @@ -119,7 +119,7 @@ public final class CacheAtomicStampedExample { /** {@inheritDoc} */ @Override public void run() { try { - GridCacheAtomicStamped<String, String> stamped = Ignition.ignite().cache(cacheName).dataStructures(). + CacheAtomicStamped<String, String> stamped = Ignition.ignite().cache(cacheName).dataStructures(). atomicStamped(stampedName, null, null, true); System.out.println("Atomic stamped [value=" + stamped.value() + ", stamp=" + stamped.stamp() + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheCountDownLatchExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheCountDownLatchExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheCountDownLatchExample.java index ba3a9f9..495d8ac 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheCountDownLatchExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheCountDownLatchExample.java @@ -55,7 +55,7 @@ public class CacheCountDownLatchExample { final String latchName = UUID.randomUUID().toString(); // Initialize count down latch in grid. - GridCacheCountDownLatch latch = g.cache(CACHE_NAME).dataStructures(). + CacheCountDownLatch latch = g.cache(CACHE_NAME).dataStructures(). countDownLatch(latchName, INITIAL_COUNT, false, true); System.out.println("Latch initial value: " + latch.count()); @@ -97,7 +97,7 @@ public class CacheCountDownLatchExample { /** {@inheritDoc} */ @Override public void run() { try { - GridCacheCountDownLatch latch = Ignition.ignite().cache(cacheName).dataStructures(). + CacheCountDownLatch latch = Ignition.ignite().cache(cacheName).dataStructures(). countDownLatch(latchName, 1, false, true); int newCnt = latch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheQueueExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheQueueExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheQueueExample.java index 2e3a27b..5ab64c6 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheQueueExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheQueueExample.java @@ -42,7 +42,7 @@ public class CacheQueueExample { private static final int RETRIES = 20; /** Queue instance. */ - private static GridCacheQueue<String> queue; + private static CacheQueue<String> queue; /** * Executes example. @@ -78,9 +78,9 @@ public class CacheQueueExample { * @return Queue. * @throws IgniteCheckedException If execution failed. */ - private static GridCacheQueue<String> initializeQueue(Ignite g, String queueName) throws IgniteCheckedException { + private static CacheQueue<String> initializeQueue(Ignite g, String queueName) throws IgniteCheckedException { // Initialize new FIFO queue. - GridCacheQueue<String> queue = g.cache(CACHE_NAME).dataStructures().queue(queueName, 0, false, true); + CacheQueue<String> queue = g.cache(CACHE_NAME).dataStructures().queue(queueName, 0, false, true); // Initialize queue items. // We will be use blocking operation and queue size must be appropriated. @@ -182,7 +182,7 @@ public class CacheQueueExample { /** {@inheritDoc} */ @Override public void run() { try { - GridCacheQueue<String> queue = Ignition.ignite().cache(cacheName).dataStructures(). + CacheQueue<String> queue = Ignition.ignite().cache(cacheName).dataStructures(). queue(queueName, 0, false, true); if (put) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheSetExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheSetExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheSetExample.java index 46becd0..cff0046 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheSetExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheSetExample.java @@ -38,7 +38,7 @@ public class CacheSetExample { private static final String CACHE_NAME = "partitioned_tx"; /** Set instance. */ - private static GridCacheSet<String> set; + private static CacheSet<String> set; /** * Executes example. @@ -72,9 +72,9 @@ public class CacheSetExample { * @return Set. * @throws IgniteCheckedException If execution failed. */ - private static GridCacheSet<String> initializeSet(Ignite g, String setName) throws IgniteCheckedException { + private static CacheSet<String> initializeSet(Ignite g, String setName) throws IgniteCheckedException { // Initialize new set. - GridCacheSet<String> set = g.cache(CACHE_NAME).dataStructures().set(setName, false, true); + CacheSet<String> set = g.cache(CACHE_NAME).dataStructures().set(setName, false, true); // Initialize set items. for (int i = 0; i < 10; i++) @@ -173,7 +173,7 @@ public class CacheSetExample { /** {@inheritDoc} */ @Override public void run() { try { - GridCacheSet<String> set = Ignition.ignite().cache(cacheName).dataStructures().set(setName, false, true); + CacheSet<String> set = Ignition.ignite().cache(cacheName).dataStructures().set(setName, false, true); UUID locId = Ignition.ignite().cluster().localNode().id(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java index fc4ea30..d3833cf 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java @@ -27,7 +27,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Starts up an empty node with example cache configuration. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java index a51a02d..c9ae8c9 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java @@ -92,7 +92,7 @@ public class CacheStarSchemaExample { * @throws IgniteCheckedException If failed. */ private static void populateDimensions() throws IgniteCheckedException { - GridCache<Integer, Object> cache = Ignition.ignite().cache(REPLICATED_CACHE_NAME); + Cache<Integer, Object> cache = Ignition.ignite().cache(REPLICATED_CACHE_NAME); DimStore store1 = new DimStore(idGen++, "Store1", "12345", "321 Chilly Dr, NY"); DimStore store2 = new DimStore(idGen++, "Store2", "54321", "123 Windy Dr, San Francisco"); @@ -115,11 +115,11 @@ public class CacheStarSchemaExample { * @throws IgniteCheckedException If failed. */ private static void populateFacts() throws IgniteCheckedException { - GridCache<Integer, Object> dimCache = Ignition.ignite().cache(REPLICATED_CACHE_NAME); - GridCache<Integer, Object> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME); + Cache<Integer, Object> dimCache = Ignition.ignite().cache(REPLICATED_CACHE_NAME); + Cache<Integer, Object> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME); - GridCacheProjection<Integer, DimStore> stores = dimCache.projection(Integer.class, DimStore.class); - GridCacheProjection<Integer, DimProduct> prods = dimCache.projection(Integer.class, DimProduct.class); + CacheProjection<Integer, DimStore> stores = dimCache.projection(Integer.class, DimStore.class); + CacheProjection<Integer, DimProduct> prods = dimCache.projection(Integer.class, DimProduct.class); for (int i = 0; i < 100; i++) { int id = idGen++; @@ -139,13 +139,13 @@ public class CacheStarSchemaExample { * @throws IgniteCheckedException If failed. */ private static void queryStorePurchases() throws IgniteCheckedException { - GridCache<Integer, FactPurchase> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME); + Cache<Integer, FactPurchase> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME); // All purchases for store1. // ======================== // Create cross cache query to get all purchases made at store1. - GridCacheQuery<Map.Entry<Integer, FactPurchase>> storePurchases = factCache.queries().createSqlQuery( + CacheQuery<Map.Entry<Integer, FactPurchase>> storePurchases = factCache.queries().createSqlQuery( FactPurchase.class, "from \"replicated\".DimStore, \"partitioned\".FactPurchase " + "where DimStore.id=FactPurchase.storeId and DimStore.name=?"); @@ -163,10 +163,10 @@ public class CacheStarSchemaExample { * @throws IgniteCheckedException If failed. */ private static void queryProductPurchases() throws IgniteCheckedException { - GridCache<Integer, Object> dimCache = Ignition.ignite().cache(REPLICATED_CACHE_NAME); - GridCache<Integer, FactPurchase> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME); + Cache<Integer, Object> dimCache = Ignition.ignite().cache(REPLICATED_CACHE_NAME); + Cache<Integer, FactPurchase> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME); - GridCacheProjection<Integer, DimProduct> prods = dimCache.projection(Integer.class, DimProduct.class); + CacheProjection<Integer, DimProduct> prods = dimCache.projection(Integer.class, DimProduct.class); // All purchases for certain product made at store2. // ================================================= @@ -179,7 +179,7 @@ public class CacheStarSchemaExample { // Create cross cache query to get all purchases made at store2 // for specified products. - GridCacheQuery<Map.Entry<Integer, FactPurchase>> prodPurchases = factCache.queries().createSqlQuery( + CacheQuery<Map.Entry<Integer, FactPurchase>> prodPurchases = factCache.queries().createSqlQuery( FactPurchase.class, "from \"replicated\".DimStore, \"replicated\".DimProduct, \"partitioned\".FactPurchase " + "where DimStore.id=FactPurchase.storeId and DimProduct.id=FactPurchase.productId " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java index 145ad2a..48fc99a 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java @@ -26,14 +26,14 @@ import org.apache.ignite.cache.query.*; */ public class DimProduct { /** Primary key. */ - @GridCacheQuerySqlField(index = true) + @CacheQuerySqlField(index = true) private int id; /** Product name. */ private String name; /** Product list price. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private float price; /** Available product quantity. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java index 6088e76..34585bd 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java @@ -26,11 +26,11 @@ import org.apache.ignite.cache.query.*; */ public class DimStore { /** Primary key. */ - @GridCacheQuerySqlField(index = true) + @CacheQuerySqlField(index = true) private int id; /** Store name. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private String name; /** Zip code. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java index 9167a74..ed69be9 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java @@ -26,19 +26,19 @@ import org.apache.ignite.cache.query.*; */ public class FactPurchase { /** Primary key. */ - @GridCacheQuerySqlField(index = true) + @CacheQuerySqlField(index = true) private int id; /** Foreign key to store at which purchase occurred. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private int storeId; /** Foreign key to purchased product. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private int productId; /** Purchase price. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private float purchasePrice; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java index 9eb6d43..e97879e 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java @@ -49,7 +49,7 @@ public class CacheStoreExample { System.out.println(); System.out.println(">>> Cache store example started."); - GridCache<Long, Person> cache = g.cache(null); + Cache<Long, Person> cache = g.cache(null); // Clean up caches on all nodes before run. cache.globalClearAll(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java index 7fded3c..9f65d58 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java @@ -24,7 +24,7 @@ import org.apache.ignite.lang.*; /** * Loads data from persistent store at cache startup by calling - * {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method on + * {@link org.apache.ignite.cache.Cache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method on * all nodes. * <p> * Remote nodes should always be started using {@link CacheNodeWithStoreStartup}. @@ -51,7 +51,7 @@ public class CacheStoreLoadDataExample { System.out.println(); System.out.println(">>> Cache store load data example started."); - final GridCache<String, Integer> cache = g.cache(null); + final Cache<String, Integer> cache = g.cache(null); // Clean up caches on all nodes before run. cache.globalClearAll(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java index 93ea2e9..3a6949b 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java @@ -18,7 +18,7 @@ package org.apache.ignite.examples.datagrid.store.dummy; import org.apache.ignite.*; -import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.store.*; import org.apache.ignite.examples.datagrid.store.*; import org.apache.ignite.lang.*; @@ -26,7 +26,6 @@ import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; -import javax.cache.*; import java.util.*; import java.util.concurrent.*; @@ -55,7 +54,7 @@ public class CacheDummyPersonStore extends CacheStoreAdapter<Long, Person> { } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<? extends Long, ? extends Person> entry) { + @Override public void write(javax.cache.Cache.Entry<? extends Long, ? extends Person> entry) { IgniteTx tx = transaction(); Long key = entry.getKey(); @@ -81,7 +80,7 @@ public class CacheDummyPersonStore extends CacheStoreAdapter<Long, Person> { System.out.println(">>> Store loadCache for entry count: " + cnt); - GridCache<Long, Person> cache = ignite.cache(cacheName); + Cache<Long, Person> cache = ignite.cache(cacheName); for (int i = 0; i < cnt; i++) { // Generate dummy person on the fly. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java index a428394..c45c390 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java @@ -51,7 +51,7 @@ public class MemcacheRestExample { System.out.println(); System.out.println(">>> Memcache REST example started."); - GridCache<String, Object> cache = g.cache(null); + Cache<String, Object> cache = g.cache(null); client = startMemcachedClient(host, port); @@ -88,7 +88,7 @@ public class MemcacheRestExample { System.out.println(">>> Current cache size: " + cache.size() + " (expected: 0)."); // Create atomic long. - GridCacheAtomicLong l = cache.dataStructures().atomicLong("atomicLong", 10, true); + CacheAtomicLong l = cache.dataStructures().atomicLong("atomicLong", 10, true); // Increment atomic long by 5 using Memcache client. if (client.incr("atomicLong", 5, 0) == 15) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java index e040401..a6ea36d 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java @@ -29,8 +29,8 @@ import java.util.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Starts up an empty node with cache configuration that contains default cache. @@ -75,7 +75,7 @@ public class MemcacheRestExampleNodeStartup { cacheCfg.setPreloadMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); - GridCacheQueryConfiguration qryCfg = new GridCacheQueryConfiguration(); + CacheQueryConfiguration qryCfg = new CacheQueryConfiguration(); qryCfg.setIndexPrimitiveKey(true); qryCfg.setIndexFixedTyping(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala index 51562c8..e984a38 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala @@ -17,8 +17,8 @@ package org.gridgain.scalar.examples -import org.apache.ignite.cache.GridCacheName -import org.apache.ignite.cache.affinity.GridCacheAffinityKeyMapped +import org.apache.ignite.cache.CacheName +import org.apache.ignite.cache.affinity.CacheAffinityKeyMapped import org.gridgain.scalar.scalar import scalar._ import org.apache.ignite._ @@ -27,7 +27,7 @@ import java.util.concurrent.Callable /** * Example of how to collocate computations and data in GridGain using - * `GridCacheAffinityKeyMapped` annotation as opposed to direct API calls. This + * `CacheAffinityKeyMapped` annotation as opposed to direct API calls. This * example will first populate cache on some node where cache is available, and then * will send jobs to the nodes where keys reside and print out values for those * keys. @@ -65,10 +65,10 @@ object ScalarCacheAffinityExample1 { keys.foreach(key => { val res = grid$.call$( new Callable[String] { - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped def affinityKey(): String = key - @GridCacheName + @CacheName def cacheName(): String = NAME @Nullable def call: String = { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala index 10ac5cf..ac56786 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala @@ -17,7 +17,7 @@ package org.gridgain.scalar.examples -import org.apache.ignite.cache.GridCache +import org.apache.ignite.cache.Cache import org.gridgain.scalar.scalar import scalar._ @@ -43,7 +43,7 @@ object ScalarCacheAffinitySimpleExample extends App { private val NAME = "partitioned" /** Type alias. */ - type Cache = GridCache[Int, String] + type Cache = Cache[Int, String] /* * Note that in case of `LOCAL` configuration, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala index 049fa1f..5d8e72a 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala @@ -17,7 +17,7 @@ package org.gridgain.scalar.examples -import org.apache.ignite.cache.GridCacheEntry +import org.apache.ignite.cache.CacheEntry import org.apache.ignite.events.{IgniteEventType, IgniteEvent} import org.apache.ignite.lang.IgnitePredicate import org.gridgain.scalar.scalar @@ -73,7 +73,7 @@ object ScalarCacheExample extends App { // Put one more value. c += (3.toString -> 11) - val gt10 = (e: GridCacheEntry[String, Int]) => e.peek() > 10 + val gt10 = (e: CacheEntry[String, Int]) => e.peek() > 10 // These should pass the predicate. // Note that the predicate checks current state of entry, not the new value. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala index 550d3b7..4ac6303 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala @@ -17,8 +17,8 @@ package org.gridgain.scalar.examples -import org.apache.ignite.cache.{CacheMode, GridCacheFlag, GridCacheProjection} -import org.apache.ignite.cache.affinity.GridCacheAffinityKey +import org.apache.ignite.cache.{CacheMode, CacheFlag, CacheProjection} +import org.apache.ignite.cache.affinity.CacheAffinityKey import org.gridgain.scalar._ import scalar._ import org.apache.ignite._ @@ -57,7 +57,7 @@ object ScalarCacheQueryExample { initialize() // Cache instance shortcut. - val cache = mkCache[GridCacheAffinityKey[UUID], Person] + val cache = mkCache[CacheAffinityKey[UUID], Person] // Using distributed queries for partitioned cache and local queries for replicated cache. // Since in replicated caches data is available on all nodes, including local one, @@ -91,7 +91,7 @@ object ScalarCacheQueryExample { cache.textReduce( prj, "Master", - (e: Iterable[(GridCacheAffinityKey[UUID], Person)]) => (e.map(_._2.salary).sum, e.size), + (e: Iterable[(CacheAffinityKey[UUID], Person)]) => (e.map(_._2.salary).sum, e.size), (e: Iterable[(Double, Int)]) => e.map(_._1).sum / e.map(_._2).sum ) ) @@ -102,9 +102,9 @@ object ScalarCacheQueryExample { * * @return Cache to use. */ - private def mkCache[K, V]: GridCacheProjection[K, V] = { + private def mkCache[K, V]: CacheProjection[K, V] = { // Using distributed queries. - cache$[K, V](CACHE_NAME).get.flagsOn(GridCacheFlag.SYNC_COMMIT) + cache$[K, V](CACHE_NAME).get.flagsOn(CacheFlag.SYNC_COMMIT) } /** @@ -125,7 +125,7 @@ object ScalarCacheQueryExample { orgCache += (org2.id -> org2) // Person cache projection. - val prnCache = mkCache[GridCacheAffinityKey[UUID], Person] + val prnCache = mkCache[CacheAffinityKey[UUID], Person] // People. val p1 = Person(org1, "John", "Doe", 2000, "John Doe has Master Degree.") @@ -192,7 +192,7 @@ private case class Person( val orgId = org.id /** Affinity key for this person. */ - val key = new GridCacheAffinityKey[UUID](id, org.id) + val key = new CacheAffinityKey[UUID](id, org.id) /** * `toString` implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala index e4b39d2..d3375f5 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala @@ -17,7 +17,7 @@ package org.gridgain.scalar.examples -import org.apache.ignite.cache.GridCacheProjection +import org.apache.ignite.cache.CacheProjection import org.gridgain.scalar.scalar import org.gridgain.scalar.scalar._ import scala.collection.JavaConversions._ @@ -100,8 +100,8 @@ object ScalarSnowflakeSchemaExample { val dimCache = grid$.cache[Int, Object](REPL_CACHE_NAME) val factCache = grid$.cache[Int, FactPurchase](PART_CACHE_NAME) - val stores: GridCacheProjection[Int, DimStore] = dimCache.viewByType(classOf[Int], classOf[DimStore]) - val prods: GridCacheProjection[Int, DimProduct] = dimCache.viewByType(classOf[Int], classOf[DimProduct]) + val stores: CacheProjection[Int, DimStore] = dimCache.viewByType(classOf[Int], classOf[DimStore]) + val prods: CacheProjection[Int, DimProduct] = dimCache.viewByType(classOf[Int], classOf[DimProduct]) for (i <- 1 to 100) { val store: DimStore = rand(stores.values) @@ -137,7 +137,7 @@ object ScalarSnowflakeSchemaExample { val dimCache = grid$.cache[Int, Object](REPL_CACHE_NAME) val factCache = grid$.cache[Int, FactPurchase](PART_CACHE_NAME) - val prods: GridCacheProjection[Int, DimProduct] = dimCache.viewByType(classOf[Int], classOf[DimProduct]) + val prods: CacheProjection[Int, DimProduct] = dimCache.viewByType(classOf[Int], classOf[DimProduct]) val p1: DimProduct = rand(prods.values) val p2: DimProduct = rand(prods.values) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java index 28ad4ec..6d7d046 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java @@ -44,9 +44,9 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.testframework.GridTestUtils.*; /** @@ -509,7 +509,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst ((GridKernal)g).internalCache(PARTITIONED_CACHE_NAME).context().affinity(), "aff"); - GridCacheAffinityFunction aff = getFieldValue(affCache, "aff"); + CacheAffinityFunction aff = getFieldValue(affCache, "aff"); info("Affinity [nodeId=" + g.cluster().localNode().id() + ", affinity=" + aff + "]"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java index cd5f85c..2a405d8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java @@ -33,7 +33,7 @@ public class ClientPutPortableTask extends TaskSingleJobSplitAdapter { @Override protected Object executeJob(int gridSize, Object arg) throws IgniteCheckedException { String cacheName = (String)arg; - GridCache<Object, Object> cache = ignite.cache(cacheName); + Cache<Object, Object> cache = ignite.cache(cacheName); ClientTestPortable p = new ClientTestPortable(100, true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java index 40a8486..fe2b290 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java @@ -28,7 +28,7 @@ import java.util.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests topology caching. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java index 07971fa..7b3c862 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java @@ -29,7 +29,7 @@ import java.util.*; import static org.apache.ignite.client.GridClientCacheFlag.*; /** - * Tests conversions between GridClientCacheFlag and GridCacheFlag. + * Tests conversions between GridClientCacheFlag and CacheFlag. */ public class ClientCacheFlagsCodecTest extends TestCase { /** @@ -44,7 +44,7 @@ public class ClientCacheFlagsCodecTest extends TestCase { assertTrue(bits != 0); - GridCacheFlag[] out = GridCacheCommandHandler.parseCacheFlags(bits); + CacheFlag[] out = GridCacheCommandHandler.parseCacheFlags(bits); assertEquals(1, out.length); assertEquals(f.name(), out[0].name()); @@ -72,11 +72,11 @@ public class ClientCacheFlagsCodecTest extends TestCase { int bits = GridClientConnection.encodeCacheFlags(flagSet); - GridCacheFlag[] out = GridCacheCommandHandler.parseCacheFlags(bits); + CacheFlag[] out = GridCacheCommandHandler.parseCacheFlags(bits); assertEquals(flagSet.contains(KEEP_PORTABLES) ? flagSet.size() - 1 : flagSet.size(), out.length); - for (GridCacheFlag f : out) { + for (CacheFlag f : out) { assertTrue(flagSet.contains(GridClientCacheFlag.valueOf(f.name()))); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java index e6212da..35e7c5e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; -import static org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction.*; +import static org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction.*; /** * Client's partitioned affinity tests. @@ -285,11 +285,11 @@ public class ClientPartitionAffinitySelfTest extends GridCommonAbstractTest { aff.setHashIdResolver(HASH_ID_RSLVR); - GridCacheConsistentHashAffinityFunction srvAff = new GridCacheConsistentHashAffinityFunction(); + CacheConsistentHashAffinityFunction srvAff = new CacheConsistentHashAffinityFunction(); getTestResources().inject(srvAff); - srvAff.setHashIdResolver(new GridCacheAffinityNodeIdHashResolver()); + srvAff.setHashIdResolver(new CacheAffinityNodeIdHashResolver()); // Define keys to test affinity for. Collection<String> keys = new ArrayList<>( @@ -339,12 +339,12 @@ public class ClientPartitionAffinitySelfTest extends GridCommonAbstractTest { * @param nodes Client topology. * @param srvNodes Server topology. */ - private void assertSameAffinity(Object key, GridClientDataAffinity aff, GridCacheAffinityFunction srvAff, + private void assertSameAffinity(Object key, GridClientDataAffinity aff, CacheAffinityFunction srvAff, Collection<? extends GridClientNode> nodes, Collection<ClusterNode> srvNodes) { GridClientNode node = aff.node(key, nodes); int part = srvAff.partition(key); - GridCacheAffinityFunctionContext ctx = new GridCacheAffinityFunctionContextImpl(new ArrayList<>(srvNodes), + CacheAffinityFunctionContext ctx = new GridCacheAffinityFunctionContextImpl(new ArrayList<>(srvNodes), null, null, 1, 0); ClusterNode srvNode = F.first(srvAff.assignPartitions(ctx).get(part)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java index 19068b9..6a58ef1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -49,9 +49,9 @@ import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests basic client behavior with multiple nodes. @@ -400,7 +400,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract public void testInvalidateFlag() throws Exception { GridEx g0 = grid(0); - GridCache<String, String> cache = g0.cache(PARTITIONED_CACHE_NAME); + Cache<String, String> cache = g0.cache(PARTITIONED_CACHE_NAME); String key = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java index 7a3c13f..a746c4b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java @@ -21,6 +21,7 @@ import junit.framework.*; import net.sf.json.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.compute.*; @@ -37,7 +38,6 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.configuration.*; import java.io.*; import java.util.*; @@ -46,7 +46,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.testframework.GridTestUtils.*; /** @@ -464,8 +464,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testPut() throws Exception { - GridCache<String, String> dfltCache = grid().cache(null); - GridCache<Object, Object> namedCache = grid().cache(CACHE_NAME); + Cache<String, String> dfltCache = grid().cache(null); + Cache<Object, Object> namedCache = grid().cache(CACHE_NAME); GridClientData dfltData = client.data(); @@ -871,14 +871,14 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { assertNotNull(datas[0]); assertNotNull(datas[1]); - GridCache[] caches = new GridCache[] { + Cache[] caches = new Cache[] { grid().cache(null), grid().cache(CACHE_NAME) }; for (int i = 0; i < datas.length; i++) { GridClientData data = datas[i]; - GridCache<String, String> cache = (GridCache<String, String>)caches[i]; + Cache<String, String> cache = (Cache<String, String>)caches[i]; assertFalse(data.cas("key", null, null)); assertTrue(cache.putx("key", "val")); @@ -962,7 +962,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { GridClientDataMetrics m = dfltData.metrics(); - GridCacheMetrics metrics = grid().cache(null).metrics(); + CacheMetrics metrics = grid().cache(null).metrics(); assertNotNull(m); assertEquals(metrics.reads(), m.reads()); @@ -1093,10 +1093,10 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { assertEquals(grid().localNode().id(), node.nodeId()); assertEquals(4, node.caches().size()); - Integer replica = grid().localNode().attribute(GridCacheConsistentHashAffinityFunction.DFLT_REPLICA_COUNT_ATTR_NAME); + Integer replica = grid().localNode().attribute(CacheConsistentHashAffinityFunction.DFLT_REPLICA_COUNT_ATTR_NAME); if (replica == null) - replica = GridCacheConsistentHashAffinityFunction.DFLT_REPLICA_COUNT; + replica = CacheConsistentHashAffinityFunction.DFLT_REPLICA_COUNT; assertEquals((int)replica, node.replicaCount()); @@ -1586,7 +1586,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<? extends Object, ? extends Object> e) { + @Override public void write(javax.cache.Cache.Entry<? extends Object, ? extends Object> e) { map.put(e.getKey(), e.getValue()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java index f7decdf..fd29292 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java @@ -89,7 +89,7 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest { /** * @return Cache. */ - @Override protected <K, V> GridCache<K, V> cache() { + @Override protected <K, V> Cache<K, V> cache() { return grid(0).cache(null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index 40cfc63..b82b2eb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -38,7 +38,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * TCP protocol test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java index fe51927..a97e5f9 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * TCP protocol test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java index 9ccc397..0e8f36e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java @@ -135,7 +135,7 @@ public class RestProcessorTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If failed. */ private void populateCache() throws IgniteCheckedException { - GridCache<String, Object> cache = G.ignite().cache(null); + Cache<String, Object> cache = G.ignite().cache(null); cache.put("int", intValue()); cache.put("string", "cacheString"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java index ced60d0..1f15f1d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java @@ -38,7 +38,7 @@ import java.util.*; import static org.apache.ignite.client.GridClientProtocol.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test for {@code GridTaskCommandHandler} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java index e2f00a1..aa0d6d3 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java @@ -31,9 +31,9 @@ import java.io.*; import java.sql.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests for complex queries (joins, etc.). @@ -77,20 +77,20 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGrids(3); - GridCache<String, Organization> orgCache = grid(0).cache(null); + Cache<String, Organization> orgCache = grid(0).cache(null); assert orgCache != null; orgCache.put("o1", new Organization(1, "A")); orgCache.put("o2", new Organization(2, "B")); - GridCache<GridCacheAffinityKey<String>, Person> personCache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null); assert personCache != null; - personCache.put(new GridCacheAffinityKey<>("p1", "o1"), new Person(1, "John White", 25, 1)); - personCache.put(new GridCacheAffinityKey<>("p2", "o1"), new Person(2, "Joe Black", 35, 1)); - personCache.put(new GridCacheAffinityKey<>("p3", "o2"), new Person(3, "Mike Green", 40, 2)); + personCache.put(new CacheAffinityKey<>("p1", "o1"), new Person(1, "John White", 25, 1)); + personCache.put(new CacheAffinityKey<>("p2", "o1"), new Person(2, "Joe Black", 35, 1)); + personCache.put(new CacheAffinityKey<>("p3", "o2"), new Person(3, "Mike Green", 40, 2)); Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver"); } @@ -258,19 +258,19 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { @SuppressWarnings("UnusedDeclaration") private static class Person implements Serializable { /** ID. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int id; /** Name. */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private final String name; /** Age. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int age; /** Organization ID. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int orgId; /** @@ -297,11 +297,11 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { @SuppressWarnings("UnusedDeclaration") private static class Organization implements Serializable { /** ID. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int id; /** Name. */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private final String name; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java index e8efabd..daac5f8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.sql.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests for empty cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java index 04a46d3..ae6f6fa 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java @@ -29,7 +29,7 @@ import java.sql.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.jdbc.IgniteJdbcDriver.*; /** @@ -55,7 +55,7 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { cache.setCacheMode(LOCAL); cache.setWriteSynchronizationMode(FULL_SYNC); - GridCacheQueryConfiguration qryCfg = new GridCacheQueryConfiguration(); + CacheQueryConfiguration qryCfg = new CacheQueryConfiguration(); qryCfg.setIndexPrimitiveKey(true); @@ -78,14 +78,14 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(2); - GridCache<Object, Object> cache1 = grid(0).cache(CACHE_NAME); + Cache<Object, Object> cache1 = grid(0).cache(CACHE_NAME); assert cache1 != null; assert cache1.putx("key1", 1); assert cache1.putx("key2", 2); - GridCache<Object, Object> cache2 = grid(1).cache(CACHE_NAME); + Cache<Object, Object> cache2 = grid(1).cache(CACHE_NAME); assert cache2 != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java index a0b2733..e764ef6 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java @@ -33,7 +33,7 @@ import java.util.*; import static java.sql.Types.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Metadata tests. @@ -72,20 +72,20 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(3); - GridCache<String, Organization> orgCache = grid(0).cache(null); + Cache<String, Organization> orgCache = grid(0).cache(null); assert orgCache != null; orgCache.put("o1", new Organization(1, "A")); orgCache.put("o2", new Organization(2, "B")); - GridCache<GridCacheAffinityKey<String>, Person> personCache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null); assert personCache != null; - personCache.put(new GridCacheAffinityKey<>("p1", "o1"), new Person("John White", 25, 1)); - personCache.put(new GridCacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1)); - personCache.put(new GridCacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2)); + personCache.put(new CacheAffinityKey<>("p1", "o1"), new Person("John White", 25, 1)); + personCache.put(new CacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1)); + personCache.put(new CacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2)); Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver"); } @@ -284,15 +284,15 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { @SuppressWarnings("UnusedDeclaration") private static class Person implements Serializable { /** Name. */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private final String name; /** Age. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int age; /** Organization ID. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int orgId; /** @@ -317,11 +317,11 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { @SuppressWarnings("UnusedDeclaration") private static class Organization implements Serializable { /** ID. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int id; /** Name. */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private final String name; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java index eaa62df..5cbb3d8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java @@ -33,7 +33,7 @@ import java.util.Date; import static java.sql.Types.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Prepared statement test. @@ -78,7 +78,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(3); - GridCache<Integer, TestObject> cache = grid(0).cache(null); + Cache<Integer, TestObject> cache = grid(0).cache(null); assert cache != null; @@ -657,63 +657,63 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { @SuppressWarnings("UnusedDeclaration") private static class TestObject implements Serializable { /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private final int id; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Boolean boolVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Byte byteVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Short shortVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Integer intVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Long longVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Float floatVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Double doubleVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private BigDecimal bigVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private String strVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private byte[] arrVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Date dateVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Time timeVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Timestamp tsVal; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private URL urlVal; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java index 9f9b58c..bdcc180 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java @@ -36,7 +36,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Result set test. @@ -85,7 +85,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(3); - GridCache<Integer, TestObject> cache = grid(0).cache(null); + Cache<Integer, TestObject> cache = grid(0).cache(null); assert cache != null; @@ -528,75 +528,75 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { @SuppressWarnings("UnusedDeclaration") private static class TestObject implements Serializable { /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int id; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private Boolean boolVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private Byte byteVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private Short shortVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private Integer intVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private Long longVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private Float floatVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private Double doubleVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private BigDecimal bigVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private String strVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private byte[] arrVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private Date dateVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private Time timeVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private Timestamp tsVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private URL urlVal; /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private TestObjectField f1 = new TestObjectField(100, "AAAA"); /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private TestObjectField f2 = new TestObjectField(500, "BBBB"); /** */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private TestObjectField f3; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java index ff41d23..b833bdd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java @@ -30,7 +30,7 @@ import java.io.*; import java.sql.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Statement test. @@ -78,7 +78,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(3); - GridCache<String, Person> cache = grid(0).cache(null); + Cache<String, Person> cache = grid(0).cache(null); assert cache != null; @@ -251,19 +251,19 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { @SuppressWarnings("UnusedDeclaration") private static class Person implements Serializable { /** ID. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int id; /** First name. */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private final String firstName; /** Last name. */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private final String lastName; /** Age. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int age; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/resources/spring-cache.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml index 5666cd1..d843f9e 100644 --- a/modules/clients/src/test/resources/spring-cache.xml +++ b/modules/clients/src/test/resources/spring-cache.xml @@ -92,7 +92,7 @@ <!-- Allow to index primitive values. --> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> <!-- Index primitives. --> <property name="indexPrimitiveKey" value="true"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/resources/spring-server-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml index 100da01..ab3a263 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -142,7 +142,7 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="affinity"> - <bean class="org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction"> <constructor-arg value="1"/> </bean> </property> @@ -153,10 +153,10 @@ <property name="queryIndexEnabled" value="true"/> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> <property name="typeMetadata"> <list> - <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.CacheQueryTypeMetadata"> <property name="type" value="GridPortablePerson"/> <property name="ascendingFields"> <map> @@ -174,7 +174,7 @@ </list> </property> </bean> - <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.CacheQueryTypeMetadata"> <property name="type" value="GridImplicitPortablePerson"/> <property name="ascendingFields"> <map> @@ -187,7 +187,7 @@ </map> </property> </bean> - <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.CacheQueryTypeMetadata"> <property name="type" value="GridNoDefPortablePerson"/> <property name="ascendingFields"> <map> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/clients/src/test/resources/spring-server-ssl-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml index 68da837..3ef3ace 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -126,7 +126,7 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="affinity"> - <bean class="org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction"> <constructor-arg value="1"/> </bean> </property> @@ -137,10 +137,10 @@ <property name="queryIndexEnabled" value="true"/> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> <property name="typeMetadata"> <list> - <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.CacheQueryTypeMetadata"> <property name="type" value="GridPortablePerson"/> <property name="ascendingFields"> <map> @@ -158,7 +158,7 @@ </list> </property> </bean> - <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.CacheQueryTypeMetadata"> <property name="type" value="GridImplicitPortablePerson"/> <property name="ascendingFields"> <map> @@ -171,7 +171,7 @@ </map> </property> </bean> - <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.CacheQueryTypeMetadata"> <property name="type" value="GridNoDefPortablePerson"/> <property name="ascendingFields"> <map> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java index 1565130..ef4e66c 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@ -43,7 +43,7 @@ import java.util.concurrent.*; * <p> * In addition to {@link ClusterGroup} functionality, from here you can get the following: * <ul> - * <li>{@link org.apache.ignite.cache.GridCache} - functionality for in-memory distributed cache.</li> + * <li>{@link org.apache.ignite.cache.Cache} - functionality for in-memory distributed cache.</li> * <li>{@link IgniteDataLoader} - functionality for loading data large amounts of data into cache.</li> * <li>{@link IgniteFs} - functionality for distributed Hadoop-compliant in-memory file system and map-reduce.</li> * <li>{@link IgniteStreamer} - functionality for streaming events workflow with queries and indexes into rolling windows.</li> @@ -217,7 +217,7 @@ public interface Ignite extends AutoCloseable { * @see IgniteFsConfiguration#getDataCacheName() * @see IgniteFsConfiguration#getMetaCacheName() */ - public <K, V> GridCache<K, V> cache(@Nullable String name); + public <K, V> Cache<K, V> cache(@Nullable String name); /** * Gets all configured caches. @@ -228,7 +228,7 @@ public interface Ignite extends AutoCloseable { * @see IgniteFsConfiguration#getMetaCacheName() * @return All configured caches. */ - public Collection<GridCache<?, ?>> caches(); + public Collection<Cache<?, ?>> caches(); /** * Gets an instance of {@link IgniteCache} API. {@code IgniteCache} is a fully-compatible http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java index e187cc1..462ddf2 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java @@ -242,8 +242,8 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura ExecutorService svc = Executors.newFixedThreadPool(threadCnt); try { - for (GridCache<?, ?> cache : first.caches()) { - GridCache<Object, Object> cache0 = first.cache(cache.name()); + for (Cache<?, ?> cache : first.caches()) { + Cache<Object, Object> cache0 = first.cache(cache.name()); for (String warmupMethod : warmupMethods) { Collection<Future> futs = new ArrayList<>(threadCnt); @@ -349,10 +349,10 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura if (!matches(reduced, ccfg)) { CacheConfiguration ccfgCp = new CacheConfiguration(ccfg); - if (ccfgCp.getDistributionMode() == GridCacheDistributionMode.CLIENT_ONLY) - ccfgCp.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - else if (ccfgCp.getDistributionMode() == GridCacheDistributionMode.NEAR_ONLY) - ccfgCp.setDistributionMode(GridCacheDistributionMode.NEAR_PARTITIONED); + if (ccfgCp.getDistributionMode() == CacheDistributionMode.CLIENT_ONLY) + ccfgCp.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + else if (ccfgCp.getDistributionMode() == CacheDistributionMode.NEAR_ONLY) + ccfgCp.setDistributionMode(CacheDistributionMode.NEAR_PARTITIONED); ccfgCp.setCacheStoreFactory(null); ccfgCp.setWriteBehindEnabled(false); @@ -411,12 +411,12 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura */ private abstract class BaseWarmupCallable implements Callable<Object> { /** Cache. */ - protected final GridCache<Object, Object> cache; + protected final Cache<Object, Object> cache; /** * @param cache Cache. */ - protected BaseWarmupCallable(GridCache<Object, Object> cache) { + protected BaseWarmupCallable(Cache<Object, Object> cache) { this.cache = cache; } @@ -446,7 +446,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura /** * @param cache Cache. */ - private GetCallable(GridCache<Object, Object> cache) { + private GetCallable(Cache<Object, Object> cache) { super(cache); } @@ -463,7 +463,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura /** * @param cache Cache. */ - private PutCallable(GridCache<Object, Object> cache) { + private PutCallable(Cache<Object, Object> cache) { super(cache); } @@ -480,7 +480,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura /** * @param cache Cache. */ - private PutxCallable(GridCache<Object, Object> cache) { + private PutxCallable(Cache<Object, Object> cache) { super(cache); } @@ -497,7 +497,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura /** * @param cache Cache. */ - private RemoveCallable(GridCache<Object, Object> cache) { + private RemoveCallable(Cache<Object, Object> cache) { super(cache); } @@ -514,7 +514,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura /** * @param cache Cache. */ - private RemovexCallable(GridCache<Object, Object> cache) { + private RemovexCallable(Cache<Object, Object> cache) { super(cache); } @@ -531,7 +531,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura /** * @param cache Cache. */ - private PutIfAbsentCallable(GridCache<Object, Object> cache) { + private PutIfAbsentCallable(Cache<Object, Object> cache) { super(cache); } @@ -548,7 +548,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura /** * @param cache Cache. */ - private ReplaceCallable(GridCache<Object, Object> cache) { + private ReplaceCallable(Cache<Object, Object> cache) { super(cache); }
