Skip to content

Commit 9102eb3

Browse files
wilkinsonawilkinsona
committed
Polish
1 parent 9ba20cc commit 9102eb3

File tree

8 files changed

+146
-129
lines changed

8 files changed

+146
-129
lines changed

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ParametersMissingException.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.springframework.util.StringUtils;
2222

2323
/**
24-
* {@link RuntimeException} thrown when an endpoint invocation does
25-
* not contain required parameters.
24+
* {@link RuntimeException} thrown when an endpoint invocation does not contain required
25+
* parameters.
2626
*
2727
* @author Madhura Bhave
2828
* @since 2.0.0
@@ -32,8 +32,9 @@ public class ParametersMissingException extends RuntimeException {
3232
private final Set<String> parameters;
3333

3434
public ParametersMissingException(Set<String> parameters) {
35-
super("Failed to invoke operation because the following required " +
36-
"parameters were missing: " + StringUtils.collectionToCommaDelimitedString(parameters));
35+
super("Failed to invoke operation because the following required "
36+
+ "parameters were missing: "
37+
+ StringUtils.collectionToCommaDelimitedString(parameters));
3738
this.parameters = parameters;
3839
}
3940

@@ -45,4 +46,3 @@ public Set<String> getParameters() {
4546
return this.parameters;
4647
}
4748
}
48-

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,15 @@ public void convertersAreAddedToFormPartConverter() {
110110
@Test
111111
public void postProcessConverters() throws Exception {
112112
HttpMessageConverters converters = new HttpMessageConverters() {
113+
113114
@Override
114115
protected List<HttpMessageConverter<?>> postProcessConverters(
115116
List<HttpMessageConverter<?>> converters) {
116-
converters.removeIf(
117-
converter -> converter instanceof MappingJackson2XmlHttpMessageConverter);
117+
converters.removeIf((
118+
converter) -> converter instanceof MappingJackson2XmlHttpMessageConverter);
118119
return converters;
119120
}
121+
120122
};
121123
List<Class<?>> converterClasses = new ArrayList<>();
122124
for (HttpMessageConverter<?> converter : converters) {
@@ -135,13 +137,15 @@ protected List<HttpMessageConverter<?>> postProcessConverters(
135137
@Test
136138
public void postProcessPartConverters() throws Exception {
137139
HttpMessageConverters converters = new HttpMessageConverters() {
140+
138141
@Override
139142
protected List<HttpMessageConverter<?>> postProcessPartConverters(
140143
List<HttpMessageConverter<?>> converters) {
141-
converters.removeIf(
142-
converter -> converter instanceof MappingJackson2XmlHttpMessageConverter);
144+
converters.removeIf((
145+
converter) -> converter instanceof MappingJackson2XmlHttpMessageConverter);
143146
return converters;
144147
}
148+
145149
};
146150
List<Class<?>> converterClasses = new ArrayList<>();
147151
for (HttpMessageConverter<?> converter : extractFormPartConverters(

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java

Lines changed: 78 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ protected AbstractJpaAutoConfigurationTests(Class<?> autoConfiguredClass) {
6565
this.autoConfiguredClass = autoConfiguredClass;
6666
this.contextRunner = new ApplicationContextRunner()
6767
.withPropertyValues("spring.datasource.generate-unique-name=true")
68-
.withUserConfiguration(TestConfiguration.class)
69-
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class,
70-
TransactionAutoConfiguration.class, autoConfiguredClass));
68+
.withUserConfiguration(TestConfiguration.class).withConfiguration(
69+
AutoConfigurations.of(DataSourceAutoConfiguration.class,
70+
TransactionAutoConfiguration.class, autoConfiguredClass));
7171
}
7272

7373
protected ApplicationContextRunner contextRunner() {
@@ -76,15 +76,17 @@ protected ApplicationContextRunner contextRunner() {
7676

7777
@Test
7878
public void dataSourceIsNotAvailable() {
79-
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(
80-
this.autoConfiguredClass)).run((context) -> {
81-
assertThat(context).hasFailed();
82-
assertThat(context.getStartupFailure())
83-
.isInstanceOf(BeanCreationException.class);
84-
assertThat(context.getStartupFailure())
85-
.hasMessageContaining("No qualifying bean");
86-
assertThat(context.getStartupFailure()).hasMessageContaining("DataSource");
87-
});
79+
new ApplicationContextRunner()
80+
.withConfiguration(AutoConfigurations.of(this.autoConfiguredClass))
81+
.run((context) -> {
82+
assertThat(context).hasFailed();
83+
assertThat(context.getStartupFailure())
84+
.isInstanceOf(BeanCreationException.class);
85+
assertThat(context.getStartupFailure())
86+
.hasMessageContaining("No qualifying bean");
87+
assertThat(context.getStartupFailure())
88+
.hasMessageContaining("DataSource");
89+
});
8890
}
8991

9092
@Test
@@ -97,21 +99,24 @@ public void dataSourceIsCreatedWithDefaultConfig() {
9799

98100
@Test
99101
public void jtaTransactionManagerTakesPrecedence() {
100-
this.contextRunner.withConfiguration(AutoConfigurations.of(
101-
DataSourceTransactionManagerAutoConfiguration.class)).run((context) -> {
102-
assertThat(context).hasSingleBean(DataSource.class);
103-
assertThat(context).hasSingleBean(JpaTransactionManager.class);
104-
assertThat(context).getBean("transactionManager")
105-
.isInstanceOf(JpaTransactionManager.class);
106-
});
102+
this.contextRunner
103+
.withConfiguration(AutoConfigurations
104+
.of(DataSourceTransactionManagerAutoConfiguration.class))
105+
.run((context) -> {
106+
assertThat(context).hasSingleBean(DataSource.class);
107+
assertThat(context).hasSingleBean(JpaTransactionManager.class);
108+
assertThat(context).getBean("transactionManager")
109+
.isInstanceOf(JpaTransactionManager.class);
110+
});
107111
}
108112

109113
@Test
110114
public void openEntityManagerInViewInterceptorIsCreated() {
111115
new WebApplicationContextRunner()
112116
.withPropertyValues("spring.datasource.generate-unique-name=true")
113117
.withUserConfiguration(TestConfiguration.class)
114-
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class,
118+
.withConfiguration(AutoConfigurations.of(
119+
DataSourceAutoConfiguration.class,
115120
TransactionAutoConfiguration.class, this.autoConfiguredClass))
116121
.run((context) -> assertThat(context)
117122
.hasSingleBean(OpenEntityManagerInViewInterceptor.class));
@@ -122,7 +127,8 @@ public void openEntityManagerInViewInterceptorIsNotRegisteredWhenFilterPresent()
122127
new WebApplicationContextRunner()
123128
.withPropertyValues("spring.datasource.generate-unique-name=true")
124129
.withUserConfiguration(TestFilterConfiguration.class)
125-
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class,
130+
.withConfiguration(AutoConfigurations.of(
131+
DataSourceAutoConfiguration.class,
126132
TransactionAutoConfiguration.class, this.autoConfiguredClass))
127133
.run((context) -> assertThat(context)
128134
.doesNotHaveBean(OpenEntityManagerInViewInterceptor.class));
@@ -131,81 +137,84 @@ public void openEntityManagerInViewInterceptorIsNotRegisteredWhenFilterPresent()
131137
@Test
132138
public void openEntityManagerInViewInterceptorISNotRegisteredWhenExplicitlyOff() {
133139
new WebApplicationContextRunner()
134-
.withPropertyValues(
135-
"spring.datasource.generate-unique-name=true",
140+
.withPropertyValues("spring.datasource.generate-unique-name=true",
136141
"spring.jpa.open-in-view=false")
137142
.withUserConfiguration(TestConfiguration.class)
138-
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class,
143+
.withConfiguration(AutoConfigurations.of(
144+
DataSourceAutoConfiguration.class,
139145
TransactionAutoConfiguration.class, this.autoConfiguredClass))
140146
.run((context) -> assertThat(context)
141147
.doesNotHaveBean(OpenEntityManagerInViewInterceptor.class));
142148
}
143149

144150
@Test
145151
public void customJpaProperties() {
146-
this.contextRunner.withPropertyValues("spring.jpa.properties.a:b",
147-
"spring.jpa.properties.a.b:c",
148-
"spring.jpa.properties.c:d").run((context) -> {
149-
LocalContainerEntityManagerFactoryBean bean = context
150-
.getBean(LocalContainerEntityManagerFactoryBean.class);
151-
Map<String, Object> map = bean.getJpaPropertyMap();
152-
assertThat(map.get("a")).isEqualTo("b");
153-
assertThat(map.get("c")).isEqualTo("d");
154-
assertThat(map.get("a.b")).isEqualTo("c");
155-
});
152+
this.contextRunner
153+
.withPropertyValues("spring.jpa.properties.a:b",
154+
"spring.jpa.properties.a.b:c", "spring.jpa.properties.c:d")
155+
.run((context) -> {
156+
LocalContainerEntityManagerFactoryBean bean = context
157+
.getBean(LocalContainerEntityManagerFactoryBean.class);
158+
Map<String, Object> map = bean.getJpaPropertyMap();
159+
assertThat(map.get("a")).isEqualTo("b");
160+
assertThat(map.get("c")).isEqualTo("d");
161+
assertThat(map.get("a.b")).isEqualTo("c");
162+
});
156163
}
157164

158165
@Test
159166
public void usesManuallyDefinedLocalContainerEntityManagerFactoryBeanIfAvailable() {
160-
this.contextRunner.withUserConfiguration(
161-
TestConfigurationWithLocalContainerEntityManagerFactoryBean.class
162-
).run((context) -> {
163-
LocalContainerEntityManagerFactoryBean factoryBean = context
164-
.getBean(LocalContainerEntityManagerFactoryBean.class);
165-
Map<String, Object> map = factoryBean.getJpaPropertyMap();
166-
assertThat(map.get("configured")).isEqualTo("manually");
167-
});
167+
this.contextRunner
168+
.withUserConfiguration(
169+
TestConfigurationWithLocalContainerEntityManagerFactoryBean.class)
170+
.run((context) -> {
171+
LocalContainerEntityManagerFactoryBean factoryBean = context
172+
.getBean(LocalContainerEntityManagerFactoryBean.class);
173+
Map<String, Object> map = factoryBean.getJpaPropertyMap();
174+
assertThat(map.get("configured")).isEqualTo("manually");
175+
});
168176
}
169177

170178
@Test
171179
public void usesManuallyDefinedEntityManagerFactoryIfAvailable() {
172-
this.contextRunner.withUserConfiguration(
173-
TestConfigurationWithLocalContainerEntityManagerFactoryBean.class
174-
).run((context) -> {
175-
EntityManagerFactory factoryBean = context
176-
.getBean(EntityManagerFactory.class);
177-
Map<String, Object> map = factoryBean.getProperties();
178-
assertThat(map.get("configured")).isEqualTo("manually");
179-
});
180+
this.contextRunner
181+
.withUserConfiguration(
182+
TestConfigurationWithLocalContainerEntityManagerFactoryBean.class)
183+
.run((context) -> {
184+
EntityManagerFactory factoryBean = context
185+
.getBean(EntityManagerFactory.class);
186+
Map<String, Object> map = factoryBean.getProperties();
187+
assertThat(map.get("configured")).isEqualTo("manually");
188+
});
180189
}
181190

182191
@Test
183192
public void usesManuallyDefinedTransactionManagerBeanIfAvailable() {
184-
this.contextRunner.withUserConfiguration(
185-
TestConfigurationWithTransactionManager.class
186-
).run((context) -> {
187-
PlatformTransactionManager txManager = context
188-
.getBean(PlatformTransactionManager.class);
189-
assertThat(txManager).isInstanceOf(CustomJpaTransactionManager.class);
190-
});
193+
this.contextRunner
194+
.withUserConfiguration(TestConfigurationWithTransactionManager.class)
195+
.run((context) -> {
196+
PlatformTransactionManager txManager = context
197+
.getBean(PlatformTransactionManager.class);
198+
assertThat(txManager).isInstanceOf(CustomJpaTransactionManager.class);
199+
});
191200
}
192201

193202
@Test
194203
public void customPersistenceUnitManager() {
195-
this.contextRunner.withUserConfiguration(
196-
TestConfigurationWithCustomPersistenceUnitManager.class
197-
).run((context) -> {
198-
LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = context
199-
.getBean(LocalContainerEntityManagerFactoryBean.class);
200-
Field field = LocalContainerEntityManagerFactoryBean.class
201-
.getDeclaredField("persistenceUnitManager");
202-
field.setAccessible(true);
203-
assertThat(field.get(entityManagerFactoryBean))
204-
.isEqualTo(context.getBean(PersistenceUnitManager.class));
205-
});
204+
this.contextRunner
205+
.withUserConfiguration(
206+
TestConfigurationWithCustomPersistenceUnitManager.class)
207+
.run((context) -> {
208+
LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = context
209+
.getBean(LocalContainerEntityManagerFactoryBean.class);
210+
Field field = LocalContainerEntityManagerFactoryBean.class
211+
.getDeclaredField("persistenceUnitManager");
212+
field.setAccessible(true);
213+
assertThat(field.get(entityManagerFactoryBean))
214+
.isEqualTo(context.getBean(PersistenceUnitManager.class));
215+
});
206216
}
207217

208-
209218
@Configuration
210219
@TestAutoConfigurationPackage(City.class)
211220
protected static class TestConfiguration {

0 commit comments

Comments
 (0)