# ignite updated javax.cache version, minor fix for IgniteException.getMessage
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7abc5f9a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7abc5f9a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7abc5f9a Branch: refs/heads/ignite-1 Commit: 7abc5f9ac9ba8cd0015b67246aa3c0d8dfd68b6c Parents: 794e054 Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 30 09:29:08 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 30 09:29:08 2014 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 2 +- modules/core/src/main/java/org/apache/ignite/IgniteCache.java | 3 ++- .../core/src/main/java/org/apache/ignite/IgniteException.java | 2 +- .../main/java/org/apache/ignite/cache/CacheConfiguration.java | 2 +- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7abc5f9a/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/7abc5f9a/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/7abc5f9a/modules/core/src/main/java/org/apache/ignite/IgniteException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteException.java b/modules/core/src/main/java/org/apache/ignite/IgniteException.java index 85f000f..b4ffb31 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteException.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteException.java @@ -85,7 +85,7 @@ public class IgniteException extends RuntimeException { * Adds troubleshooting links if they where not added by below in {@code cause} hierarchy. */ @Override public String getMessage() { - return X.hasCauseExcludeRoot(this, IgniteException.class, IgniteException.class) ? + return X.hasCauseExcludeRoot(this, IgniteException.class, IgniteCheckedException.class) ? super.getMessage() : errorMessageWithHelpUrls(super.getMessage()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7abc5f9a/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/7abc5f9a/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 5971d69..2d40f29 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 @@ -60,7 +60,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(); } @@ -468,7 +468,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.
