Merge pull request eugenp#221 from Doha2012/master

fix cache configuration

Author: Eugen

spring-all/pom.xml

@@ -32,6 +32,20 @@
             <version>${org.springframework.version}</version>
         </dependency>
 
+        <!-- aspectj  -->
+        
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        
         <!-- persistence -->
 
         <dependency>

spring-all/src/main/java/org/baeldung/caching/example/CustomerDataService.java

@@ -47,7 +47,7 @@ public String getAddress2(final Customer customer) {
      * @param customer the customer
      * @return the address
      */
-    @Caching(evict = { @CacheEvict("addresses"), @CacheEvict(value = "directory", key = "customer.name") })
+    @Caching(evict = { @CacheEvict("addresses"), @CacheEvict(value = "directory", key = "#customer.name") })
     public String getAddress3(final Customer customer) {
         return customer.getAddress();
     }
@@ -70,7 +70,7 @@ public String getAddress4(final Customer customer) {
      * @param customer the customer
      * @return the address
      */
-    @CachePut(value = "addresses", condition = "#customer.name='Tom'")
+    @CachePut(value = "addresses", condition = "#customer.name=='Tom'")
     // @CachePut(value = "addresses", unless = "#result.length>64")
     public String getAddress5(final Customer customer) {
         return customer.getAddress();

…org/baeldung/caching/resouces/config.xml spring-all/src/main/resources/config.xmlspring-all/src/main/java/org/baeldung/caching/resouces/config.xml renamed to spring-all/src/main/resources/config.xml spring-all/src/main/java/org/baeldung/caching/resouces/config.xml renamed to spring-all/src/main/resources/config.xml

@@ -12,23 +12,34 @@
 	<cache:annotation-driven />
 
 	<context:annotation-config />
-	<bean class="org.baeldung.caching.config.myAppConfig" />
+	<bean class="org.baeldung.caching.config.MyAppConfig" />
 
 	<!-- the service that you wish to make cacheable. -->
 	<bean id="customerDataService" class="org.baeldung.caching.example.CustomerDataService" />
 
+	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
+	    <property name="caches">
+	        <set>
+	            <bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" name="directory"/>
+                <bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" name="addresses"/>
+                <bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" name="addressDemo"/>
+	        </set>
+	    </property>
+	</bean>
+	
 	<!-- define caching behavior -->
 	<cache:advice id="cachingBehavior" cache-manager="cacheManager">
 		<cache:caching cache="addresses">
 			<cache:cacheable method="getAddress" key="#customer.name" />
 		</cache:caching>
 	</cache:advice>
 
+
 	<!-- apply the behavior to all the implementations of CustomerDataService 
 		interface -->
 	<aop:config>
 		<aop:advisor advice-ref="cachingBehavior"
-			pointcut="execution(*org.baeldung.caching.example.CustomerDataService.*(..))" />
+			pointcut="execution(* org.baeldung.caching.example.CustomerDataService.*(..))" />
 	</aop:config>
 
 </beans>

…hing/test/SpringCachingBehaviorTest.java …hing/test/SpringCachingBehaviorTest.javaspring-all/src/main/java/org/baeldung/caching/test/SpringCachingBehaviorTest.java renamed to spring-all/src/test/java/org/baeldung/caching/test/SpringCachingBehaviorTest.java spring-all/src/main/java/org/baeldung/caching/test/SpringCachingBehaviorTest.java renamed to spring-all/src/test/java/org/baeldung/caching/test/SpringCachingBehaviorTest.java

@@ -1,7 +1,5 @@
 package org.baeldung.caching.test;
 
-import static org.junit.Assert.fail;
-
 import org.baeldung.caching.example.Customer;
 import org.baeldung.caching.example.CustomerDataService;
 import org.junit.Test;
@@ -11,6 +9,7 @@
 
 @Component
 public class SpringCachingBehaviorTest {
+
     @Test
     public void testCaching() {
         @SuppressWarnings("resource")
@@ -19,7 +18,9 @@ public void testCaching() {
 
         final Customer cust = new Customer("Tom", "67-2, Downing Street, NY");
         service.getAddress1(cust);
-        fail("Unable to instantiate the CustomerDataService");
+        service.getAddress1(cust);
+
+        // fail("Unable to instantiate the CustomerDataService");
     }
 
 }