Skip to content

Commit b943bde

Browse files
sbrannensbrannen
committed
Polishing
1 parent dea4f71 commit b943bde

File tree

8 files changed

+50
-50
lines changed

8 files changed

+50
-50
lines changed

‎spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideBeanFactoryPostProcessor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,10 @@ private void registerReplaceDefinition(ConfigurableListableBeanFactory beanFacto
149149
existingBeanDefinition = beanFactory.getBeanDefinition(beanName);
150150
}
151151
else if (enforceExistingDefinition) {
152-
throw new IllegalStateException("Unable to override bean '" + beanName + "': there is no " +
153-
"bean definition to replace with that name of type " + overrideMetadata.getBeanType());
152+
throw new IllegalStateException("""
153+
Unable to override bean: there is no bean definition to replace \
154+
with name [%s] and type [%s]."""
155+
.formatted(beanName, overrideMetadata.getBeanType()));
154156
}
155157
beanNameIncludingFactory = beanName;
156158
}

‎spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideProcessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public interface BeanOverrideProcessor {
4040

4141
/**
4242
* Create an {@link OverrideMetadata} instance for the given annotated field.
43-
* @param overrideAnnotation the composed annotation that defines the
44-
* {@link BeanOverride @BeanOverride} that triggers this processor
45-
* @param testClass the test class being processed
43+
* @param overrideAnnotation the composed annotation that declares the
44+
* {@link BeanOverride @BeanOverride} annotation that triggers this processor
45+
* @param testClass the test class to process
4646
* @param field the annotated field
4747
* @return the {@link OverrideMetadata} instance that should handle the
4848
* given field

‎spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideMetadata.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,5 @@ public boolean equals(@Nullable Object other) {
8181
public int hashCode() {
8282
return this.overrideMethod.hashCode() * 29 + super.hashCode();
8383
}
84+
8485
}

‎spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ void shouldRejectAsyncStartsIfUnsupported() {
676676
void startAsyncShouldUpdateRequestState() {
677677
assertThat(request.isAsyncStarted()).isFalse();
678678
request.setAsyncSupported(true);
679-
AsyncContext asyncContext = request.startAsync();
679+
request.startAsync();
680680
assertThat(request.isAsyncStarted()).isTrue();
681681
}
682682

‎spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideBeanFactoryPostProcessorTests.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ void replaceBeanByNameWithoutMatchingBeanDefinitionFails() {
6969

7070
assertThatIllegalStateException()
7171
.isThrownBy(context::refresh)
72-
.withMessage("Unable to override bean 'descriptionBean': there is no bean definition " +
73-
"to replace with that name of type java.lang.String");
72+
.withMessage("Unable to override bean: there is no bean definition " +
73+
"to replace with name [descriptionBean] and type [java.lang.String].");
7474
}
7575

7676
@Test
@@ -80,8 +80,8 @@ void replaceBeanByNameWithMatchingBeanDefinitionAndWrongTypeFails() {
8080

8181
assertThatIllegalStateException()
8282
.isThrownBy(context::refresh)
83-
.withMessage("Unable to override bean 'descriptionBean': there is no bean definition " +
84-
"to replace with that name of type java.lang.String");
83+
.withMessage("Unable to override bean: there is no bean definition " +
84+
"to replace with name [descriptionBean] and type [java.lang.String].");
8585
}
8686

8787
@Test
@@ -102,7 +102,9 @@ void replaceBeanByNameCanOverrideBeanProducedByFactoryBeanWithResolvableTypeObje
102102

103103
private AnnotationConfigApplicationContext prepareContextWithFactoryBean(Object objectTypeAttribute) {
104104
AnnotationConfigApplicationContext context = createContext(CaseOverrideBeanProducedByFactoryBean.class);
105+
// Register a TestFactoryBean that will not be overridden
105106
context.registerBean("testFactoryBean", TestFactoryBean.class, TestFactoryBean::new);
107+
// Register another TestFactoryBean that will be overridden
106108
RootBeanDefinition factoryBeanDefinition = new RootBeanDefinition(TestFactoryBean.class);
107109
factoryBeanDefinition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE, objectTypeAttribute);
108110
context.registerBeanDefinition("beanToBeOverridden", factoryBeanDefinition);
@@ -142,7 +144,7 @@ void replaceBeanByTypeWithMultipleMatchesAndNoQualifierFails() {
142144
}
143145

144146
@Test
145-
void replaceBeanByTypeWithMultipleMatchesAndFieldNameQualifierMatches() {
147+
void replaceBeanByTypeWithMultipleMatchesAndFieldNameAsFallbackQualifierMatches() {
146148
AnnotationConfigApplicationContext context = createContext(CaseByType.class);
147149
context.registerBean("counter", Integer.class, () -> 1);
148150
context.registerBean("someInteger", Integer.class, () -> 2);

‎spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -44,38 +44,38 @@
4444
* @author Stephane Nicoll
4545
* @since 6.2
4646
*/
47-
public class OverrideMetadataTests {
47+
class OverrideMetadataTests {
4848

4949
@Test
5050
void forTestClassWithSingleField() {
5151
List<OverrideMetadata> overrideMetadata = OverrideMetadata.forTestClass(SingleAnnotation.class);
52-
assertThat(overrideMetadata).singleElement().satisfies(hasTestBeanMetadata(
52+
assertThat(overrideMetadata).singleElement().satisfies(hasOverrideMetadata(
5353
field(SingleAnnotation.class, "message"), String.class, null));
5454
}
5555

5656
@Test
5757
void forTestClassWithMultipleFields() {
5858
List<OverrideMetadata> overrideMetadata = OverrideMetadata.forTestClass(MultipleAnnotations.class);
5959
assertThat(overrideMetadata).hasSize(2)
60-
.anySatisfy(hasTestBeanMetadata(
60+
.anySatisfy(hasOverrideMetadata(
6161
field(MultipleAnnotations.class, "message"), String.class, null))
62-
.anySatisfy(hasTestBeanMetadata(
62+
.anySatisfy(hasOverrideMetadata(
6363
field(MultipleAnnotations.class, "counter"), Integer.class, null));
6464
}
6565

6666
@Test
67-
void forTestClassWithMultipleFieldsSameMetadata() {
67+
void forTestClassWithMultipleFieldsWithIdenticalMetadata() {
6868
List<OverrideMetadata> overrideMetadata = OverrideMetadata.forTestClass(MultipleAnnotationsDuplicate.class);
6969
assertThat(overrideMetadata).hasSize(2)
70-
.anySatisfy(hasTestBeanMetadata(
70+
.anySatisfy(hasOverrideMetadata(
7171
field(MultipleAnnotationsDuplicate.class, "message1"), String.class, "messageBean"))
72-
.anySatisfy(hasTestBeanMetadata(
72+
.anySatisfy(hasOverrideMetadata(
7373
field(MultipleAnnotationsDuplicate.class, "message2"), String.class, "messageBean"));
7474
assertThat(new HashSet<>(overrideMetadata)).hasSize(1);
7575
}
7676

7777
@Test
78-
void forTestClassWithDifferentOverrideMetadataOnSameField() {
78+
void forTestClassWithCompetingBeanOverrideAnnotationsOnSameField() {
7979
Field faultyField = field(MultipleAnnotationsOnSameField.class, "message");
8080
assertThatIllegalStateException()
8181
.isThrownBy(() -> OverrideMetadata.forTestClass(MultipleAnnotationsOnSameField.class))
@@ -164,25 +164,27 @@ void isNotEqualToWithByTypeLookupAndDifferentFieldNames() {
164164
assertThat(metadata).isNotEqualTo(metadata2);
165165
}
166166

167-
private OverrideMetadata createMetadata(Field field) {
167+
private static OverrideMetadata createMetadata(Field field) {
168168
return createMetadata(field, null);
169169
}
170170

171-
private OverrideMetadata createMetadata(Field field, @Nullable String name) {
171+
private static OverrideMetadata createMetadata(Field field, @Nullable String name) {
172172
return new DummyOverrideMetadata(field, field.getType(), name, BeanOverrideStrategy.REPLACE_DEFINITION);
173173
}
174174

175-
private Field field(Class<?> target, String fieldName) {
175+
private static Field field(Class<?> target, String fieldName) {
176176
Field field = ReflectionUtils.findField(target, fieldName);
177177
assertThat(field).isNotNull();
178178
return field;
179179
}
180180

181-
private Consumer<OverrideMetadata> hasTestBeanMetadata(Field field, Class<?> beanType, @Nullable String beanName) {
181+
private static Consumer<OverrideMetadata> hasOverrideMetadata(Field field, Class<?> beanType, @Nullable String beanName) {
182182
return hasOverrideMetadata(field, beanType, BeanOverrideStrategy.REPLACE_DEFINITION, beanName);
183183
}
184184

185-
private Consumer<OverrideMetadata> hasOverrideMetadata(Field field, Class<?> beanType, BeanOverrideStrategy strategy, @Nullable String beanName) {
185+
private static Consumer<OverrideMetadata> hasOverrideMetadata(Field field, Class<?> beanType, BeanOverrideStrategy strategy,
186+
@Nullable String beanName) {
187+
186188
return metadata -> {
187189
assertThat(metadata.getField()).isEqualTo(field);
188190
assertThat(metadata.getBeanType().toClass()).isEqualTo(beanType);
@@ -196,7 +198,6 @@ static class SingleAnnotation {
196198

197199
@DummyBean
198200
String message;
199-
200201
}
201202

202203
static class MultipleAnnotations {
@@ -215,7 +216,6 @@ static class MultipleAnnotationsDuplicate {
215216

216217
@DummyBean(beanName = "messageBean")
217218
String message2;
218-
219219
}
220220

221221
static class MultipleAnnotationsOnSameField {
@@ -229,37 +229,33 @@ static String foo() {
229229
}
230230
}
231231

232-
public static class ConfigA {
232+
static class ConfigA {
233233

234-
private ExampleService noQualifier;
234+
ExampleService noQualifier;
235235

236236
@Qualifier("test")
237-
private ExampleService directQualifier;
237+
ExampleService directQualifier;
238238

239239
@Qualifier("different")
240-
private ExampleService differentDirectQualifier;
240+
ExampleService differentDirectQualifier;
241241

242242
@CustomQualifier
243-
private ExampleService customQualifier;
244-
243+
ExampleService customQualifier;
245244
}
246245

247-
public static class ConfigB {
246+
static class ConfigB {
248247

249-
private ExampleService noQualifier;
248+
ExampleService noQualifier;
250249

251-
private ExampleService example;
250+
ExampleService example;
252251

253252
@Qualifier("test")
254-
private ExampleService directQualifier;
255-
253+
ExampleService directQualifier;
256254
}
257255

258-
// Simple OverrideMetadata implementation
259-
260256
@Target(ElementType.FIELD)
261257
@Retention(RetentionPolicy.RUNTIME)
262258
@DummyBean
263-
public @interface MetaDummyBean {}
259+
@interface MetaDummyBean {}
264260

265261
}

‎spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanContextCustomizerEqualityTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void contextCustomizerWithByNameVsByTypeLookupIsNotEqual() {
4646
}
4747

4848

49-
private ContextCustomizer createContextCustomizer(Class<?> testClass) {
49+
private static ContextCustomizer createContextCustomizer(Class<?> testClass) {
5050
ContextCustomizer customizer = BeanOverrideContextCustomizerTestUtils.createContextCustomizer(testClass);
5151
assertThat(customizer).isNotNull();
5252
return customizer;
@@ -89,7 +89,7 @@ static class Case4 {
8989
@TestBean
9090
private String description;
9191

92-
private static String description() {
92+
static String description() {
9393
return "overridden";
9494
}
9595
}
@@ -99,7 +99,7 @@ static class Case5 {
9999
@TestBean(name = "descriptionBean")
100100
private String description;
101101

102-
private static String description() {
102+
static String description() {
103103
return "overridden";
104104
}
105105
}

‎spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanTests.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ void contextCustomizerCannotBeCreatedWithNoSuchBeanName() {
4040
assertThatIllegalStateException()
4141
.isThrownBy(context::refresh)
4242
.withMessage("""
43-
Unable to override bean 'beanToOverride': there is no bean definition \
44-
to replace with that name of type java.lang.String""");
43+
Unable to override bean: there is no bean definition \
44+
to replace with name [beanToOverride] and type [java.lang.String].""");
4545
}
4646

4747
@Test
@@ -78,9 +78,8 @@ void contextCustomizerCannotBeCreatedWithBeanOfWrongType() {
7878
assertThatIllegalStateException()
7979
.isThrownBy(context::refresh)
8080
.withMessage("""
81-
Unable to override bean 'beanToOverride': there is no bean definition \
82-
to replace with that name of type %s""".formatted(
83-
String.class.getName()));
81+
Unable to override bean: there is no bean definition \
82+
to replace with name [beanToOverride] and type [java.lang.String].""");
8483
}
8584

8685
@Test
@@ -130,7 +129,7 @@ static class FailureByTypeLookup {
130129
@TestBean
131130
private String example;
132131

133-
private static String example() {
132+
static String example() {
134133
throw new IllegalStateException("Should not be called");
135134
}
136135
}
@@ -140,7 +139,7 @@ static class FailureByNameLookup {
140139
@TestBean(name = "beanToOverride")
141140
private String example;
142141

143-
private static String example() {
142+
static String example() {
144143
throw new IllegalStateException("Should not be called");
145144
}
146145
}

0 commit comments

Comments
 (0)