Remove Guava cache support
This commit removes `GuavaCache` and support classes. Caffeine supersedes the caching support in the Google Guava library with an actively maintained Java 8+ version in standalone form. As it is the only Guava feature Spring framework integrates with, this commit removes effectively any reference to Guava. Issue: SPR-13797
This commit is contained in:
Stephane Nicoll
@@ -1,186 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2015 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.cache.guava;
|
||||
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.google.common.cache.CacheLoader;
|
||||
import com.google.common.util.concurrent.UncheckedExecutionException;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.ExpectedException;
|
||||
|
||||
import org.springframework.cache.Cache;
|
||||
import org.springframework.cache.CacheManager;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
/**
|
||||
* @author Juergen Hoeller
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class GuavaCacheManagerTests {
|
||||
|
||||
@Rule
|
||||
public final ExpectedException thrown = ExpectedException.none();
|
||||
|
||||
@Test
|
||||
public void testDynamicMode() {
|
||||
CacheManager cm = new GuavaCacheManager();
|
||||
Cache cache1 = cm.getCache("c1");
|
||||
assertTrue(cache1 instanceof GuavaCache);
|
||||
Cache cache1again = cm.getCache("c1");
|
||||
assertSame(cache1again, cache1);
|
||||
Cache cache2 = cm.getCache("c2");
|
||||
assertTrue(cache2 instanceof GuavaCache);
|
||||
Cache cache2again = cm.getCache("c2");
|
||||
assertSame(cache2again, cache2);
|
||||
Cache cache3 = cm.getCache("c3");
|
||||
assertTrue(cache3 instanceof GuavaCache);
|
||||
Cache cache3again = cm.getCache("c3");
|
||||
assertSame(cache3again, cache3);
|
||||
|
||||
cache1.put("key1", "value1");
|
||||
assertEquals("value1", cache1.get("key1").get());
|
||||
cache1.put("key2", 2);
|
||||
assertEquals(2, cache1.get("key2").get());
|
||||
cache1.put("key3", null);
|
||||
assertNull(cache1.get("key3").get());
|
||||
cache1.evict("key3");
|
||||
assertNull(cache1.get("key3"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testStaticMode() {
|
||||
GuavaCacheManager cm = new GuavaCacheManager("c1", "c2");
|
||||
Cache cache1 = cm.getCache("c1");
|
||||
assertTrue(cache1 instanceof GuavaCache);
|
||||
Cache cache1again = cm.getCache("c1");
|
||||
assertSame(cache1again, cache1);
|
||||
Cache cache2 = cm.getCache("c2");
|
||||
assertTrue(cache2 instanceof GuavaCache);
|
||||
Cache cache2again = cm.getCache("c2");
|
||||
assertSame(cache2again, cache2);
|
||||
Cache cache3 = cm.getCache("c3");
|
||||
assertNull(cache3);
|
||||
|
||||
cache1.put("key1", "value1");
|
||||
assertEquals("value1", cache1.get("key1").get());
|
||||
cache1.put("key2", 2);
|
||||
assertEquals(2, cache1.get("key2").get());
|
||||
cache1.put("key3", null);
|
||||
assertNull(cache1.get("key3").get());
|
||||
cache1.evict("key3");
|
||||
assertNull(cache1.get("key3"));
|
||||
|
||||
cm.setAllowNullValues(false);
|
||||
Cache cache1x = cm.getCache("c1");
|
||||
assertTrue(cache1x instanceof GuavaCache);
|
||||
assertTrue(cache1x != cache1);
|
||||
Cache cache2x = cm.getCache("c2");
|
||||
assertTrue(cache2x instanceof GuavaCache);
|
||||
assertTrue(cache2x != cache2);
|
||||
Cache cache3x = cm.getCache("c3");
|
||||
assertNull(cache3x);
|
||||
|
||||
cache1x.put("key1", "value1");
|
||||
assertEquals("value1", cache1x.get("key1").get());
|
||||
cache1x.put("key2", 2);
|
||||
assertEquals(2, cache1x.get("key2").get());
|
||||
try {
|
||||
cache1x.put("key3", null);
|
||||
fail("Should have thrown NullPointerException");
|
||||
}
|
||||
catch (NullPointerException ex) {
|
||||
// expected
|
||||
}
|
||||
|
||||
cm.setAllowNullValues(true);
|
||||
Cache cache1y = cm.getCache("c1");
|
||||
|
||||
cache1y.put("key3", null);
|
||||
assertNull(cache1y.get("key3").get());
|
||||
cache1y.evict("key3");
|
||||
assertNull(cache1y.get("key3"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void changeCacheSpecificationRecreateCache() {
|
||||
GuavaCacheManager cm = new GuavaCacheManager("c1");
|
||||
Cache cache1 = cm.getCache("c1");
|
||||
|
||||
CacheBuilder<Object, Object> cacheBuilder = CacheBuilder.newBuilder().maximumSize(10);
|
||||
cm.setCacheBuilder(cacheBuilder);
|
||||
Cache cache1x = cm.getCache("c1");
|
||||
assertTrue(cache1x != cache1);
|
||||
|
||||
cm.setCacheBuilder(cacheBuilder); // Set same instance
|
||||
Cache cache1xx = cm.getCache("c1");
|
||||
assertSame(cache1x, cache1xx);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void changeCacheLoaderRecreateCache() {
|
||||
GuavaCacheManager cm = new GuavaCacheManager("c1");
|
||||
Cache cache1 = cm.getCache("c1");
|
||||
|
||||
CacheLoader<Object,Object> loader = mockCacheLoader();
|
||||
cm.setCacheLoader(loader);
|
||||
Cache cache1x = cm.getCache("c1");
|
||||
assertTrue(cache1x != cache1);
|
||||
|
||||
cm.setCacheLoader(loader); // Set same instance
|
||||
Cache cache1xx = cm.getCache("c1");
|
||||
assertSame(cache1x, cache1xx);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setCacheNameNullRestoreDynamicMode() {
|
||||
GuavaCacheManager cm = new GuavaCacheManager("c1");
|
||||
assertNull(cm.getCache("someCache"));
|
||||
cm.setCacheNames(null);
|
||||
assertNotNull(cm.getCache("someCache"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cacheLoaderUseLoadingCache() {
|
||||
GuavaCacheManager cm = new GuavaCacheManager("c1");
|
||||
cm.setCacheLoader(new CacheLoader<Object, Object>() {
|
||||
@Override
|
||||
public Object load(Object key) throws Exception {
|
||||
if ("ping".equals(key)) {
|
||||
return "pong";
|
||||
}
|
||||
throw new IllegalArgumentException("I only know ping");
|
||||
}
|
||||
});
|
||||
Cache cache1 = cm.getCache("c1");
|
||||
Cache.ValueWrapper value = cache1.get("ping");
|
||||
assertNotNull(value);
|
||||
assertEquals("pong", value.get());
|
||||
|
||||
thrown.expect(UncheckedExecutionException.class);
|
||||
thrown.expectMessage("I only know ping");
|
||||
assertNull(cache1.get("foo"));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private CacheLoader<Object, Object> mockCacheLoader() {
|
||||
return mock(CacheLoader.class);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2015 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.cache.guava;
|
||||
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.springframework.cache.AbstractCacheTests;
|
||||
import org.springframework.cache.Cache;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class GuavaCacheTests extends AbstractCacheTests<GuavaCache> {
|
||||
|
||||
private com.google.common.cache.Cache<Object, Object> nativeCache;
|
||||
private GuavaCache cache;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
nativeCache = CacheBuilder.newBuilder().build();
|
||||
cache = new GuavaCache(CACHE_NAME, nativeCache);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected GuavaCache getCache() {
|
||||
return cache;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Object getNativeCache() {
|
||||
return nativeCache;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void putIfAbsentNullValue() throws Exception {
|
||||
GuavaCache cache = getCache();
|
||||
|
||||
Object key = new Object();
|
||||
Object value = null;
|
||||
|
||||
assertNull(cache.get(key));
|
||||
assertNull(cache.putIfAbsent(key, value));
|
||||
assertEquals(value, cache.get(key).get());
|
||||
Cache.ValueWrapper wrapper = cache.putIfAbsent(key, "anotherValue");
|
||||
assertNotNull(wrapper); // A value is set but is 'null'
|
||||
assertEquals(null, wrapper.get());
|
||||
assertEquals(value, cache.get(key).get()); // not changed
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user