Browse Source

Add missing reflection hint on MonetaryAmount

Fixes gh-31266
pull/31279/head
Brian Clozel 1 year ago
parent
commit
a1f4cdf54e
  1. 6
      spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
  2. 35
      spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceRuntimeHints.java
  3. 3
      spring-context/src/main/resources/META-INF/spring/aot.factories
  4. 51
      spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceRuntimeHintsTests.java

6
spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* 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.
@ -37,8 +37,8 @@ import org.springframework.util.StringValueResolver; @@ -37,8 +37,8 @@ import org.springframework.util.StringValueResolver;
* as {@code DefaultConversionService} exposes its own
* {@link DefaultConversionService#addDefaultConverters addDefaultConverters} method.
*
* <p>Automatically registers formatters for JSR-354 Money &amp; Currency, JSR-310 Date-Time
* and/or Joda-Time 2.x, depending on the presence of the corresponding API on the classpath.
* <p>Automatically registers formatters for JSR-354 Money &amp; Currency and JSR-310 Date-Time
* depending on the presence of the corresponding API on the classpath.
*
* @author Chris Beams
* @author Juergen Hoeller

35
spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceRuntimeHints.java

@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
/*
* 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.format.support;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference;
/**
* {@link RuntimeHintsRegistrar} to register hints for {@link DefaultFormattingConversionService}.
*
* @author Brian Clozel
* @since 6.1
*/
class FormattingConversionServiceRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
hints.reflection().registerType(TypeReference.of("javax.money.MonetaryAmount"));
}
}

3
spring-context/src/main/resources/META-INF/spring/aot.factories

@ -1,3 +1,6 @@ @@ -1,3 +1,6 @@
org.springframework.aot.hint.RuntimeHintsRegistrar= \
org.springframework.format.support.FormattingConversionServiceRuntimeHints
org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor= \
org.springframework.context.aot.ReflectiveProcessorBeanFactoryInitializationAotProcessor

51
spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceRuntimeHintsTests.java

@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
/*
* 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.format.support;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
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.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link FormattingConversionServiceRuntimeHints}.
* @author Brian Clozel
*/
class FormattingConversionServiceRuntimeHintsTests {
private RuntimeHints hints;
@BeforeEach
void setup() {
this.hints = new RuntimeHints();
SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories")
.load(RuntimeHintsRegistrar.class).forEach(registrar -> registrar
.registerHints(this.hints, ClassUtils.getDefaultClassLoader()));
}
@Test
void montearyAmountHasHints() {
assertThat(RuntimeHintsPredicates.reflection().onType(javax.money.MonetaryAmount.class)).accepts(this.hints);
}
}
Loading…
Cancel
Save