From 244de0fcea156138bd920d853d70063bb450f26d Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Wed, 29 May 2024 16:59:46 -0400 Subject: [PATCH] Rabbit biner AOT/native runtime hints * Add missing native runtime hints for the Rabbit binder properties classes Resolves https://github.com/spring-cloud/spring-cloud-stream/issues/2938 --- .../kafka/aot/KafkaBinderRuntimeHints.java | 3 +- .../rabbit/aot/RabbitBinderRuntimeHints.java | 55 +++++++++++++++++++ .../resources/META-INF/spring/aot.factories | 1 + buildRabbitBinder.sh | 4 +- 4 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/aot/RabbitBinderRuntimeHints.java create mode 100644 binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/resources/META-INF/spring/aot.factories diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/aot/KafkaBinderRuntimeHints.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/aot/KafkaBinderRuntimeHints.java index 9684b1d45..4adabe8d4 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/aot/KafkaBinderRuntimeHints.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/aot/KafkaBinderRuntimeHints.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2023 the original author or authors. + * Copyright 2023-2024 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. @@ -36,6 +36,7 @@ import org.springframework.lang.Nullable; * */ public class KafkaBinderRuntimeHints implements RuntimeHintsRegistrar { + @Override public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) { ReflectionHints reflectionHints = hints.reflection(); diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/aot/RabbitBinderRuntimeHints.java b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/aot/RabbitBinderRuntimeHints.java new file mode 100644 index 000000000..bf60a69ba --- /dev/null +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/aot/RabbitBinderRuntimeHints.java @@ -0,0 +1,55 @@ +/* + * Copyright 2024-2024 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 + * + * https://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.cloud.stream.binder.rabbit.aot; + +import java.util.stream.Stream; + +import org.springframework.aot.hint.MemberCategory; +import org.springframework.aot.hint.ReflectionHints; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.cloud.stream.binder.rabbit.properties.RabbitBindingProperties; +import org.springframework.cloud.stream.binder.rabbit.properties.RabbitCommonProperties; +import org.springframework.cloud.stream.binder.rabbit.properties.RabbitConsumerProperties; +import org.springframework.cloud.stream.binder.rabbit.properties.RabbitExtendedBindingProperties; +import org.springframework.cloud.stream.binder.rabbit.properties.RabbitProducerProperties; +import org.springframework.lang.Nullable; + +/** + * {@link RuntimeHintsRegistrar} for the Rabbit binder in Spring Cloud Stream. + * + * @author Soby Chacko + * @since 4.1.2 + * + */ +public class RabbitBinderRuntimeHints implements RuntimeHintsRegistrar { + + @Override + public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) { + ReflectionHints reflectionHints = hints.reflection(); + Stream.of( + RabbitCommonProperties.class, + RabbitConsumerProperties.class, + RabbitProducerProperties.class, + RabbitExtendedBindingProperties.class, + RabbitBindingProperties.class) + .forEach(type -> reflectionHints.registerType(type, + builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, + MemberCategory.INVOKE_DECLARED_METHODS, + MemberCategory.INTROSPECT_PUBLIC_METHODS))); + } +} diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/resources/META-INF/spring/aot.factories b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/resources/META-INF/spring/aot.factories new file mode 100644 index 000000000..a8a6a8701 --- /dev/null +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/resources/META-INF/spring/aot.factories @@ -0,0 +1 @@ +org.springframework.aot.hint.RuntimeHintsRegistrar=org.springframework.cloud.stream.binder.rabbit.aot.RabbitBinderRuntimeHints diff --git a/buildRabbitBinder.sh b/buildRabbitBinder.sh index d8d56e568..695448d5f 100755 --- a/buildRabbitBinder.sh +++ b/buildRabbitBinder.sh @@ -4,10 +4,10 @@ if [ "$#" -eq 1 ]; then ARGVALUE=$1 if [[ $ARGVALUE == *"skipTest"* ]]; then echo "Skippping Tests" - ./mvnw clean install -f core/pom.xml -DskipTests + ./mvnw clean install -f binders/rabbit-binder/pom.xml -DskipTests elif [[ $ARGVALUE == *"disable.checks"* ]]; then echo "Skippping checkstyle checks" - ./mvnw clean install -f core/pom.xml -Ddisable.checks=true + ./mvnw clean install -f binders/rabbit-binder/pom.xml -Ddisable.checks=true fi else ./mvnw clean install -f binders/rabbit-binder/pom.xml