root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Consistently support LoadingCache 

This commits make sure that CaffeineCache handles consistently the
contract of LoadingCache.

Closes gh-25173
This commit is contained in:
Stephane Nicoll 2020-08-07 10:38:27 +02:00
parent b6ef3cfad5
commit f3cedf268b
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,16 +83,6 @@ public class CaffeineCache extends AbstractValueAdaptingCache {
return this.cache; return this.cache;
} }
@Override
@Nullable
public ValueWrapper get(Object key) {
if (this.cache instanceof LoadingCache) {
Object value = ((LoadingCache<Object, Object>) this.cache).get(key);
return toValueWrapper(value);
}
return super.get(key);
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
@Nullable @Nullable
@ -103,6 +93,9 @@ public class CaffeineCache extends AbstractValueAdaptingCache {
@Override @Override
@Nullable @Nullable
protected Object lookup(Object key) { protected Object lookup(Object key) {
if (this.cache instanceof LoadingCache) {
return ((LoadingCache<Object, Object>) this.cache).get(key);
}
return this.cache.getIfPresent(key); return this.cache.getIfPresent(key);
} }

32
spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -21,9 +21,11 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.cache.Cache; import org.springframework.cache.Cache;
import org.springframework.cache.Cache.ValueWrapper;
import org.springframework.context.testfixture.cache.AbstractValueAdaptingCacheTests; import org.springframework.context.testfixture.cache.AbstractValueAdaptingCacheTests;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
/** /**
* @author Ben Manes * @author Ben Manes
@ -61,6 +63,34 @@ public class CaffeineCacheTests extends AbstractValueAdaptingCacheTests<Caffeine
return nativeCache; return nativeCache;
} }
@Test
void testLoadingCacheGet() {
Object value = new Object();
CaffeineCache loadingCache = new CaffeineCache(CACHE_NAME, Caffeine.newBuilder()
.build(key -> value));
ValueWrapper valueWrapper = loadingCache.get(new Object());
assertThat(valueWrapper).isNotNull();
assertThat(valueWrapper.get()).isEqualTo(value);
}
@Test
void testLoadingCacheGetWithType() {
String value = "value";
CaffeineCache loadingCache = new CaffeineCache(CACHE_NAME, Caffeine.newBuilder()
.build(key -> value));
String valueWrapper = loadingCache.get(new Object(), String.class);
assertThat(valueWrapper).isNotNull();
assertThat(valueWrapper).isEqualTo(value);
}
@Test
void testLoadingCacheGetWithWrongType() {
String value = "value";
CaffeineCache loadingCache = new CaffeineCache(CACHE_NAME, Caffeine.newBuilder()
.build(key -> value));
assertThatIllegalStateException().isThrownBy(() -> loadingCache.get(new Object(), Long.class));
}
@Test @Test
public void testPutIfAbsentNullValue() throws Exception { public void testPutIfAbsentNullValue() throws Exception {
CaffeineCache cache = getCache(); CaffeineCache cache = getCache();