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-758 minor
Date Thu, 16 Apr 2015 13:16:04 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-758 255a701f7 -> 2109e3394


# ignite-758 minor


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

Branch: refs/heads/ignite-758
Commit: 2109e3394c997acf8db65f51b5c951383b3290be
Parents: 255a701
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Apr 16 16:15:55 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Apr 16 16:15:55 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/CacheProjectionContext.java    | 16 ++++------------
 .../internal/processors/cache/InternalCache.java    |  3 +--
 .../processors/cache/query/CacheQueriesImpl.java    |  5 +----
 .../handlers/cache/GridCacheCommandHandler.java     |  4 ++--
 .../processors/query/h2/IgniteH2Indexing.java       |  2 +-
 5 files changed, 9 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2109e339/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java
index 1a1aa92..86ab204 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java
@@ -34,23 +34,16 @@ public class CacheProjectionContext implements Serializable {
 
     /** Skip store. */
     @GridToStringInclude
-    private boolean skipStore;
+    private final boolean skipStore;
 
     /** Client ID which operates over this projection, if any, */
-    private UUID subjId;
+    private final UUID subjId;
 
     /** */
-    private boolean keepPortable;
+    private final boolean keepPortable;
 
     /** */
-    private ExpiryPolicy expiryPlc;
-
-    /**
-     * Empty constructor required for {@link Externalizable}.
-     */
-    public CacheProjectionContext() {
-        // No-op.
-    }
+    private final ExpiryPolicy expiryPlc;
 
     /**
      * @param skipStore Skip store flag.
@@ -63,7 +56,6 @@ public class CacheProjectionContext implements Serializable {
         @Nullable UUID subjId,
         boolean keepPortable,
         @Nullable ExpiryPolicy expiryPlc) {
-
         this.skipStore = skipStore;
 
         this.subjId = subjId;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2109e339/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/InternalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/InternalCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/InternalCache.java
index 35bf61c..ffd7179 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/InternalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/InternalCache.java
@@ -1737,8 +1737,7 @@ public interface InternalCache<K, V> extends Iterable<Cache.Entry<K,
V>> {
     /**
      * @return {@link javax.cache.expiry.ExpiryPolicy} associated with this projection.
      */
-    public @Nullable
-    ExpiryPolicy expiry();
+    @Nullable public ExpiryPolicy expiry();
 
     /**
      * @param plc {@link ExpiryPolicy} to associate with this projection.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2109e339/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java
index 0bc26ea..ef01bda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java
@@ -34,9 +34,6 @@ import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryTy
  */
 public class CacheQueriesImpl<K, V> implements CacheQueries<K, V> {
     /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
     private GridCacheContext<K, V> ctx;
 
     /** */
@@ -44,7 +41,7 @@ public class CacheQueriesImpl<K, V> implements CacheQueries<K,
V> {
 
     /**
      * @param ctx Context.
-     * @param keepPortable Projection.
+     * @param keepPortable Keep portable flag.
      */
     public CacheQueriesImpl(GridCacheContext<K, V> ctx, boolean keepPortable) {
         assert ctx != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2109e339/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 5d74358..6b82b24 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -908,7 +908,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter
{
             if (ttl != null && ttl > 0) {
                 Duration duration = new Duration(MILLISECONDS, ttl);
 
-                c = ((InternalCache<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration));
+                c = c.withExpiryPolicy(new ModifiedExpiryPolicy(duration));
             }
 
             return c.putIfAbsentAsync(key, val);
@@ -945,7 +945,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter
{
             if (ttl != null && ttl > 0) {
                 Duration duration = new Duration(MILLISECONDS, ttl);
 
-                c = ((InternalCache<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration));
+                c = c.withExpiryPolicy(new ModifiedExpiryPolicy(duration));
             }
 
             return c.replaceAsync(key, val);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2109e339/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 41af557..e9cef3e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1929,7 +1929,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
         @Override public Object readFromSwap(Object key) throws IgniteCheckedException {
             InternalCache<Object, ?> cache = ctx.cache().cache(schema.spaceName);
 
-            GridCacheContext cctx = ((GridCacheProxyImpl)cache).context();
+            GridCacheContext cctx = cache.context();
 
             if (cctx.isNear())
                 cctx = cctx.near().dht().context();


Mime
View raw message