ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: # ignite-265
Date Mon, 16 Feb 2015 09:44:45 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-265 9cd987c52 -> cd74359c9


# ignite-265


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd74359c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd74359c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd74359c

Branch: refs/heads/ignite-265
Commit: cd74359c982efe24d9e4247af61629c4d4538fbf
Parents: 9cd987c
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Feb 16 12:43:17 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Feb 16 12:43:17 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/configuration/CacheConfiguration.java | 12 ++++++------
 .../internal/processors/cache/GridCacheMapEntry.java    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd74359c/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 a45839b..858dc3c 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
@@ -448,7 +448,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
      * @return Cache eviction policy or {@code null} if evictions should be disabled.
      */
     @SuppressWarnings({"unchecked"})
-    @Nullable public <K, V> CacheEvictionPolicy<K, V> getEvictionPolicy() {
+    @Nullable public CacheEvictionPolicy<K, V> getEvictionPolicy() {
         return evictPlc;
     }
 
@@ -509,7 +509,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
      * @return Cache eviction policy or {@code null} if evictions should be disabled.
      */
     @SuppressWarnings({"unchecked"})
-    @Nullable public <K, V> CacheEvictionPolicy<K, V> getNearEvictionPolicy()
{
+    @Nullable public CacheEvictionPolicy<K, V> getNearEvictionPolicy() {
         return nearEvictPlc;
     }
 
@@ -821,7 +821,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
      * @return Cache store factory.
      */
     @SuppressWarnings("unchecked")
-    public <K, V> Factory<CacheStore<? super K, ? super V>> getCacheStoreFactory()
{
+    public Factory<CacheStore<? super K, ? super V>> getCacheStoreFactory() {
         return (Factory<CacheStore<? super K, ? super V>>)storeFactory;
     }
 
@@ -831,7 +831,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
      * @param storeFactory Cache store factory.
      */
     @SuppressWarnings("unchecked")
-    public <K, V> void setCacheStoreFactory(Factory<? extends CacheStore<? super
K, ? super V>> storeFactory) {
+    public void setCacheStoreFactory(Factory<? extends CacheStore<? super K, ? super
V>> storeFactory) {
         this.storeFactory = storeFactory;
     }
 
@@ -1546,7 +1546,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
      * @return Cache interceptor.
      */
     @SuppressWarnings({"unchecked"})
-    @Nullable public <K, V> CacheInterceptor<K, V> getInterceptor() {
+    @Nullable public CacheInterceptor<K, V> getInterceptor() {
         return (CacheInterceptor<K, V>)interceptor;
     }
 
@@ -1555,7 +1555,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
      *
      * @param interceptor Cache interceptor.
      */
-    public <K, V> void setInterceptor(CacheInterceptor<K, V> interceptor) {
+    public void setInterceptor(CacheInterceptor<K, V> interceptor) {
         this.interceptor = interceptor;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd74359c/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 f4de29b..dc0fa59 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
@@ -1170,7 +1170,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K,
V>
             old = (retval || intercept) ? rawGetOrUnmarshalUnlocked(!retval) : val;
 
             if (intercept) {
-                interceptRes = cctx.config().<K, V>getInterceptor().onBeforeRemove(key,
old);
+                interceptRes = cctx.config().getInterceptor().onBeforeRemove(key, old);
 
                 if (cctx.cancelRemove(interceptRes))
                     return new GridCacheUpdateTxResult<>(false, cctx.<V>unwrapTemporary(interceptRes.get2()));
@@ -2017,7 +2017,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K,
V>
             }
             else {
                 if (intercept) {
-                    interceptRes = cctx.config().<K, V>getInterceptor().onBeforeRemove(key,
old);
+                    interceptRes = cctx.config().getInterceptor().onBeforeRemove(key, old);
 
                     if (cctx.cancelRemove(interceptRes))
                         return new GridCacheUpdateAtomicResult<>(false,


Mime
View raw message