From b00a01c9d7140b9147ab2bcf7345610fdd579cb2 Mon Sep 17 00:00:00 2001 From: James Netherton Date: Thu, 27 Jun 2024 13:02:28 +0100 Subject: [PATCH] Ensure additional caffeine cache classes are registered for reflection if stats are enabled Fixes #6230 --- .../deployment/CaffeineProcessor.java | 21 +++++++++++++++++-- .../src/main/resources/application.properties | 18 ++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 integration-tests/caffeine/src/main/resources/application.properties diff --git a/extensions/caffeine/deployment/src/main/java/org/apache/camel/quarkus/component/caffeine/deployment/CaffeineProcessor.java b/extensions/caffeine/deployment/src/main/java/org/apache/camel/quarkus/component/caffeine/deployment/CaffeineProcessor.java index 47f00bef6db1..be17e6c752bb 100644 --- a/extensions/caffeine/deployment/src/main/java/org/apache/camel/quarkus/component/caffeine/deployment/CaffeineProcessor.java +++ b/extensions/caffeine/deployment/src/main/java/org/apache/camel/quarkus/component/caffeine/deployment/CaffeineProcessor.java @@ -16,16 +16,33 @@ */ package org.apache.camel.quarkus.component.caffeine.deployment; +import java.util.function.BooleanSupplier; + import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; -import org.jboss.jandex.DotName; +import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem; +import org.apache.camel.quarkus.core.deployment.util.CamelSupport; + +import static io.quarkus.caffeine.runtime.graal.CacheConstructorsFeature.REGISTER_RECORD_STATS_IMPLEMENTATIONS; class CaffeineProcessor { private static final String FEATURE = "camel-caffeine"; - private static final DotName CACHE_LOADER_NAME = DotName.createSimple("com.github.benmanes.caffeine.cache.CacheLoader"); @BuildStep FeatureBuildItem feature() { return new FeatureBuildItem(FEATURE); } + + @BuildStep(onlyIf = CamelCaffeineStatsEnabled.class) + NativeImageSystemPropertyBuildItem registerRecordStatsImplementations() { + return new NativeImageSystemPropertyBuildItem(REGISTER_RECORD_STATS_IMPLEMENTATIONS, "true"); + } + + static final class CamelCaffeineStatsEnabled implements BooleanSupplier { + @Override + public boolean getAsBoolean() { + return CamelSupport.getOptionalConfigValue("camel.component.caffeine-cache.stats-enabled", boolean.class, false) || + CamelSupport.getOptionalConfigValue("camel.component.caffeine-cache.statsEnabled", boolean.class, false); + } + } } diff --git a/integration-tests/caffeine/src/main/resources/application.properties b/integration-tests/caffeine/src/main/resources/application.properties new file mode 100644 index 000000000000..f9074003e25c --- /dev/null +++ b/integration-tests/caffeine/src/main/resources/application.properties @@ -0,0 +1,18 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You 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. +## --------------------------------------------------------------------------- + +camel.component.caffeine-cache.stats-enabled = true