Skip to content

Commit 298899c

Browse files
committed
updates after code review
1 parent 2aea08f commit 298899c

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ public MessageSource messageSource(MessageSourceProperties properties) {
9494
}
9595
messageSource.setCommonMessages(commonProperties);
9696
}
97-
} catch (IOException e) {
97+
}
98+
catch (IOException e) {
9899
throw new UncheckedIOException("Failed to load common messages", e);
99100
}
100101
return messageSource;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class MessageSourceProperties {
4949
* Comma-separated list of locale-independent common messages.
5050
*/
5151
private List<Resource> commonMessages;
52-
52+
5353
/**
5454
* Message bundles encoding.
5555
*/
@@ -136,4 +136,5 @@ public List<Resource> getCommonMessages() {
136136
public void setCommonMessages(List<Resource> commonMessages) {
137137
this.commonMessages = commonMessages;
138138
}
139+
139140
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,12 @@ void testMessageSourceFromPropertySourceAnnotation() {
118118

119119
@Test
120120
void testCommonMessages() {
121-
this.contextRunner.withPropertyValues("spring.messages.basename:test/messages", "spring.messages.common-messages:test/common-messages")
121+
this.contextRunner
122+
.withPropertyValues("spring.messages.basename:test/messages",
123+
"spring.messages.common-messages:test/common-messages")
122124
.run((context) -> assertThat(context.getMessage("hello", null, "Hello!", Locale.UK)).isEqualTo("world"));
123125
}
124-
126+
125127
@Test
126128
void testFallbackDefault() {
127129
this.contextRunner.withPropertyValues("spring.messages.basename:test/messages")

0 commit comments

Comments
 (0)