# ignite-51

apache · Mar 9, 2015 · 57ae9ec · 57ae9ec
1 parent 365b359
commit 57ae9ec
Show file tree

Hide file tree

Showing 60 changed files with 521 additions and 520 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java b/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java
@@ -20,7 +20,7 @@
 import java.lang.annotation.*;
 
 /**
- * Annotation for ignite immutable objects.
+ * Annotation for immutable objects.
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)

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
@@ -316,7 +316,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
     /** Collection of type metadata. */
     private Collection<CacheTypeMetadata> typeMeta;
 
-    /** */
+    /** Copy on get flag. */
     private boolean cpOnGet = DFLT_COPY_ON_GET;
 
     /** Empty constructor (all values are initialized to their defaults). */

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
diff --git a/...e/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/...e/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -32,7 +32,7 @@
 /**
  * Cache affinity manager.
  */
-public class GridCacheAffinityManager<K, V> extends GridCacheManagerAdapter<K, V> {
+public class GridCacheAffinityManager extends GridCacheManagerAdapter {
     /** Factor for maximum number of attempts to calculate all partition affinity keys. */
     private static final int MAX_PARTITION_KEY_ATTEMPT_RATIO = 10;
 
@@ -207,7 +207,7 @@ public <T> int partition(Object key) {
      * @param topVer Topology version.
      * @return Affinity nodes.
      */
-    public List<ClusterNode> nodes(K key, long topVer) {
+    public List<ClusterNode> nodes(Object key, long topVer) {
         return nodes(partition(key), topVer);
     }
 
@@ -296,10 +296,10 @@ public Collection<ClusterNode> backups(int part, long topVer) {
      * @param topVer Topology version.
      * @return Nodes for the keys.
      */
-    public Collection<ClusterNode> remoteNodes(Iterable<? extends K> keys, long topVer) {
+    public Collection<ClusterNode> remoteNodes(Iterable keys, long topVer) {
         Collection<Collection<ClusterNode>> colcol = new GridLeanSet<>();
 
-        for (K key : keys)
+        for (Object key : keys)
             colcol.add(nodes(key, topVer));
 
         return F.view(F.flatCollections(colcol), F.remoteNodes(cctx.localNodeId()));

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -102,7 +102,7 @@ public class GridCacheContext<K, V> implements Externalizable {
     private GridUnsafeMemory unsafeMemory;
 
     /** Affinity manager. */
-    private GridCacheAffinityManager<K, V> affMgr;
+    private GridCacheAffinityManager affMgr;
 
     /** Event manager. */
     private GridCacheEventManager evtMgr;
@@ -111,7 +111,7 @@ public class GridCacheContext<K, V> implements Externalizable {
     private GridCacheQueryManager<K, V> qryMgr;
 
     /** Continuous query manager. */
-    private CacheContinuousQueryManager<K, V> contQryMgr;
+    private CacheContinuousQueryManager contQryMgr;
 
     /** Swap manager. */
     private GridCacheSwapManager swapMgr;
@@ -120,7 +120,7 @@ public class GridCacheContext<K, V> implements Externalizable {
     private GridCacheEvictionManager<K, V> evictMgr;
 
     /** Data structures manager. */
-    private CacheDataStructuresManager<K, V> dataStructuresMgr;
+    private CacheDataStructuresManager dataStructuresMgr;
 
     /** Eager TTL manager. */
     private GridCacheTtlManager ttlMgr;
@@ -230,9 +230,9 @@ public GridCacheContext(
         GridCacheStoreManager storeMgr,
         GridCacheEvictionManager<K, V> evictMgr,
         GridCacheQueryManager<K, V> qryMgr,
-        CacheContinuousQueryManager<K, V> contQryMgr,
+        CacheContinuousQueryManager contQryMgr,
-        GridCacheAffinityManager<K, V> affMgr,
+        GridCacheAffinityManager affMgr,
-        CacheDataStructuresManager<K, V> dataStructuresMgr,
+        CacheDataStructuresManager dataStructuresMgr,
         GridCacheTtlManager ttlMgr,
         GridCacheDrManager drMgr,
         CacheJtaManagerAdapter jtaMgr) {
@@ -691,7 +691,7 @@ public boolean isLocalNode(UUID id) {
     /**
      * @return Partition topology.
      */
-    public GridDhtPartitionTopology<K, V> topology() {
+    public GridDhtPartitionTopology topology() {
         assert isNear() || isDht() || isColocated() || isDhtAtomic();
 
         return isNear() ? near().dht().topology() : dht().topology();
@@ -854,7 +854,7 @@ public GridCacheEventManager events() {
     /**
      * @return Cache affinity manager.
      */
-    public GridCacheAffinityManager<K, V> affinity() {
+    public GridCacheAffinityManager affinity() {
         return affMgr;
     }
 
@@ -868,7 +868,7 @@ public GridCacheQueryManager<K, V> queries() {
     /**
      * @return Continuous query manager, {@code null} if disabled.
      */
-    public CacheContinuousQueryManager<K, V> continuousQueries() {
+    public CacheContinuousQueryManager continuousQueries() {
         return contQryMgr;
     }
 
@@ -917,7 +917,7 @@ public GridCacheEvictionManager<K, V> evicts() {
     /**
      * @return Data structures manager.
      */
-    public CacheDataStructuresManager<K, V> dataStructures() {
+    public CacheDataStructuresManager dataStructures() {
         return dataStructuresMgr;
     }
 

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -211,7 +211,7 @@ public interface GridCacheEntryEx {
      * @throws IgniteCheckedException If swap could not be released.
      * @throws GridCacheEntryRemovedException If entry was removed.
      */
-    public <K, V> boolean invalidate(@Nullable CacheEntryPredicate[] filter)
+    public boolean invalidate(@Nullable CacheEntryPredicate[] filter)
         throws GridCacheEntryRemovedException, IgniteCheckedException;
 
     /**
@@ -222,7 +222,7 @@ public <K, V> boolean invalidate(@Nullable CacheEntryPredicate[] filter)
      * @throws IgniteCheckedException If operation failed.
      * @return {@code true} if entry was not being used and could be removed.
      */
-    public <K, V> boolean compact(@Nullable CacheEntryPredicate[] filter)
+    public boolean compact(@Nullable CacheEntryPredicate[] filter)
         throws GridCacheEntryRemovedException, IgniteCheckedException;
 
     /**
@@ -232,7 +232,7 @@ public <K, V> boolean compact(@Nullable CacheEntryPredicate[] filter)
      * @return {@code True} if entry could be evicted.
      * @throws IgniteCheckedException In case of error.
      */
-    public <K, V> boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer,
+    public boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer,
         @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException;
 
     /**
@@ -505,7 +505,7 @@ public GridTuple3<Boolean, Object, EntryProcessorResult<Object>> innerUpdateLoca
      * @throws IgniteCheckedException If failed to remove from swap.
      * @return {@code True} if entry was not being used, passed the filter and could be removed.
      */
-    public <K, V> boolean clear(GridCacheVersion ver, boolean readers,
+    public boolean clear(GridCacheVersion ver, boolean readers,
         @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException;
 
     /**
@@ -577,7 +577,7 @@ public boolean tmLock(IgniteInternalTx tx, long timeout) throws GridCacheEntryRe
      * @return Value.
      * @throws GridCacheEntryRemovedException If entry has been removed.
      */
-    @Nullable public <K, V> CacheObject peek(GridCachePeekMode mode, CacheEntryPredicate... filter)
+    @Nullable public CacheObject peek(GridCachePeekMode mode, CacheEntryPredicate... filter)
         throws GridCacheEntryRemovedException;
 
     /**
@@ -607,7 +607,7 @@ public boolean tmLock(IgniteInternalTx tx, long timeout) throws GridCacheEntryRe
      * @return Value.
      * @throws GridCacheEntryRemovedException If entry has been removed.
      */
-    @Nullable public <K, V> CacheObject peek(Collection<GridCachePeekMode> modes,
+    @Nullable public CacheObject peek(Collection<GridCachePeekMode> modes,
         CacheEntryPredicate... filter) throws GridCacheEntryRemovedException;
 
     /**

diff --git a/...re/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManagerAdapter.java b/...re/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManagerAdapter.java
@@ -27,7 +27,7 @@
  */
 public class GridCacheManagerAdapter<K, V> implements GridCacheManager<K, V> {
     /** Context. */
-    protected GridCacheContext<K, V> cctx;
+    protected GridCacheContext cctx;
 
     /** Logger. */
     protected IgniteLogger log;

diff --git a/...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -2318,7 +2318,7 @@ protected void clearReader(UUID nodeId) throws GridCacheEntryRemovedException {
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> boolean clear(GridCacheVersion ver, boolean readers,
+    @Override public boolean clear(GridCacheVersion ver, boolean readers,
         @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException {
         cctx.denyOnFlag(READ);
 
@@ -2564,7 +2564,7 @@ protected void onInvalidate() {
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> boolean invalidate(@Nullable CacheEntryPredicate[] filter)
+    @Override public boolean invalidate(@Nullable CacheEntryPredicate[] filter)
         throws GridCacheEntryRemovedException, IgniteCheckedException {
         if (F.isEmptyOrNulls(filter)) {
             synchronized (this) {
@@ -2604,7 +2604,7 @@ protected void onInvalidate() {
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> boolean compact(@Nullable CacheEntryPredicate[] filter)
+    @Override public boolean compact(@Nullable CacheEntryPredicate[] filter)
         throws GridCacheEntryRemovedException, IgniteCheckedException {
         // For optimistic checking.
         GridCacheVersion startVer;
@@ -2796,7 +2796,7 @@ void next(int segId, @Nullable GridCacheMapEntry next) {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public <K, V> CacheObject peek(GridCachePeekMode mode,
+    @Nullable @Override public CacheObject peek(GridCachePeekMode mode,
         CacheEntryPredicate[] filter)
         throws GridCacheEntryRemovedException {
         try {
@@ -2848,7 +2848,7 @@ void next(int segId, @Nullable GridCacheMapEntry next) {
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> CacheObject peek(Collection<GridCachePeekMode> modes,
+    @Override public CacheObject peek(Collection<GridCachePeekMode> modes,
         CacheEntryPredicate[] filter)
         throws GridCacheEntryRemovedException {
         assert modes != null;
@@ -2996,7 +2996,7 @@ private void groupLockSanityCheck(IgniteInternalTx tx) throws GridCacheEntryRemo
      * @throws GridCacheEntryRemovedException If entry got removed.
      * @throws IgniteCheckedException If unexpected cache failure occurred.
      */
-    @Nullable private <K, V> GridTuple<CacheObject> peekTxThenGlobal(boolean failFast,
+    @Nullable private GridTuple<CacheObject> peekTxThenGlobal(boolean failFast,
         CacheEntryPredicate[] filter,
         IgniteInternalTx tx)
         throws GridCacheFilterFailedException, GridCacheEntryRemovedException, IgniteCheckedException
@@ -3019,7 +3019,7 @@ private void groupLockSanityCheck(IgniteInternalTx tx) throws GridCacheEntryRemo
      * @return Peeked value.
      * @throws GridCacheFilterFailedException If filter failed.
      */
-    @Nullable private <K, V> GridTuple<CacheObject> peekTx(boolean failFast,
+    @Nullable private GridTuple<CacheObject> peekTx(boolean failFast,
         CacheEntryPredicate[] filter,
         @Nullable IgniteInternalTx tx) throws GridCacheFilterFailedException {
         return tx == null ? null : tx.peek(cctx, failFast, key, filter);
@@ -3036,7 +3036,7 @@ private void groupLockSanityCheck(IgniteInternalTx tx) throws GridCacheEntryRemo
      * @throws IgniteCheckedException If unexpected cache failure occurred.
      */
     @SuppressWarnings({"RedundantTypeArguments"})
-    @Nullable private <K, V> GridTuple<CacheObject> peekGlobal(boolean failFast,
+    @Nullable private GridTuple<CacheObject> peekGlobal(boolean failFast,
         long topVer,
         CacheEntryPredicate[] filter,
         @Nullable IgniteCacheExpiryPolicy expiryPlc
@@ -3092,7 +3092,7 @@ private void groupLockSanityCheck(IgniteInternalTx tx) throws GridCacheEntryRemo
      * @throws GridCacheFilterFailedException If filter failed.
      */
     @SuppressWarnings({"unchecked"})
-    @Nullable private <K, V> GridTuple<CacheObject> peekSwap(boolean failFast,
+    @Nullable private GridTuple<CacheObject> peekSwap(boolean failFast,
         CacheEntryPredicate[] filter)
         throws IgniteCheckedException, GridCacheFilterFailedException
     {
@@ -3837,7 +3837,7 @@ protected CacheObject saveValueForIndexUnlocked() throws IgniteCheckedException
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer,
+    @Override public boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer,
         @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException {
         boolean marked = false;
 
@@ -3976,7 +3976,7 @@ protected CacheObject saveValueForIndexUnlocked() throws IgniteCheckedException
      * @param filter Entry filter.
      * @return {@code True} if entry is visitable.
      */
-    public <K, V> boolean visitable(CacheEntryPredicate[] filter) {
+    public boolean visitable(CacheEntryPredicate[] filter) {
         try {
             if (obsoleteOrDeleted() || (filter != CU.empty0() &&
                 !cctx.isAll(this, filter)))