Skip to content

Commit fd478be

Browse files
committed
Polish
1 parent 114379e commit fd478be

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,10 @@ public void testMultipleMessageSourceCreated() {
8282

8383
@Test
8484
public void testBadEncoding() {
85+
// Bad encoding just means the messages are ignored
8586
this.contextRunner.withPropertyValues("spring.messages.encoding:rubbish")
86-
.run((context) -> {
87-
// Bad encoding just means the messages are ignored
88-
assertThat(context.getMessage("foo", null, "blah", Locale.UK))
89-
.isEqualTo("blah");
90-
});
87+
.run((context) -> assertThat(context.getMessage(
88+
"foo", null, "blah", Locale.UK)).isEqualTo("blah"));
9189
}
9290

9391
@Test
@@ -167,12 +165,10 @@ public void existingMessageSourceIsPreferred() {
167165

168166
@Test
169167
public void existingMessageSourceInParentIsIgnored() {
170-
this.contextRunner.run((parent) -> {
171-
this.contextRunner.withParent(parent)
172-
.withPropertyValues("spring.messages.basename:test/messages")
173-
.run((context) -> assertThat(context.getMessage(
174-
"foo", null, "Foo message", Locale.UK)).isEqualTo("bar"));
175-
});
168+
this.contextRunner.run((parent) -> this.contextRunner.withParent(parent)
169+
.withPropertyValues("spring.messages.basename:test/messages")
170+
.run((context) -> assertThat(context.getMessage(
171+
"foo", null, "Foo message", Locale.UK)).isEqualTo("bar")));
176172
}
177173

178174
@Configuration

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ public void listenerProperties() {
274274
public void testKafkaTemplateRecordMessageConverters() {
275275
this.contextRunner.withUserConfiguration(MessageConverterConfiguration.class)
276276
.run((context) -> {
277-
KafkaTemplate kafkaTemplate = context.getBean(KafkaTemplate.class);
277+
KafkaTemplate<?, ?> kafkaTemplate = context.getBean(KafkaTemplate.class);
278278
assertThat(kafkaTemplate.getMessageConverter())
279279
.isSameAs(context.getBean("myMessageConverter"));
280280
});
@@ -284,7 +284,7 @@ public void testKafkaTemplateRecordMessageConverters() {
284284
public void testConcurrentKafkaListenerContainerFactoryWithCustomMessageConverters() {
285285
this.contextRunner.withUserConfiguration(MessageConverterConfiguration.class)
286286
.run((context) -> {
287-
ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = context
287+
ConcurrentKafkaListenerContainerFactory<?, ?> kafkaListenerContainerFactory = context
288288
.getBean(ConcurrentKafkaListenerContainerFactory.class);
289289
DirectFieldAccessor dfa = new DirectFieldAccessor(
290290
kafkaListenerContainerFactory);

0 commit comments

Comments
 (0)