root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Sam Brannen 2023-07-11 15:41:51 +02:00
parent 950c43b4e7 c418118683
commit 8448f597b1
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
View File

@ -88,12 +88,6 @@ public abstract class AnnotationConfigUtils {
public static final String COMMON_ANNOTATION_PROCESSOR_BEAN_NAME =
"org.springframework.context.annotation.internalCommonAnnotationProcessor";
/**
* The bean name of the internally managed JSR-250 annotation processor.
*/
private static final String JSR250_ANNOTATION_PROCESSOR_BEAN_NAME =
"org.springframework.context.annotation.internalJsr250AnnotationProcessor";
/**
* The bean name of the internally managed JPA annotation processor.
*/

10
spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
View File

@ -463,7 +463,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
*/
@Test
void setAutodetectModeToAllSupportedValues() {
streamConstants(MBeanExporter.class)
streamAutodetectConstants()
.map(MBeanExporterTests::getFieldValue)
.forEach(mode -> assertThatNoException().isThrownBy(() -> exporter.setAutodetectMode(mode)));
}
@ -512,7 +512,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
*/
@Test
void setAutodetectModeNameToAllSupportedValues() {
streamConstants(MBeanExporter.class)
streamAutodetectConstants()
.map(Field::getName)
.forEach(name -> assertThatNoException().isThrownBy(() -> exporter.setAutodetectModeName(name)));
}
@ -703,8 +703,10 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
}
}
private static Stream<Field> streamConstants(Class<?> clazz) {
return Arrays.stream(clazz.getFields()).filter(ReflectionUtils::isPublicStaticFinal);
private static Stream<Field> streamAutodetectConstants() {
return Arrays.stream(MBeanExporter.class.getFields())
.filter(ReflectionUtils::isPublicStaticFinal)
.filter(field -> field.getName().startsWith("AUTODETECT_"));
}
private static Integer getFieldValue(Field field) {