Minor fixes in Spring Caching
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d38a70d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d38a70d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d38a70d2 Branch: refs/heads/ignite-961 Commit: d38a70d2c12c640624c70bd0cb5634bb65b6d041 Parents: de7e06f Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Jul 15 20:04:45 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Jul 15 20:04:45 2015 -0700 ---------------------------------------------------------------------- .../apache/ignite/cache/spring/SpringCache.java | 2 +- .../ignite/cache/spring/SpringCacheManager.java | 22 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d38a70d2/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java index 7651fbe..08aa38b 100644 --- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java +++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java @@ -48,7 +48,7 @@ class SpringCache implements Cache { } /** {@inheritDoc} */ - @Override public Cache.ValueWrapper get(Object key) { + @Override public ValueWrapper get(Object key) { Object val = cache.get(key); return val != null ? new SimpleValueWrapper(val) : null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d38a70d2/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java index afadaee..260026e 100644 --- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java +++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java @@ -41,15 +41,17 @@ import java.util.concurrent.*; * you will need to do the following: * <ul> * <li> - * Start a Ignite node with configured cache in the same JVM - * where you application is running. + * Start an Ignite node with proper configuration in embedded mode + * (i.e., in the same JVM where the application is running). It can + * already have predefined caches, but it's not required - caches + * will be created automatically on first access if needed. * </li> * <li> - * Configure {@code GridSpringCacheManager} as a cache provider - * in Spring application context. + * Configure {@code SpringCacheManager} as a cache provider + * in the Spring application context. * </li> * </ul> - * {@code GridSpringCacheManager} can start a node itself on its startup + * {@code SpringCacheManager} can start a node itself on its startup * based on provided Ignite configuration. You can provide path to a * Spring configuration XML file, like below (path can be absolute or * relative to {@code IGNITE_HOME}): @@ -61,9 +63,9 @@ import java.util.concurrent.*; * http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd * http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd"> * <-- Provide configuration file path. --> - * <bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager"> + * <bean id="cacheManager" class="org.apache.ignite.cache.spring.SpringCacheManager"> * <property name="configurationPath" value="examples/config/spring-cache.xml"/> - * </bean> + * </bean> * * <-- Use annotation-driven caching configuration. --> * <cache:annotation-driven/> @@ -78,7 +80,7 @@ import java.util.concurrent.*; * http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd * http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd"> * <-- Provide configuration bean. --> - * <bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager"> + * <bean id="cacheManager" class="org.apache.ignite.cache.spring.SpringCacheManager"> * <property name="configuration"> * <bean id="gridCfg" class="org.apache.ignite.configuration.IgniteConfiguration"> * ... @@ -104,7 +106,7 @@ import java.util.concurrent.*; * http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd * http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd"> * <-- Provide Grid name. --> - * <bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager"> + * <bean id="cacheManager" class="org.apache.ignite.cache.spring.SpringCacheManager"> * <property name="gridName" value="myGrid"/> * </bean> * @@ -247,7 +249,7 @@ public class SpringCacheManager implements CacheManager, InitializingBean { if (cfgPath != null && cfg != null) { throw new IllegalArgumentException("Both 'configurationPath' and 'configuration' are " + "provided. Set only one of these properties if you need to start a Ignite node inside of " + - "GridSpringCacheManager. If you already have a node running, omit both of them and set" + + "SpringCacheManager. If you already have a node running, omit both of them and set" + "'gridName' property."); }
