Skip to content

build(deps): bump com.github.ben-manes.caffeine:caffeine from 2.9.3 to 3.0.0 #4676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 3 commits into from
Apr 1, 2026
+11 −35
Merged

build(deps): bump com.github.ben-manes.caffeine:caffeine from 2.9.3 to 3.0.0 #4676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cac82df
build(deps): bump com.github.ben-manes.caffeine:caffeine
dependabot[bot] Apr 1, 2026
b609abe
fix: update KubernetesFromConfigMapProcessor for Caffeine 3.x compati…
Copilot Apr 1, 2026
66dd19c
fix: clean up imports and use Set.copyOf for snapshot in fullyRefresh…
Copilot Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<jakarta.ws.rs-api-version>3.1.0</jakarta.ws.rs-api-version>
<snakeyaml.version>2.6</snakeyaml.version>
<slf4j.version>2.0.17</slf4j.version>
<caffeine.version>2.9.3</caffeine.version>
<caffeine.version>3.0.0</caffeine.version>
<protobuf.version>4.34.1</protobuf.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
Expand Down
44 changes: 10 additions & 34 deletions ...java/io/kubernetes/client/spring/extended/manifests/KubernetesFromConfigMapProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,18 @@
*/
package io.kubernetes.client.spring.extended.manifests;

import com.github.benmanes.caffeine.cache.CacheLoader;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import io.kubernetes.client.openapi.models.V1ConfigMap;
import io.kubernetes.client.spring.extended.manifests.annotation.FromConfigMap;
import io.kubernetes.client.spring.extended.manifests.config.KubernetesManifestsProperties;
import io.kubernetes.client.spring.extended.manifests.configmaps.ConfigMapGetter;
import java.lang.reflect.Field;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
Expand Down Expand Up @@ -80,15 +77,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
ConfigMapGetter configMapGetter =
getOrCreateConfigMapGetter(fromConfigMapAnnotation, applicationContext);

LoadingCache<String, String> configMapDataCache =
Caffeine.newBuilder()
.expireAfterWrite(manifestsProperties.getRefreshInterval())
.build(
new ConfigMapGetterCacheLoader(
() -> {
return configMapGetter.get(
fromConfigMapAnnotation.namespace(), fromConfigMapAnnotation.name());
}));
Cache<String, String> configMapDataCache = Caffeine.newBuilder().build();
fullyRefreshCache(configMapGetter, fromConfigMapAnnotation, configMapDataCache);
configMapKeyRefresher.scheduleAtFixedRate(
() -> {
Expand All @@ -106,14 +95,19 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
private static void fullyRefreshCache(
ConfigMapGetter configMapGetter,
FromConfigMap fromConfigMapAnnotation,
LoadingCache<String, String> configMapDataCache) {
Cache<String, String> configMapDataCache) {
V1ConfigMap configMap =
configMapGetter.get(fromConfigMapAnnotation.namespace(), fromConfigMapAnnotation.name());
if (configMap == null || configMap.getData() == null) {
configMapDataCache.invalidateAll();
return;
}
// TODO: make the cache data refreshment atomic
configMap.getData().keySet().stream().forEach(key -> configMapDataCache.refresh(key));
Map<String, String> newData = configMap.getData();
newData.forEach(configMapDataCache::put);
Set.copyOf(configMapDataCache.asMap().keySet()).stream()
.filter(key -> !newData.containsKey(key))
.forEach(configMapDataCache::invalidate);
}

private ConfigMapGetter getOrCreateConfigMapGetter(
Expand Down Expand Up @@ -144,22 +138,4 @@ private ConfigMapGetter getOrCreateConfigMapGetter(
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.applicationContext = applicationContext;
}

static class ConfigMapGetterCacheLoader implements CacheLoader<String, String> {

ConfigMapGetterCacheLoader(Supplier<V1ConfigMap> configMapSupplier) {
this.configMapSupplier = configMapSupplier;
}

private final Supplier<V1ConfigMap> configMapSupplier;

@Override
public @Nullable String load(@NonNull String key) throws Exception {
V1ConfigMap configMap = this.configMapSupplier.get();
if (configMap == null || configMap.getData() == null) {
return null;
}
return configMap.getData().get(key);
}
}
}