You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/23 09:23:13 UTC
[37/38] incubator-ignite git commit: # ignite-41
# ignite-41
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a24e95ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a24e95ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a24e95ca
Branch: refs/heads/ignite-1
Commit: a24e95cad5a3da0c18d03b0d2ad651da1a4ae374
Parents: 32643c1
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 23 10:29:32 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 23 10:29:32 2014 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 2 +-
modules/core/src/main/java/org/apache/ignite/IgniteCache.java | 3 ++-
.../main/java/org/apache/ignite/cache/CacheConfiguration.java | 2 +-
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 5 ++---
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a24e95ca/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index cf84023..cf9e66b 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
- <version>1.0.0-PFD</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a24e95ca/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 48a601e..a59573e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -16,6 +16,7 @@ import org.apache.ignite.transactions.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
+import javax.cache.configuration.*;
import javax.cache.expiry.*;
import java.util.*;
import java.util.concurrent.locks.*;
@@ -57,7 +58,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
public @Override IgniteCache<K, V> enableAsync();
/** {@inheritDoc} */
- public @Override CacheConfiguration<K, V> getConfiguration();
+ public @Override <C extends Configuration<K, V>> C getConfiguration(Class<C> clazz);
/**
* Gets a random entry out of cache. In the worst cache scenario this method
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a24e95ca/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
index 617f65f..d977b2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
@@ -18,6 +18,6 @@ import javax.cache.configuration.*;
* @version @java.version
*/
// TODO: remove 'abstract'
-public abstract class CacheConfiguration<K, V> extends Configuration<K, V> {
+public abstract class CacheConfiguration<K, V> implements Configuration<K, V> {
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a24e95ca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index c0870c8..3945234 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.tostring.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -67,7 +66,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable
}
/** {@inheritDoc} */
- @Override public CacheConfiguration<K, V> getConfiguration() {
+ @Override public <C extends Configuration<K, V>> C getConfiguration(Class<C> clazz) {
// TODO IGNITE-1.
throw new UnsupportedOperationException();
}
@@ -500,7 +499,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable
}
/** {@inheritDoc} */
- @Override public <T> Map<K, T> invokeAll(Set<? extends K> keys,
+ @Override public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K> keys,
EntryProcessor<K, V, T> entryProcessor,
Object... args) {
// TODO IGNITE-1.