Merge b41b3d7fd0 into 63dadcc07f

src/main/java/org/springframework/samples/petclinic/system/CacheConfig.java

@@ -1,6 +1,18 @@
 package org.springframework.samples.petclinic.system;
 
+import java.util.concurrent.TimeUnit;
+
+import org.ehcache.config.CacheConfiguration;
+import org.ehcache.config.builders.CacheConfigurationBuilder;
+import org.ehcache.config.builders.ResourcePoolsBuilder;
+import org.ehcache.config.units.EntryUnit;
+import org.ehcache.expiry.Duration;
+import org.ehcache.expiry.Expirations;
+import org.ehcache.jsr107.Eh107Configuration;
+
+import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 
@@ -11,4 +23,18 @@ import org.springframework.context.annotation.Profile;
 @EnableCaching
 @Profile("production")
 class CacheConfig {
+	
+    @Bean
+    public JCacheManagerCustomizer cacheManagerCustomizer() {
+        return cacheManager -> {
+            CacheConfiguration<Object, Object> config = CacheConfigurationBuilder
+                .newCacheConfigurationBuilder(Object.class, Object.class,
+                    ResourcePoolsBuilder.newResourcePoolsBuilder()
+                        .heap(100, EntryUnit.ENTRIES))
+                .withExpiry(Expirations.timeToLiveExpiration(Duration.of(60, TimeUnit.SECONDS)))
+                .build();
+            cacheManager.createCache("vets", Eh107Configuration.fromEhcacheCacheConfiguration(config));
+        };
+    }
+
 }

src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java

@@ -17,7 +17,8 @@ package org.springframework.samples.petclinic.vet;
 
 import java.util.Collection;
 
-import org.springframework.cache.annotation.Cacheable;
+import javax.cache.annotation.CacheResult;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.repository.Repository;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,8 +40,7 @@ public interface VetRepository extends Repository<Vet, Integer> {
      * @return a <code>Collection</code> of <code>Vet</code>s
      */
     @Transactional(readOnly = true)
-    @Cacheable("vets")
+    @CacheResult(cacheName = "vets")
     Collection<Vet> findAll() throws DataAccessException;
 
-
 }