From 6da37c30d3ba6fe915b6e61324a188b81cb2fb42 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 6 Dec 2016 12:04:23 +0000
Subject: [PATCH] Use default cache configuration
---
.../samples/petclinic/system/CacheConfig.java | 27 -------------------
.../samples/petclinic/vet/VetRepository.java | 5 ++--
2 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfig.java b/src/main/java/org/springframework/samples/petclinic/system/CacheConfig.java
index 5a167a1..8798bfb 100755
--- a/src/main/java/org/springframework/samples/petclinic/system/CacheConfig.java
+++ b/src/main/java/org/springframework/samples/petclinic/system/CacheConfig.java
@@ -1,19 +1,6 @@
package org.springframework.samples.petclinic.system;
-import java.util.concurrent.TimeUnit;
-import javax.cache.CacheManager;
-
-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;
@@ -24,18 +11,4 @@ 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));
- };
- }
-
}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java b/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
index 4f3a512..20863ce 100644
--- a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
@@ -17,8 +17,7 @@ package org.springframework.samples.petclinic.vet;
import java.util.Collection;
-import javax.cache.annotation.CacheResult;
-
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.dao.DataAccessException;
import org.springframework.data.repository.Repository;
import org.springframework.transaction.annotation.Transactional;
@@ -40,7 +39,7 @@ public interface VetRepository extends Repository<Vet, Integer> {
* @return a <code>Collection</code> of <code>Vet</code>s
*/
@Transactional(readOnly = true)
- @CacheResult(cacheName = "vets")
+ @Cacheable("vets")
Collection<Vet> findAll() throws DataAccessException;
--
GitLab