IGNITE-45 - renaimings
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/34046ec8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/34046ec8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/34046ec8 Branch: refs/heads/ignite-45 Commit: 34046ec8b7d65fb71b6ceaac10c21030d94cc882 Parents: 02dcd38 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Mon Mar 23 17:51:59 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Mon Mar 23 17:52:00 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/schema/Demo.java | 2 +- .../examples/datagrid/CacheAffinityExample.java | 4 +- .../examples/datagrid/CacheQueryExample.java | 14 +-- .../starschema/CacheStarSchemaExample.java | 4 +- .../client/memcache/MemcacheRestExample.java | 2 +- .../java8/datagrid/CacheAffinityExample.java | 4 +- .../examples/ScalarSnowflakeSchemaExample.scala | 4 +- .../integration/ClientAbstractSelfTest.java | 4 +- .../rest/AbstractRestProcessorSelfTest.java | 2 +- .../rest/RestBinaryProtocolSelfTest.java | 72 ++++++------ .../rest/RestMemcacheProtocolSelfTest.java | 80 +++++++------- .../processors/rest/RestProcessorTest.java | 3 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 5 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 4 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +- .../jdbc/JdbcPreparedStatementSelfTest.java | 2 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 2 +- .../loadtests/client/ClientTcpSslLoadTest.java | 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 2 +- .../org/apache/ignite/cache/CacheManager.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../configuration/CacheConfiguration.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../processors/cache/EvictableEntryImpl.java | 2 +- .../internal/processors/cache/GridCache.java | 2 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheIterator.java | 2 +- .../processors/cache/GridCacheKeySet.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../cache/GridCacheValueCollection.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 2 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../visor/cache/VisorCacheClearTask.java | 2 +- .../visor/cache/VisorCacheLoadTask.java | 2 +- .../apache/ignite/GridTestStoreNodeStartup.java | 2 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 2 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 4 +- .../GridProjectionForCachesSelfTest.java | 4 +- .../ignite/internal/GridStartStopSelfTest.java | 4 +- .../checkpoint/GridCheckpointTaskSelfTest.java | 4 +- .../GridDeploymentMessageCountSelfTest.java | 6 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +- .../GridAffinityProcessorAbstractSelfTest.java | 2 +- .../GridCacheAbstractFailoverSelfTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 46 ++++---- .../GridCacheAbstractLocalStoreSelfTest.java | 10 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 80 +++++++------- .../GridCacheAbstractRemoveFailureTest.java | 4 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- ...acheAbstractUsersAffinityMapperSelfTest.java | 2 +- .../cache/GridCacheAffinityRoutingSelfTest.java | 4 +- .../GridCacheAtomicMessageCountSelfTest.java | 2 +- .../cache/GridCacheBasicApiAbstractTest.java | 31 +++--- .../cache/GridCacheClearAllSelfTest.java | 14 +-- .../cache/GridCacheClearLocallySelfTest.java | 2 +- .../cache/GridCacheConcurrentMapSelfTest.java | 10 +- .../cache/GridCacheConcurrentMapTest.java | 6 +- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- ...idCacheConfigurationConsistencySelfTest.java | 2 +- .../GridCacheDaemonNodeAbstractSelfTest.java | 4 +- .../cache/GridCacheDeploymentSelfTest.java | 18 +-- .../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +- .../cache/GridCacheEntryVersionSelfTest.java | 4 +- .../GridCacheEvictionEventAbstractTest.java | 2 +- .../GridCacheFinishPartitionsSelfTest.java | 10 +- .../cache/GridCacheIncrementTransformTest.java | 2 +- .../GridCacheInterceptorAbstractSelfTest.java | 12 +- .../cache/GridCacheIteratorPerformanceTest.java | 6 +- .../cache/GridCacheKeyCheckSelfTest.java | 6 +- .../processors/cache/GridCacheLeakTest.java | 2 +- .../GridCacheMarshallerTxAbstractTest.java | 10 +- .../GridCacheMarshallingNodeJoinSelfTest.java | 2 +- .../cache/GridCacheMemoryModeSelfTest.java | 2 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 2 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 4 +- ...ridCacheMultinodeUpdateAbstractSelfTest.java | 6 +- .../cache/GridCacheMvccManagerSelfTest.java | 2 +- .../cache/GridCacheNestedTxAbstractTest.java | 12 +- .../cache/GridCacheObjectToStringSelfTest.java | 2 +- ...HeapMultiThreadedUpdateAbstractSelfTest.java | 17 ++- ...CacheOffHeapMultiThreadedUpdateSelfTest.java | 14 +-- .../GridCacheOffHeapTieredAbstractSelfTest.java | 41 ++++--- ...heOffHeapTieredEvictionAbstractSelfTest.java | 8 +- .../cache/GridCacheOffheapUpdateSelfTest.java | 8 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 12 +- .../GridCacheOrderedPreloadingSelfTest.java | 2 +- .../cache/GridCacheP2PUndeploySelfTest.java | 4 +- .../cache/GridCachePartitionedGetSelfTest.java | 8 +- .../GridCachePreloadingEvictionsSelfTest.java | 8 +- .../cache/GridCachePutAllFailoverSelfTest.java | 7 +- .../processors/cache/GridCachePutAllTask.java | 2 +- .../GridCacheReferenceCleanupSelfTest.java | 10 +- .../cache/GridCacheReloadSelfTest.java | 3 +- ...ridCacheReplicatedSynchronousCommitTest.java | 6 +- .../GridCacheReturnValueTransferSelfTest.java | 2 +- .../cache/GridCacheSlowTxWarnTest.java | 2 +- .../processors/cache/GridCacheStopSelfTest.java | 2 +- .../cache/GridCacheStoreValueBytesSelfTest.java | 3 +- .../cache/GridCacheSwapPreloadSelfTest.java | 8 +- ...cheTransactionalAbstractMetricsSelfTest.java | 8 +- .../cache/GridCacheTtlManagerLoadTest.java | 2 +- .../cache/GridCacheTtlManagerSelfTest.java | 6 +- .../GridCacheValueBytesPreloadingSelfTest.java | 10 +- ...idCacheValueConsistencyAbstractSelfTest.java | 5 +- .../GridCacheVariableTopologySelfTest.java | 2 +- ...BehindStorePartitionedMultiNodeSelfTest.java | 6 +- .../IgniteCacheAbstractStopBusySelfTest.java | 2 +- .../cache/IgniteCacheAbstractTest.java | 2 +- ...niteCacheCopyOnReadDisabledAbstractTest.java | 2 +- .../cache/IgniteCacheDynamicStopSelfTest.java | 2 +- .../IgniteCacheEntryListenerAbstractTest.java | 6 +- .../cache/IgniteCacheStartStopLoadTest.java | 4 +- .../cache/IgniteCacheTxPreloadNoWriteTest.java | 3 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 42 +++---- ...tAllUpdateNonPreloadedPartitionSelfTest.java | 2 +- .../cache/IgniteStaticCacheStartSelfTest.java | 4 +- .../IgniteTxConcurrentGetAbstractTest.java | 4 +- .../IgniteTxExceptionAbstractSelfTest.java | 32 +++--- .../cache/IgniteTxMultiNodeAbstractTest.java | 44 ++++---- .../IgniteTxMultiThreadedAbstractTest.java | 2 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 3 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 32 +++--- ...IgniteCacheAbstractExecutionContextTest.java | 4 +- ...eAbstractDataStructuresFailoverSelfTest.java | 2 +- .../GridCacheSequenceApiSelfAbstractTest.java | 2 +- .../IgniteAtomicLongApiAbstractSelfTest.java | 2 +- ...idCachePartitionedNodeRestartTxSelfTest.java | 24 ++-- ...PartitionedQueueCreateMultiNodeSelfTest.java | 2 +- ...tractDistributedByteArrayValuesSelfTest.java | 6 +- .../GridCacheAbstractJobExecutionTest.java | 10 +- .../GridCacheAbstractNodeRestartSelfTest.java | 10 +- .../GridCacheAbstractPrimarySyncSelfTest.java | 2 +- .../GridCacheAtomicTimeoutSelfTest.java | 8 +- .../GridCacheBasicOpAbstractTest.java | 26 ++--- .../GridCacheClientModesAbstractSelfTest.java | 8 +- .../GridCacheEntrySetAbstractSelfTest.java | 2 +- ...heExpiredEntriesPreloadAbstractSelfTest.java | 2 +- ...GridCacheLoadingConcurrentGridStartTest.java | 6 +- .../distributed/GridCacheLockAbstractTest.java | 5 +- .../distributed/GridCacheMixedModeSelfTest.java | 2 +- .../GridCacheMultiNodeAbstractTest.java | 10 +- .../GridCacheMultiNodeLockAbstractTest.java | 14 +-- ...dCacheMultithreadedFailoverAbstractTest.java | 4 +- .../GridCacheNodeFailureAbstractTest.java | 4 +- ...dCachePartitionedAffinityFilterSelfTest.java | 3 +- ...chePartitionedReloadAllAbstractSelfTest.java | 2 +- .../GridCachePreloadEventsAbstractSelfTest.java | 4 +- ...GridCachePreloadRestartAbstractSelfTest.java | 4 +- .../GridCacheTransformEventSelfTest.java | 2 +- .../IgniteCacheSystemTransactionsSelfTest.java | 2 +- .../IgniteCrossCacheTxStoreSelfTest.java | 18 +-- ...iteTxConsistencyRestartAbstractSelfTest.java | 4 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 8 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 16 +-- .../IgniteTxTimeoutAbstractTest.java | 2 +- ...tPartitionedOnlyByteArrayValuesSelfTest.java | 8 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 32 +++--- .../dht/GridCacheColocatedDebugTest.java | 109 +++++++++---------- ...eColocatedOptimisticTransactionSelfTest.java | 2 +- .../dht/GridCacheDhtEntrySelfTest.java | 3 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 2 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 16 +-- .../dht/GridCacheDhtMappingSelfTest.java | 3 +- .../dht/GridCacheDhtMultiBackupTest.java | 4 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 10 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 21 ++-- .../GridCacheDhtPreloadDisabledSelfTest.java | 8 +- .../GridCacheDhtPreloadMessageCountTest.java | 6 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadSelfTest.java | 18 +-- .../GridCacheDhtPreloadStartStopSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 24 ++-- ...ePartitionedNearDisabledMetricsSelfTest.java | 10 +- ...idCachePartitionedPreloadEventsSelfTest.java | 4 +- ...dCachePartitionedTopologyChangeSelfTest.java | 12 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 8 +- .../dht/IgniteTxReentryColocatedSelfTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- .../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 4 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 4 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 4 +- ...AtomicPartitionedTckMetricsSelfTestImpl.java | 8 +- .../near/GridCacheGetStoreErrorSelfTest.java | 2 +- .../near/GridCacheNearEvictionSelfTest.java | 6 +- .../near/GridCacheNearMetricsSelfTest.java | 30 ++--- .../near/GridCacheNearMultiGetSelfTest.java | 4 +- .../near/GridCacheNearMultiNodeSelfTest.java | 6 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 4 +- .../GridCacheNearPartitionedClearSelfTest.java | 4 +- .../GridCacheNearReaderPreloadSelfTest.java | 6 +- .../near/GridCacheNearReadersSelfTest.java | 22 ++-- .../near/GridCacheNearTxMultiNodeSelfTest.java | 12 +- .../GridCachePartitionedAffinitySelfTest.java | 4 +- .../GridCachePartitionedEvictionSelfTest.java | 2 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 2 +- ...achePartitionedMultiNodeCounterSelfTest.java | 20 ++-- ...achePartitionedMultiNodeFullApiSelfTest.java | 15 ++- ...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +- ...achePartitionedPreloadLifecycleSelfTest.java | 10 +- .../GridCachePartitionedStorePutSelfTest.java | 7 +- .../near/GridCachePutArrayValueSelfTest.java | 2 +- ...idCacheRendezvousAffinityClientSelfTest.java | 4 +- .../near/GridPartitionedBackupLoadSelfTest.java | 3 +- .../near/IgniteCacheNearReadCommittedTest.java | 4 +- .../near/IgniteTxReentryNearSelfTest.java | 2 +- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 4 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 4 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 8 +- .../GridCacheReplicatedPreloadSelfTest.java | 32 +++--- ...GridCacheReplicatedPreloadUndeploysTest.java | 4 +- .../GridCacheBatchEvictUnswapSelfTest.java | 3 +- ...heConcurrentEvictionConsistencySelfTest.java | 2 +- .../GridCacheConcurrentEvictionsSelfTest.java | 3 +- .../GridCacheDistributedEvictionsSelfTest.java | 4 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 4 +- .../eviction/GridCacheEvictionAbstractTest.java | 4 +- .../GridCacheEvictionFilterSelfTest.java | 5 +- .../GridCacheEvictionTouchSelfTest.java | 9 +- .../GridCacheFifoEvictionPolicySelfTest.java | 2 +- .../lru/GridCacheLruEvictionPolicySelfTest.java | 2 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 3 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +- .../GridCacheRandomEvictionPolicySelfTest.java | 16 +-- .../IgniteCacheStoreSessionAbstractTest.java | 5 +- ...acheStoreSessionWriteBehindAbstractTest.java | 3 +- .../IgniteCacheTxStoreSessionTest.java | 6 +- ...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 8 +- .../GridCacheLocalByteArrayValuesSelfTest.java | 4 +- .../local/GridCacheLocalLoadAllSelfTest.java | 3 +- .../cache/local/GridCacheLocalLockSelfTest.java | 6 +- .../GridCacheLocalMultithreadedSelfTest.java | 2 +- .../local/GridCacheLocalTxTimeoutSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 26 ++--- ...dCacheContinuousQueryReplicatedSelfTest.java | 8 +- .../DataStreamProcessorSelfTest.java | 12 +- .../datastreamer/DataStreamerImplSelfTest.java | 2 +- .../processors/igfs/IgfsCacheSelfTest.java | 6 +- .../GridServiceProcessorAbstractSelfTest.java | 4 +- .../GridServiceProcessorMultiNodeSelfTest.java | 2 +- .../loadtests/GridCacheLoadPopulationTask.java | 2 +- .../cache/GridCacheAbstractLoadTest.java | 2 +- .../loadtests/cache/GridCacheBenchmark.java | 3 +- .../cache/GridCacheDataStructuresLoadTest.java | 2 +- .../loadtests/cache/GridCacheLoadTest.java | 5 +- .../loadtests/cache/GridCacheSwapLoadTest.java | 7 +- .../capacity/GridCapacityLoadTest.java | 3 +- .../colocation/GridTestCacheStore.java | 2 +- .../colocation/GridTestLifecycleBean.java | 2 +- .../loadtests/colocation/GridTestMain.java | 6 +- .../GridContinuousOperationsLoadTest.java | 2 +- .../GridCachePartitionedAtomicLongLoadTest.java | 2 +- .../ignite/loadtests/dsi/GridDsiClient.java | 4 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 6 +- .../cacheget/GridBenchmarkCacheGetLoadTest.java | 2 +- .../mapper/GridContinuousMapperTask1.java | 2 +- .../mapper/GridContinuousMapperTask2.java | 2 +- .../swap/GridSwapEvictAllBenchmark.java | 4 +- .../marshaller/GridMarshallerAbstractTest.java | 6 +- .../OptimizedMarshallerNodeFailoverTest.java | 4 +- .../CacheCheckpointSpiSecondCacheSelfTest.java | 4 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +- .../ignite/testframework/junits/IgniteMock.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 6 +- .../tests/p2p/CacheDeploymentTestTask1.java | 2 +- .../tests/p2p/CacheDeploymentTestTask3.java | 2 +- .../p2p/GridP2PContinuousDeploymentTask1.java | 2 +- .../HibernateL2CacheConfigurationSelfTest.java | 10 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 4 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 2 +- .../cache/GridCacheQuerySimpleBenchmark.java | 2 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 40 +++---- .../cache/IgniteCacheAbstractQuerySelfTest.java | 56 +++++----- .../IgniteCacheFieldsQueryNoDataSelfTest.java | 2 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 6 +- .../cache/IgniteCacheQueryIndexSelfTest.java | 4 +- .../cache/IgniteCacheQueryLoadSelfTest.java | 14 +-- .../IgniteCacheQueryMultiThreadedSelfTest.java | 20 ++-- ...gniteCacheSqlQueryMultiThreadedSelfTest.java | 5 +- .../IgniteCacheAtomicFieldsQuerySelfTest.java | 2 +- .../IgniteCachePartitionedQuerySelfTest.java | 4 +- .../IgniteCacheQueryNodeRestartSelfTest.java | 3 +- ...gniteCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../IgniteCacheReplicatedQuerySelfTest.java | 12 +- .../local/IgniteCacheLocalQuerySelfTest.java | 2 +- .../processors/cache/GridCacheJtaSelfTest.java | 2 +- .../scala/org/apache/ignite/scalar/scalar.scala | 6 +- .../org/apache/ignite/IgniteSpringBean.java | 4 +- .../p2p/GridP2PUserVersionChangeSelfTest.java | 6 +- .../spring/GridSpringCacheManagerSelfTest.java | 20 ++-- .../cache/VisorCacheClearCommandSpec.scala | 8 +- .../commands/cache/VisorCacheCommandSpec.scala | 4 +- .../cswap/VisorCacheSwapCommandSpec.scala | 4 +- .../cache/websession/WebSessionFilter.java | 2 +- .../internal/websession/WebSessionSelfTest.java | 2 +- .../yardstick/cache/IgniteGetBenchmark.java | 2 +- .../cache/IgniteGetOffHeapBenchmark.java | 2 +- .../cache/IgniteGetOffHeapValuesBenchmark.java | 2 +- .../yardstick/cache/IgnitePutBenchmark.java | 2 +- .../yardstick/cache/IgnitePutGetBenchmark.java | 2 +- .../cache/IgnitePutGetOffHeapBenchmark.java | 2 +- .../IgnitePutGetOffHeapValuesBenchmark.java | 2 +- .../cache/IgnitePutGetTxBenchmark.java | 2 +- .../cache/IgnitePutGetTxOffHeapBenchmark.java | 2 +- .../IgnitePutGetTxOffHeapValuesBenchmark.java | 2 +- .../cache/IgnitePutOffHeapBenchmark.java | 2 +- .../cache/IgnitePutOffHeapValuesBenchmark.java | 2 +- .../yardstick/cache/IgnitePutTxBenchmark.java | 2 +- .../cache/IgnitePutTxOffHeapBenchmark.java | 2 +- .../IgnitePutTxOffHeapValuesBenchmark.java | 2 +- .../cache/IgniteSqlQueryBenchmark.java | 2 +- .../cache/IgniteSqlQueryJoinBenchmark.java | 2 +- .../IgniteSqlQueryJoinOffHeapBenchmark.java | 2 +- .../cache/IgniteSqlQueryOffHeapBenchmark.java | 2 +- .../cache/IgniteSqlQueryPutBenchmark.java | 2 +- .../IgniteSqlQueryPutOffHeapBenchmark.java | 2 +- .../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 2 +- .../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 2 +- .../store/jdbc/IgniteJdbcStorePutBenchmark.java | 2 +- .../jdbc/IgniteJdbcStorePutGetBenchmark.java | 2 +- .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 2 +- .../jdbc/IgniteJdbcStorePutTxBenchmark.java | 2 +- 327 files changed, 1153 insertions(+), 1199 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java ---------------------------------------------------------------------- diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java index d5356f1..6f2194f 100644 --- a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java +++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java @@ -53,7 +53,7 @@ public class Demo { // Start Ignite node. try (Ignite ignite = Ignition.start(cfg)) { - IgniteCache<PersonKey, Person> cache = ignite.jcache(CACHE_NAME); + IgniteCache<PersonKey, Person> cache = ignite.cache(CACHE_NAME); // Demo for load cache with custom SQL. cache.loadCache(null, "org.apache.ignite.schema.PersonKey", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java index 5c8d187..7780e2e 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java @@ -80,7 +80,7 @@ public final class CacheAffinityExample { private static void visitUsingAffinityRun() { Ignite ignite = Ignition.ignite(); - final IgniteCache<Integer, String> cache = ignite.jcache(CACHE_NAME); + final IgniteCache<Integer, String> cache = ignite.cache(CACHE_NAME); for (int i = 0; i < KEY_CNT; i++) { final int key = i; @@ -123,7 +123,7 @@ public final class CacheAffinityExample { // Bring computations to the nodes where the data resides (i.e. collocation). ignite.compute(ignite.cluster().forNode(node)).run(new IgniteRunnable() { @Override public void run() { - IgniteCache<Integer, String> cache = ignite.jcache(CACHE_NAME); + IgniteCache<Integer, String> cache = ignite.cache(CACHE_NAME); // Peek is a local memory lookup, however, value should never be 'null' // as we are co-located with node that has a given key. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java index ff32ed0..1f4dcfc 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java @@ -114,7 +114,7 @@ public class CacheQueryExample { * Example for SQL queries based on salary ranges. */ private static void sqlQuery() { - IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().jcache(CACHE_NAME); + IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME); // SQL clause which selects salaries based on range. String sql = "salary > ? and salary <= ?"; @@ -137,7 +137,7 @@ public class CacheQueryExample { * Example for SQL queries based on all employees working for a specific organization. */ private static void sqlQueryWithJoin() { - IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().jcache(CACHE_NAME); + IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME); // SQL clause query which joins on 2 types to select people for a specific organization. String joinSql = @@ -158,7 +158,7 @@ public class CacheQueryExample { * Example for TEXT queries using LUCENE-based indexing of people's resumes. */ private static void textQuery() { - IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().jcache(CACHE_NAME); + IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME); // Query for all people with "Master Degree" in their resumes. QueryCursor<Cache.Entry<CacheAffinityKey<UUID>, Person>> masters = @@ -176,7 +176,7 @@ public class CacheQueryExample { * Example for SQL queries to calculate average salary for a specific organization. */ private static void sqlQueryWithAggregation() { - IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().jcache(CACHE_NAME); + IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME); // Calculate average of salary of all persons in GridGain. QueryCursor<List<?>> cursor = cache.query(new SqlFieldsQuery("select avg(salary) from Person, " + @@ -192,7 +192,7 @@ public class CacheQueryExample { * fields instead of whole key-value pairs. */ private static void sqlFieldsQuery() { - IgniteCache<?, ?> cache = Ignition.ignite().jcache(CACHE_NAME); + IgniteCache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME); // Create query to get names of all employees. QueryCursor<List<?>> cursor = cache.query(new SqlFieldsQuery("select concat(firstName, ' ', " + @@ -211,7 +211,7 @@ public class CacheQueryExample { * fields instead of whole key-value pairs. */ private static void sqlFieldsQueryWithJoin() { - IgniteCache<?, ?> cache = Ignition.ignite().jcache(CACHE_NAME); + IgniteCache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME); // Execute query to get names of all employees. QueryCursor<List<?>> cursor = cache.query(new SqlFieldsQuery("select concat(firstName, ' ', lastName), " + @@ -228,7 +228,7 @@ public class CacheQueryExample { * Populate cache with test data. */ private static void initialize() { - IgniteCache<Object, Object> cache = Ignition.ignite().jcache(CACHE_NAME); + IgniteCache<Object, Object> cache = Ignition.ignite().cache(CACHE_NAME); // Organizations. Organization org1 = new Organization("GridGain"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 22e7a1d..305b364 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 @@ -159,7 +159,7 @@ public class CacheStarSchemaExample { * @throws IgniteException If failed. */ private static void queryStorePurchases() { - IgniteCache<Integer, FactPurchase> factCache = Ignition.ignite().jcache(PARTITIONED_CACHE_NAME); + IgniteCache<Integer, FactPurchase> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME); // All purchases for store1. // ======================== @@ -182,7 +182,7 @@ public class CacheStarSchemaExample { * @throws IgniteException If failed. */ private static void queryProductPurchases() { - IgniteCache<Integer, FactPurchase> factCache = Ignition.ignite().jcache(PARTITIONED_CACHE_NAME); + IgniteCache<Integer, FactPurchase> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME); // All purchases for certain product made at store2. // ================================================= http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 f48e6fb..877dadd 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 @@ -49,7 +49,7 @@ public class MemcacheRestExample { System.out.println(); System.out.println(">>> Memcache REST example started."); - IgniteCache<String, Object> cache = ignite.jcache(null); + IgniteCache<String, Object> cache = ignite.cache(null); client = startMemcachedClient(host, port); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java index 4aedd5a..0424457 100644 --- a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java +++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java @@ -80,7 +80,7 @@ public final class CacheAffinityExample { private static void visitUsingAffinityRun() { Ignite ignite = Ignition.ignite(); - final IgniteCache<Integer, String> cache = ignite.jcache(CACHE_NAME); + final IgniteCache<Integer, String> cache = ignite.cache(CACHE_NAME); for (int i = 0; i < KEY_CNT; i++) { int key = i; @@ -117,7 +117,7 @@ public final class CacheAffinityExample { if (node != null) { // Bring computations to the nodes where the data resides (i.e. collocation). ignite.compute(ignite.cluster().forNode(node)).run(() -> { - IgniteCache<Integer, String> cache = ignite.jcache(CACHE_NAME); + IgniteCache<Integer, String> cache = ignite.cache(CACHE_NAME); // Peek is a local memory lookup, however, value should never be 'null' // as we are co-located with node that has a given key. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 7daad3e..e917e4c 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 @@ -138,7 +138,7 @@ object ScalarSnowflakeSchemaExample { * `FactPurchase` objects stored in `partitioned` cache. */ def queryStorePurchases() { - val factCache = ignite$.jcache[JavaInt, FactPurchase](PART_NAME) + val factCache = ignite$.cache[JavaInt, FactPurchase](PART_NAME) val storePurchases = factCache.sql( "from \"" + REPL_NAME + "\".DimStore, \"" + PART_NAME + "\".FactPurchase " + @@ -154,7 +154,7 @@ object ScalarSnowflakeSchemaExample { * stored in `partitioned` cache. */ private def queryProductPurchases() { - val factCache = ignite$.jcache[JavaInt, FactPurchase](PART_NAME) + val factCache = ignite$.cache[JavaInt, FactPurchase](PART_NAME) // All purchases for certain product made at store2. // ================================================= http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index a6944fd..d4758d5 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -127,8 +127,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { cacheStore.map.clear(); } - grid().jcache(null).clear(); - grid().jcache(CACHE_NAME).clear(); + grid().cache(null).clear(); + grid().cache(CACHE_NAME).clear(); INTERCEPTED_OBJECTS.clear(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 8e545f1..dbab4bd 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 @@ -101,6 +101,6 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest { * @return Cache. */ @Override protected <K, V> IgniteCache<K, V> jcache() { - return grid(0).jcache(null); + return grid(0).cache(null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 dac2957..c4cdf19 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 @@ -76,8 +76,8 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { @Override protected void afterTest() throws Exception { client.shutdown(); - grid().jcache(null).clear(); - grid().jcache(CACHE_NAME).clear(); + grid().cache(null).clear(); + grid().cache(CACHE_NAME).clear(); } /** {@inheritDoc} */ @@ -134,10 +134,10 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { */ public void testPut() throws Exception { assertTrue(client.cachePut(null, "key1", "val1")); - assertEquals("val1", grid().jcache(null).get("key1")); + assertEquals("val1", grid().cache(null).get("key1")); assertTrue(client.cachePut(CACHE_NAME, "key1", "val1")); - assertEquals("val1", grid().jcache(CACHE_NAME).get("key1")); + assertEquals("val1", grid().cache(CACHE_NAME).get("key1")); } /** @@ -146,7 +146,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { public void testPutAll() throws Exception { client.cachePutAll(null, F.asMap("key1", "val1", "key2", "val2")); - Map<String, String> map = grid().<String, String>jcache(null).getAll(F.asSet("key1", "key2")); + Map<String, String> map = grid().<String, String>cache(null).getAll(F.asSet("key1", "key2")); assertEquals(2, map.size()); assertEquals("val1", map.get("key1")); @@ -154,7 +154,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { client.cachePutAll(CACHE_NAME, F.asMap("key1", "val1", "key2", "val2")); - map = grid().<String, String>jcache(CACHE_NAME).getAll(F.asSet("key1", "key2")); + map = grid().<String, String>cache(CACHE_NAME).getAll(F.asSet("key1", "key2")); assertEquals(2, map.size()); assertEquals("val1", map.get("key1")); @@ -165,11 +165,11 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testGet() throws Exception { - grid().jcache(null).put("key", "val"); + grid().cache(null).put("key", "val"); assertEquals("val", client.cacheGet(null, "key")); - grid().jcache(CACHE_NAME).put("key", "val"); + grid().cache(CACHE_NAME).put("key", "val"); assertEquals("val", client.cacheGet(CACHE_NAME, "key")); } @@ -213,8 +213,8 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testGetAll() throws Exception { - IgniteCache<Object, Object> jcacheDflt = grid().jcache(null); - IgniteCache<Object, Object> jcacheName = grid().jcache(CACHE_NAME); + IgniteCache<Object, Object> jcacheDflt = grid().cache(null); + IgniteCache<Object, Object> jcacheName = grid().cache(CACHE_NAME); jcacheDflt.put("key1", "val1"); jcacheDflt.put("key2", "val2"); @@ -257,8 +257,8 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRemove() throws Exception { - IgniteCache<Object, Object> jcacheDflt = grid().jcache(null); - IgniteCache<Object, Object> jcacheName = grid().jcache(CACHE_NAME); + IgniteCache<Object, Object> jcacheDflt = grid().cache(null); + IgniteCache<Object, Object> jcacheName = grid().cache(CACHE_NAME); jcacheDflt.put("key", "val"); @@ -280,7 +280,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRemoveAll() throws Exception { - IgniteCache<Object, Object> jcacheDflt = grid().jcache(null); + IgniteCache<Object, Object> jcacheDflt = grid().cache(null); jcacheDflt.put("key1", "val1"); jcacheDflt.put("key2", "val2"); @@ -294,7 +294,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { assertNotNull(jcacheDflt.get("key3")); assertNotNull(jcacheDflt.get("key4")); - IgniteCache<Object, Object> jcacheName = grid().jcache(CACHE_NAME); + IgniteCache<Object, Object> jcacheName = grid().cache(CACHE_NAME); jcacheName.put("key1", "val1"); jcacheName.put("key2", "val2"); @@ -315,7 +315,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { public void testReplace() throws Exception { assertFalse(client.cacheReplace(null, "key1", "val1")); - IgniteCache<Object, Object> jcacheDflt = grid().jcache(null); + IgniteCache<Object, Object> jcacheDflt = grid().cache(null); jcacheDflt.put("key1", "val1"); assertTrue(client.cacheReplace(null, "key1", "val2")); @@ -327,7 +327,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { jcacheDflt.clear(); assertFalse(client.cacheReplace(CACHE_NAME, "key1", "val1")); - grid().jcache(CACHE_NAME).put("key1", "val1"); + grid().cache(CACHE_NAME).put("key1", "val1"); assertTrue(client.cacheReplace(CACHE_NAME, "key1", "val2")); } @@ -337,7 +337,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { public void testCompareAndSet() throws Exception { assertFalse(client.cacheCompareAndSet(null, "key", null, null)); - IgniteCache<Object, Object> jcache = grid().jcache(null); + IgniteCache<Object, Object> jcache = grid().cache(null); jcache.put("key", "val"); assertTrue(client.cacheCompareAndSet(null, "key", null, null)); @@ -365,7 +365,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { jcache.remove("key"); assertFalse(client.cacheCompareAndSet(CACHE_NAME, "key", null, null)); - IgniteCache<Object, Object> jcacheName = grid().jcache(CACHE_NAME); + IgniteCache<Object, Object> jcacheName = grid().cache(CACHE_NAME); jcacheName.put("key", "val"); assertTrue(client.cacheCompareAndSet(CACHE_NAME, "key", null, null)); @@ -397,8 +397,8 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testMetrics() throws Exception { - IgniteCache<Object, Object> jcacheDft = grid().jcache(null); - IgniteCache<Object, Object> jcacheName = grid().jcache(CACHE_NAME); + IgniteCache<Object, Object> jcacheDft = grid().cache(null); + IgniteCache<Object, Object> jcacheName = grid().cache(CACHE_NAME); jcacheDft.mxBean().clear(); @@ -439,48 +439,48 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testAppend() throws Exception { - grid().jcache(null).remove("key"); - grid().jcache(CACHE_NAME).remove("key"); + grid().cache(null).remove("key"); + grid().cache(CACHE_NAME).remove("key"); assertFalse(client.cacheAppend(null, "key", ".val")); assertFalse(client.cacheAppend(CACHE_NAME, "key", ".val")); - grid().jcache(null).put("key", "orig"); - grid().jcache(CACHE_NAME).put("key", "orig"); + grid().cache(null).put("key", "orig"); + grid().cache(CACHE_NAME).put("key", "orig"); assertTrue(client.cacheAppend(null, "key", ".val")); - assertEquals("orig.val", grid().jcache(null).get("key")); + assertEquals("orig.val", grid().cache(null).get("key")); assertTrue(client.cacheAppend(null, "key", ".newVal")); - assertEquals("orig.val.newVal", grid().jcache(null).get("key")); + assertEquals("orig.val.newVal", grid().cache(null).get("key")); assertTrue(client.cacheAppend(CACHE_NAME, "key", ".val")); - assertEquals("orig.val", grid().jcache(CACHE_NAME).get("key")); + assertEquals("orig.val", grid().cache(CACHE_NAME).get("key")); assertTrue(client.cacheAppend(CACHE_NAME, "key", ".newVal")); - assertEquals("orig.val.newVal", grid().jcache(CACHE_NAME).get("key")); + assertEquals("orig.val.newVal", grid().cache(CACHE_NAME).get("key")); } /** * @throws Exception If failed. */ public void testPrepend() throws Exception { - grid().jcache(null).remove("key"); - grid().jcache(CACHE_NAME).remove("key"); + grid().cache(null).remove("key"); + grid().cache(CACHE_NAME).remove("key"); assertFalse(client.cachePrepend(null, "key", ".val")); assertFalse(client.cachePrepend(CACHE_NAME, "key", ".val")); - grid().jcache(null).put("key", "orig"); - grid().jcache(CACHE_NAME).put("key", "orig"); + grid().cache(null).put("key", "orig"); + grid().cache(CACHE_NAME).put("key", "orig"); assertTrue(client.cachePrepend(null, "key", "val.")); - assertEquals("val.orig", grid().jcache(null).get("key")); + assertEquals("val.orig", grid().cache(null).get("key")); assertTrue(client.cachePrepend(null, "key", "newVal.")); - assertEquals("newVal.val.orig", grid().jcache(null).get("key")); + assertEquals("newVal.val.orig", grid().cache(null).get("key")); assertTrue(client.cachePrepend(CACHE_NAME, "key", "val.")); - assertEquals("val.orig", grid().jcache(CACHE_NAME).get("key")); + assertEquals("val.orig", grid().cache(CACHE_NAME).get("key")); assertTrue(client.cachePrepend(CACHE_NAME, "key", "newVal.")); - assertEquals("newVal.val.orig", grid().jcache(CACHE_NAME).get("key")); + assertEquals("newVal.val.orig", grid().cache(CACHE_NAME).get("key")); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 c54a499..aea71e5 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 @@ -70,8 +70,8 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { @Override protected void afterTest() throws Exception { client.shutdown(); - grid().jcache(null).clear(); - grid().jcache(CACHE_NAME).clear(); + grid().cache(null).clear(); + grid().cache(CACHE_NAME).clear(); } /** {@inheritDoc} */ @@ -128,21 +128,21 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { */ public void testPut() throws Exception { assertTrue(client.cachePut(null, "key1", "val1")); - assertEquals("val1", grid().jcache(null).get("key1")); + assertEquals("val1", grid().cache(null).get("key1")); assertTrue(client.cachePut(CACHE_NAME, "key1", "val1")); - assertEquals("val1", grid().jcache(CACHE_NAME).get("key1")); + assertEquals("val1", grid().cache(CACHE_NAME).get("key1")); } /** * @throws Exception If failed. */ public void testGet() throws Exception { - grid().jcache(null).put("key", "val"); + grid().cache(null).put("key", "val"); Assert.assertEquals("val", client.cacheGet(null, "key")); - grid().jcache(CACHE_NAME).put("key", "val"); + grid().cache(CACHE_NAME).put("key", "val"); Assert.assertEquals("val", client.cacheGet(CACHE_NAME, "key")); } @@ -151,19 +151,19 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRemove() throws Exception { - grid().jcache(null).put("key", "val"); + grid().cache(null).put("key", "val"); assertTrue(client.cacheRemove(null, "key")); assertFalse(client.cacheRemove(null, "wrongKey")); - assertNull(grid().jcache(null).get("key")); + assertNull(grid().cache(null).get("key")); - grid().jcache(CACHE_NAME).put("key", "val"); + grid().cache(CACHE_NAME).put("key", "val"); assertTrue(client.cacheRemove(CACHE_NAME, "key")); assertFalse(client.cacheRemove(CACHE_NAME, "wrongKey")); - assertNull(grid().jcache(CACHE_NAME).get("key")); + assertNull(grid().cache(CACHE_NAME).get("key")); } /** @@ -171,14 +171,14 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { */ public void testAdd() throws Exception { assertTrue(client.cacheAdd(null, "key", "val")); - assertEquals("val", grid().jcache(null).get("key")); + assertEquals("val", grid().cache(null).get("key")); assertFalse(client.cacheAdd(null, "key", "newVal")); - assertEquals("val", grid().jcache(null).get("key")); + assertEquals("val", grid().cache(null).get("key")); assertTrue(client.cacheAdd(CACHE_NAME, "key", "val")); - assertEquals("val", grid().jcache(CACHE_NAME).get("key")); + assertEquals("val", grid().cache(CACHE_NAME).get("key")); assertFalse(client.cacheAdd(CACHE_NAME, "key", "newVal")); - assertEquals("val", grid().jcache(CACHE_NAME).get("key")); + assertEquals("val", grid().cache(CACHE_NAME).get("key")); } /** @@ -186,17 +186,17 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { */ public void testReplace() throws Exception { assertFalse(client.cacheReplace(null, "key1", "val1")); - grid().jcache(null).put("key1", "val1"); + grid().cache(null).put("key1", "val1"); assertTrue(client.cacheReplace(null, "key1", "val2")); assertFalse(client.cacheReplace(null, "key2", "val1")); - grid().jcache(null).put("key2", "val1"); + grid().cache(null).put("key2", "val1"); assertTrue(client.cacheReplace(null, "key2", "val2")); - grid().jcache(null).clear(); + grid().cache(null).clear(); assertFalse(client.cacheReplace(CACHE_NAME, "key1", "val1")); - grid().jcache(CACHE_NAME).put("key1", "val1"); + grid().cache(CACHE_NAME).put("key1", "val1"); assertTrue(client.cacheReplace(CACHE_NAME, "key1", "val2")); } @@ -204,24 +204,24 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testMetrics() throws Exception { - grid().jcache(null).mxBean().clear(); - grid().jcache(CACHE_NAME).mxBean().clear(); + grid().cache(null).mxBean().clear(); + grid().cache(CACHE_NAME).mxBean().clear(); - grid().jcache(null).put("key1", "val"); - grid().jcache(null).put("key2", "val"); - grid().jcache(null).put("key2", "val"); + grid().cache(null).put("key1", "val"); + grid().cache(null).put("key2", "val"); + grid().cache(null).put("key2", "val"); - grid().jcache(null).get("key1"); - grid().jcache(null).get("key2"); - grid().jcache(null).get("key2"); + grid().cache(null).get("key1"); + grid().cache(null).get("key2"); + grid().cache(null).get("key2"); - grid().jcache(CACHE_NAME).put("key1", "val"); - grid().jcache(CACHE_NAME).put("key2", "val"); - grid().jcache(CACHE_NAME).put("key2", "val"); + grid().cache(CACHE_NAME).put("key1", "val"); + grid().cache(CACHE_NAME).put("key2", "val"); + grid().cache(CACHE_NAME).put("key2", "val"); - grid().jcache(CACHE_NAME).get("key1"); - grid().jcache(CACHE_NAME).get("key2"); - grid().jcache(CACHE_NAME).get("key2"); + grid().cache(CACHE_NAME).get("key1"); + grid().cache(CACHE_NAME).get("key2"); + grid().cache(CACHE_NAME).get("key2"); Map<String, Long> m = client.cacheMetrics(null); @@ -291,13 +291,13 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { assertFalse(client.cacheAppend(null, "wrongKey", "_suffix")); assertFalse(client.cacheAppend(CACHE_NAME, "wrongKey", "_suffix")); - grid().jcache(null).put("key", "val"); + grid().cache(null).put("key", "val"); assertTrue(client.cacheAppend(null, "key", "_suffix")); - assertEquals("val_suffix", grid().jcache(null).get("key")); + assertEquals("val_suffix", grid().cache(null).get("key")); - grid().jcache(CACHE_NAME).put("key", "val"); + grid().cache(CACHE_NAME).put("key", "val"); assertTrue(client.cacheAppend(CACHE_NAME, "key", "_suffix")); - assertEquals("val_suffix", grid().jcache(CACHE_NAME).get("key")); + assertEquals("val_suffix", grid().cache(CACHE_NAME).get("key")); } /** @@ -307,13 +307,13 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { assertFalse(client.cachePrepend(null, "wrongKey", "prefix_")); assertFalse(client.cachePrepend(CACHE_NAME, "wrongKey", "prefix_")); - grid().jcache(null).put("key", "val"); + grid().cache(null).put("key", "val"); assertTrue(client.cachePrepend(null, "key", "prefix_")); - assertEquals("prefix_val", grid().jcache(null).get("key")); + assertEquals("prefix_val", grid().cache(null).get("key")); - grid().jcache(CACHE_NAME).put("key", "val"); + grid().cache(CACHE_NAME).put("key", "val"); assertTrue(client.cachePrepend(CACHE_NAME, "key", "prefix_")); - assertEquals("prefix_val", grid().jcache(CACHE_NAME).get("key")); + assertEquals("prefix_val", grid().cache(CACHE_NAME).get("key")); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 1c61c75..46719ba 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 @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.rest; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -135,7 +134,7 @@ public class RestProcessorTest extends GridCommonAbstractTest { * */ private void populateCache() { - IgniteCache<String, Object> cache = G.ignite().jcache(null); + IgniteCache<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/34046ec8/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 0b876a7..ade888e 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,7 +31,6 @@ import java.io.*; import java.sql.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @@ -80,14 +79,14 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGrids(3); - IgniteCache<String, Organization> orgCache = grid(0).jcache(null); + IgniteCache<String, Organization> orgCache = grid(0).cache(null); assert orgCache != null; orgCache.put("o1", new Organization(1, "A")); orgCache.put("o2", new Organization(2, "B")); - IgniteCache<CacheAffinityKey<String>, Person> personCache = grid(0).jcache(null); + IgniteCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null); assert personCache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 6818908..5771e56 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 @@ -74,14 +74,14 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(2); - IgniteCache<Object, Object> cache1 = grid(0).jcache(CACHE_NAME); + IgniteCache<Object, Object> cache1 = grid(0).cache(CACHE_NAME); assert cache1 != null; cache1.put("key1", 1); cache1.put("key2", 2); - IgniteCache<Object, Object> cache2 = grid(1).jcache(CACHE_NAME); + IgniteCache<Object, Object> cache2 = grid(1).cache(CACHE_NAME); assert cache2 != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 2ae3a9c..39d2799 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 @@ -76,14 +76,14 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(3); - IgniteCache<String, Organization> orgCache = grid(0).jcache(null); + IgniteCache<String, Organization> orgCache = grid(0).cache(null); assert orgCache != null; orgCache.put("o1", new Organization(1, "A")); orgCache.put("o2", new Organization(2, "B")); - IgniteCache<CacheAffinityKey<String>, Person> personCache = grid(0).jcache(null); + IgniteCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null); assert personCache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 700d707..3ef7d04 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 @@ -81,7 +81,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(3); - IgniteCache<Integer, TestObject> cache = grid(0).jcache(null); + IgniteCache<Integer, TestObject> cache = grid(0).cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 5111efd..4ba6fcd 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 @@ -88,7 +88,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(3); - IgniteCache<Integer, TestObject> cache = grid(0).jcache(null); + IgniteCache<Integer, TestObject> cache = grid(0).cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 37244a1..d0cb20e 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 @@ -81,7 +81,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(3); - IgniteCache<String, Person> cache = grid(0).jcache(null); + IgniteCache<String, Person> cache = grid(0).cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java index 63fd232..cf922f6 100644 --- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java @@ -78,7 +78,7 @@ public class ClientTcpSslLoadTest extends ClientTcpSslMultiThreadedSelfTest { private void clearCaches() { for (int i = 0; i < NODES_CNT; i++) try { - grid(i).jcache(PARTITIONED_CACHE_NAME).clear(); + grid(i).cache(PARTITIONED_CACHE_NAME).clear(); } catch (IgniteException e) { log.error("Cache clear failed.", e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 48889a8..5d4061d 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@ -262,7 +262,7 @@ public interface Ignite extends AutoCloseable { * @param name Cache name. * @return Instance of the cache for the specified name. */ - public <K, V> IgniteCache<K, V> jcache(@Nullable String name); + public <K, V> IgniteCache<K, V> cache(@Nullable String name); /** * Gets grid transactions facade. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java index b1628b4..f5ce8a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -38,7 +38,7 @@ import java.util.concurrent.*; import java.util.concurrent.locks.*; /** - * Main entry point for all <b>Data Grid APIs.</b> You can get a named cache by calling {@link Ignite#jcache(String)} + * Main entry point for all <b>Data Grid APIs.</b> You can get a named cache by calling {@link Ignite#cache(String)} * method. * <h1 class="header">Functionality</h1> * This API extends {@link CacheProjection} API which contains vast majority of cache functionality http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java index 4a41dd5..9ba50d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java @@ -225,7 +225,7 @@ public class CacheManager implements javax.cache.CacheManager { throw new NullPointerException(); try { - return ignite.jcache(cacheName); + return ignite.cache(cacheName); } catch (IllegalArgumentException ignored) { return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java index beff940..327068d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java @@ -562,7 +562,7 @@ public abstract class CacheAbstractJdbcStore<K, V> implements CacheStore<K, V>, if (entryMappings != null) return entryMappings; - CacheConfiguration ccfg = ignite().jcache(cacheName).getConfiguration(CacheConfiguration.class); + CacheConfiguration ccfg = ignite().cache(cacheName).getConfiguration(CacheConfiguration.class); Collection<CacheTypeMetadata> types = ccfg.getTypeMetadata(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 2233cfa..6359fe6 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -413,8 +413,8 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { /** * Cache name. If not provided or {@code null}, then this will be considered a default - * cache which can be accessed via {@link Ignite#jcache(String)} method. Otherwise, if name - * is provided, the cache will be accessed via {@link Ignite#jcache(String)} method. + * cache which can be accessed via {@link Ignite#cache(String)} method. Otherwise, if name + * is provided, the cache will be accessed via {@link Ignite#cache(String)} method. * * @return Cache name. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index d480e1d..4422af7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -2249,7 +2249,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public <K, V> IgniteCache<K, V> jcache(@Nullable String name) { + @Override public <K, V> IgniteCache<K, V> cache(@Nullable String name) { guard(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EvictableEntryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EvictableEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EvictableEntryImpl.java index c164230..4dbc1ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EvictableEntryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EvictableEntryImpl.java @@ -162,7 +162,7 @@ public class EvictableEntryImpl<K, V> implements EvictableEntry<K, V> { @SuppressWarnings("unchecked") @Override public <T> T unwrap(Class<T> clazz) { if (clazz.isAssignableFrom(IgniteCache.class)) - return (T)cached.context().grid().jcache(cached.context().name()); + return (T)cached.context().grid().cache(cached.context().name()); if(clazz.isAssignableFrom(getClass())) return clazz.cast(this); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java index 754144a..4cde6ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java @@ -30,7 +30,7 @@ import javax.cache.*; import java.util.*; /** - * Main entry point for all <b>Data Grid APIs.</b> You can get a named cache by calling {@link org.apache.ignite.Ignite#jcache(String)} + * Main entry point for all <b>Data Grid APIs.</b> You can get a named cache by calling {@link org.apache.ignite.Ignite#cache(String)} * method. * <h1 class="header">Functionality</h1> * This API extends {@link CacheProjection} API which contains vast majority of cache functionality http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 811ae6a..2cf3e5a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -3718,7 +3718,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, try { KeyCacheObject cacheKey = ctx.toCacheKeyObject(key); - + GridCacheEntryEx e = entry0(cacheKey, new AffinityTopologyVersion(ctx.discovery().topologyVersion()), false, false); @@ -4254,10 +4254,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, try { removex(item.getKey()); - } + } catch (IgniteCheckedException e) { throw CU.convertToCacheException(e); - } + } finally { ctx.gate().leave(); } @@ -6189,7 +6189,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public Void call() throws Exception { - IgniteCache<K, V> cache = ignite.jcache(cacheName); + IgniteCache<K, V> cache = ignite.cache(cacheName); assert cache != null : cacheName; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java index a5f389f..0f0f2aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java @@ -82,6 +82,6 @@ public class GridCacheIterator<K, V, T> implements GridSerializableIterator<T> { @Override public void remove() { it.remove(); - cctx.grid().jcache(cctx.name()).remove(cur.getKey(), cur.getValue()); + cctx.grid().cache(cctx.name()).remove(cur.getKey(), cur.getValue()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java index ef6e2cf..c415506 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java @@ -82,7 +82,7 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> { map.remove(o); - ctx.grid().jcache(ctx.name()).remove(e.getKey()); + ctx.grid().cache(ctx.name()).remove(e.getKey()); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 4ca6ba5..cad260a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -4344,7 +4344,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { @SuppressWarnings("unchecked") @Override public <T> T unwrap(Class<T> cls) { if (cls.isAssignableFrom(IgniteCache.class)) - return (T)cctx.grid().jcache(cctx.name()); + return (T)cctx.grid().cache(cctx.name()); if (cls.isAssignableFrom(getClass())) return (T)this; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java index ddf4918..bd3f305 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java @@ -133,7 +133,7 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V if (F.isAll(e, filter) && F.eq(o, e.getValue())) { it.remove(); - ctx.grid().jcache(ctx.name()).remove(e.getKey(), e.getValue()); + ctx.grid().cache(ctx.name()).remove(e.getKey(), e.getValue()); rmv = true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index c0705fa..4d90f89 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -1041,7 +1041,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap if (last == null) throw new IllegalStateException(); - ctx.grid().jcache(ctx.name()).remove(last.getKey(), last.getValue()); + ctx.grid().cache(ctx.name()).remove(last.getKey(), last.getValue()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java index 66b6578..144480f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java @@ -195,7 +195,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { assert args != null; assert futId == null; - IgniteCache<?, ?> cache = ignite.jcache(cacheName); + IgniteCache<?, ?> cache = ignite.cache(cacheName); SqlFieldsQuery qry = new SqlFieldsQuery(sql).setArgs(args.toArray()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java index a918d97..dbc2e92 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java @@ -108,7 +108,7 @@ public class VisorCacheClearTask extends VisorOneNodeTask<String, IgniteBiTuple< /** {@inheritDoc} */ @Override protected IgniteBiTuple<Integer, Integer> run(final String cacheName) { if (futs[0] == null || futs[1] == null || futs[2] == null) { - IgniteCache cache = ignite.jcache(cacheName); + IgniteCache cache = ignite.cache(cacheName); if (futs[0] == null && callAsync(new VisorCacheSizeCallable(cache), 0)) return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java index 189a07d..99634d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java @@ -70,7 +70,7 @@ public class VisorCacheLoadTask extends ExpiryPolicy plc = null; for (String cacheName : cacheNames) { - IgniteCache cache = ignite.jcache(cacheName); + IgniteCache cache = ignite.cache(cacheName); if (ttl > 0) { if (plc == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java index 45cf19c..f79dc6e 100644 --- a/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java +++ b/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java @@ -40,7 +40,7 @@ public class GridTestStoreNodeStartup { try { Ignite g = G.start("modules/core/src/test/config/spring-cache-teststore.xml"); - g.jcache(null).loadCache(new P2<Object, Object>() { + g.cache(null).loadCache(new P2<Object, Object>() { @Override public boolean apply(Object o, Object o1) { System.out.println("Key=" + o + ", Val=" + o1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java index 3b94c72..a3a5717 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java @@ -155,7 +155,7 @@ public class IgniteCacheExpiryStoreLoadSelfTest extends GridCacheAbstractSelfTes * @throws Exception If failed. */ public void testLoadAllWithExpiry() throws Exception { - IgniteCache<Integer, Integer> cache = ignite(0).<Integer, Integer>jcache(null) + IgniteCache<Integer, Integer> cache = ignite(0).<Integer, Integer>cache(null) .withExpiryPolicy(new CreatedExpiryPolicy(new Duration(MILLISECONDS, TIME_TO_LIVE))); Set<Integer> keys = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java index 22dd642..72308ad 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java @@ -68,7 +68,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr grid = startGrid(GRID_CNT - 1); - grid.jcache(null); + grid.cache(null); } /** {@inheritDoc} */ @@ -184,7 +184,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr for (int i = 0; i < TX_CNT; i++) { IgniteEx ignite = grid(rnd.nextInt(GRID_CNT)); - IgniteCache<Object, Object> cache = ignite.jcache(null); + IgniteCache<Object, Object> cache = ignite.cache(null); try (Transaction tx = ignite.transactions().txStart()) { cache.put(1, "value"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java index af102c6..a12435e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java @@ -101,8 +101,8 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest { grid(1).createNearCache(CACHE_NAME, new NearCacheConfiguration()); - grid(2).jcache(null); - grid(3).jcache(null); + grid(2).cache(null); + grid(3).cache(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java index 96956c8..1f0eb40 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java @@ -104,7 +104,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { @Override public void run() { try { try (Transaction ignored = g0.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - g0.jcache(null).get(1); + g0.cache(null).get(1); latch.countDown(); @@ -127,7 +127,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { info("Before remove."); - g1.jcache(null).remove(1); + g1.cache(null).remove(1); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java index 42ce8f1..0a6c0b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java @@ -104,8 +104,8 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - assert grid(1).jcache(CACHE_NAME).localSize() == 0 : grid(1).jcache(CACHE_NAME); - assert grid(2).jcache(CACHE_NAME).localSize() == 0 : grid(2).jcache(CACHE_NAME); + assert grid(1).cache(CACHE_NAME).localSize() == 0 : grid(1).cache(CACHE_NAME); + assert grid(2).cache(CACHE_NAME).localSize() == 0 : grid(2).cache(CACHE_NAME); stopAllGrids(); }
