Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Caffeine 2.1.0

Browse Source
This commit is contained in:
Stephane Nicoll
2016-01-28 16:50:29 +01:00
parent ccbfd44862
commit aed56ea732
4 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java vendored
View File

@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
* Spring {@link org.springframework.cache.Cache} adapter implementation
* on top of a Caffeine {@link com.github.benmanes.caffeine.cache.Cache} instance.
*
* <p>Requires Caffeine 2.0 or higher.
* <p>Requires Caffeine 2.1 or higher.
*
* @author Ben Manes
* @author Juergen Hoeller

38
spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCacheManager.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import java.util.concurrent.ConcurrentMap;
import com.github.benmanes.caffeine.cache.CacheLoader;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.CaffeineSpec;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
@@ -38,10 +39,12 @@ import org.springframework.util.ObjectUtils;
* with no dynamic creation of further cache regions at runtime.
*
* <p>The configuration of the underlying cache can be fine-tuned through a
* {@link Caffeine} builder, passed into this CacheManager through
* {@link #setCaffeine}.
* {@link Caffeine} builder or {@link CaffeineSpec}, passed into this
* CacheManager through {@link #setCaffeine}/{@link #setCaffeineSpec}.
* A {@link CaffeineSpec}-compliant expression value can also be applied
* via the {@link #setCacheSpecification "cacheSpecification"} bean property.
*
* <p>Requires Caffeine 2.0 or higher.
* <p>Requires Caffeine 2.1 or higher.
*
* @author Ben Manes
* @author Juergen Hoeller
@@ -103,9 +106,30 @@ public class CaffeineCacheManager implements CacheManager {
* @see #createNativeCaffeineCache
* @see com.github.benmanes.caffeine.cache.Caffeine#build()
*/
public void setCaffeine(Caffeine<Object, Object> cacheBuilder) {
Assert.notNull(cacheBuilder, "Caffeine must not be null");
doSetCaffeine(cacheBuilder);
public void setCaffeine(Caffeine<Object, Object> caffeine) {
Assert.notNull(caffeine, "Caffeine must not be null");
doSetCaffeine(caffeine);
}
/**
* Set the {@link CaffeineSpec} to use for building each individual
* {@link CaffeineCache} instance.
* @see #createNativeCaffeineCache
* @see com.github.benmanes.caffeine.cache.Caffeine#from(CaffeineSpec)
*/
public void setCaffeineSpec(CaffeineSpec caffeineSpec) {
doSetCaffeine(Caffeine.from(caffeineSpec));
}
/**
* Set the Caffeine cache specification String to use for building each
* individual {@link CaffeineCache} instance. The given value needs to
* comply with Caffeine's {@link CaffeineSpec} (see its javadoc).
* @see #createNativeCaffeineCache
* @see com.github.benmanes.caffeine.cache.Caffeine#from(String)
*/
public void setCacheSpecification(String cacheSpecification) {
doSetCaffeine(Caffeine.from(cacheSpecification));
}
/**