From 9b8929c39413ba48e02e77b332feb6be775ecb7c Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Fri, 1 Dec 2023 02:14:29 +0900 Subject: [PATCH] Use dedicated file for RsaSecretEncryptor runtime hints (#1255) --- .../EncryptionBootstrapConfiguration.java | 14 ----- .../encrypt/EncryptionRuntimeHints.java | 37 +++++++++++++ .../resources/META-INF/spring/aot.factories | 2 +- .../encrypt/EncryptionRuntimeHintsTests.java | 53 +++++++++++++++++++ 4 files changed, 91 insertions(+), 15 deletions(-) create mode 100644 spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionRuntimeHints.java create mode 100644 spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionRuntimeHintsTests.java diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java index ee25d77e..b43bc0d4 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java @@ -16,9 +16,6 @@ package org.springframework.cloud.bootstrap.encrypt; -import org.springframework.aot.hint.MemberCategory; -import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsRegistrar; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionOutcome; @@ -145,15 +142,4 @@ public class EncryptionBootstrapConfiguration { } - class EncryptionHints implements RuntimeHintsRegistrar { - - @Override - public void registerHints(RuntimeHints hints, ClassLoader classLoader) { - hints.reflection().registerTypeIfPresent(classLoader, - "org.springframework.security.rsa.crypto.RsaSecretEncryptor", - MemberCategory.INVOKE_DECLARED_CONSTRUCTORS); - } - - } - } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionRuntimeHints.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionRuntimeHints.java new file mode 100644 index 00000000..ff9c99bd --- /dev/null +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionRuntimeHints.java @@ -0,0 +1,37 @@ +/* + * Copyright 2012-2023 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.bootstrap.encrypt; + +import org.springframework.aot.hint.MemberCategory; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; + +/** + * {@link RuntimeHintsRegistrar} for {@code RsaSecretEncryptor}. + * + * @author Dave Syer + */ +class EncryptionRuntimeHints implements RuntimeHintsRegistrar { + + @Override + public void registerHints(RuntimeHints hints, ClassLoader classLoader) { + hints.reflection().registerTypeIfPresent(classLoader, + "org.springframework.security.rsa.crypto.RsaSecretEncryptor", + MemberCategory.INVOKE_DECLARED_CONSTRUCTORS); + } + +} diff --git a/spring-cloud-context/src/main/resources/META-INF/spring/aot.factories b/spring-cloud-context/src/main/resources/META-INF/spring/aot.factories index 8663a91e..87c2fa95 100644 --- a/spring-cloud-context/src/main/resources/META-INF/spring/aot.factories +++ b/spring-cloud-context/src/main/resources/META-INF/spring/aot.factories @@ -1,2 +1,2 @@ org.springframework.aot.hint.RuntimeHintsRegistrar=\ -org.springframework.cloud.bootstrap.encrypt.EncryptionBootstrapConfiguration.EncryptionHints \ No newline at end of file +org.springframework.cloud.bootstrap.encrypt.EncryptionRuntimeHints \ No newline at end of file diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionRuntimeHintsTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionRuntimeHintsTests.java new file mode 100644 index 00000000..3136ab18 --- /dev/null +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionRuntimeHintsTests.java @@ -0,0 +1,53 @@ +/* + * Copyright 2002-2023 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.bootstrap.encrypt; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import org.springframework.aot.hint.MemberCategory; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; +import org.springframework.core.io.support.SpringFactoriesLoader; +import org.springframework.security.rsa.crypto.RsaSecretEncryptor; +import org.springframework.util.ClassUtils; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link EncryptionRuntimeHints}. + * + * @author Johnny Lim + */ +class EncryptionRuntimeHintsTests { + + private final RuntimeHints hints = new RuntimeHints(); + + @BeforeEach + void setup() { + SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories").load(RuntimeHintsRegistrar.class) + .forEach(registrar -> registrar.registerHints(this.hints, ClassUtils.getDefaultClassLoader())); + } + + @Test + void rsaSecretEncryptorHasHints() { + assertThat(RuntimeHintsPredicates.reflection().onType(RsaSecretEncryptor.class) + .withMemberCategories(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS)).accepts(this.hints); + } + +}