Skip to content

Commit c826310

Browse files
committed
Polish
1 parent ba16f13 commit c826310

File tree

4 files changed

+27
-26
lines changed

4 files changed

+27
-26
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationWithLog4j2AndLogbackTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ public class MetricsAutoConfigurationWithLog4j2AndLogbackTests {
4343

4444
@Test
4545
public void doesNotConfigureLogbackMetrics() {
46-
this.contextRunner.run((context) -> {
47-
assertThat(context).doesNotHaveBean(LogbackMetrics.class);
48-
});
46+
this.contextRunner.run(
47+
(context) -> assertThat(context).doesNotHaveBean(LogbackMetrics.class));
4948
}
5049

5150
}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/cache/HazelcastCacheMeterBinderProvider.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.boot.actuate.metrics.cache;
1818

19-
import com.hazelcast.core.IMap;
2019
import com.hazelcast.spring.cache.HazelcastCache;
2120
import io.micrometer.core.instrument.Tag;
2221
import io.micrometer.core.instrument.binder.MeterBinder;
@@ -32,10 +31,8 @@ public class HazelcastCacheMeterBinderProvider
3231
implements CacheMeterBinderProvider<HazelcastCache> {
3332

3433
@Override
35-
@SuppressWarnings("unchecked")
3634
public MeterBinder getMeterBinder(HazelcastCache cache, Iterable<Tag> tags) {
37-
return new HazelcastCacheMetrics((IMap<Object, Object>) cache.getNativeCache(),
38-
tags);
35+
return new HazelcastCacheMetrics(cache.getNativeCache(), tags);
3936
}
4037

4138
}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ private List<HibernatePropertiesCustomizer> determineHibernatePropertiesCustomiz
112112
ImplicitNamingStrategy implicitNamingStrategy,
113113
List<HibernatePropertiesCustomizer> hibernatePropertiesCustomizers) {
114114
if (physicalNamingStrategy != null || implicitNamingStrategy != null) {
115-
LinkedList<HibernatePropertiesCustomizer> customizers = new LinkedList<>(hibernatePropertiesCustomizers);
115+
LinkedList<HibernatePropertiesCustomizer> customizers = new LinkedList<>(
116+
hibernatePropertiesCustomizers);
116117
customizers.addFirst(new NamingStrategiesHibernatePropertiesCustomizer(
117118
physicalNamingStrategy, implicitNamingStrategy));
118119
return customizers;
@@ -129,9 +130,9 @@ protected AbstractJpaVendorAdapter createJpaVendorAdapter() {
129130
protected Map<String, Object> getVendorProperties() {
130131
Supplier<String> defaultDdlMode = () -> this.defaultDdlAutoProvider
131132
.getDefaultDdlAuto(getDataSource());
132-
return new LinkedHashMap<>(getProperties()
133-
.getHibernateProperties(new HibernateSettings().ddlAuto(defaultDdlMode)
134-
.hibernatePropertiesCustomizers(
133+
return new LinkedHashMap<>(
134+
getProperties().getHibernateProperties(new HibernateSettings()
135+
.ddlAuto(defaultDdlMode).hibernatePropertiesCustomizers(
135136
this.hibernatePropertiesCustomizers)));
136137
}
137138

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,11 @@ public void physicalNamingStrategyCanBeUsed() {
278278
contextRunner()
279279
.withUserConfiguration(TestPhysicalNamingStrategyConfiguration.class)
280280
.run((context) -> {
281-
Map<String, Object> hibernateProperties = context.getBean(
282-
HibernateJpaConfiguration.class).getVendorProperties();
283-
assertThat(hibernateProperties).contains(
284-
entry("hibernate.physical_naming_strategy",
281+
Map<String, Object> hibernateProperties = context
282+
.getBean(HibernateJpaConfiguration.class)
283+
.getVendorProperties();
284+
assertThat(hibernateProperties)
285+
.contains(entry("hibernate.physical_naming_strategy",
285286
context.getBean("testPhysicalNamingStrategy")));
286287
assertThat(hibernateProperties)
287288
.doesNotContainKeys("hibernate.ejb.naming_strategy");
@@ -293,10 +294,11 @@ public void implicitNamingStrategyCanBeUsed() {
293294
contextRunner()
294295
.withUserConfiguration(TestImplicitNamingStrategyConfiguration.class)
295296
.run((context) -> {
296-
Map<String, Object> hibernateProperties = context.getBean(
297-
HibernateJpaConfiguration.class).getVendorProperties();
298-
assertThat(hibernateProperties).contains(
299-
entry("hibernate.implicit_naming_strategy",
297+
Map<String, Object> hibernateProperties = context
298+
.getBean(HibernateJpaConfiguration.class)
299+
.getVendorProperties();
300+
assertThat(hibernateProperties)
301+
.contains(entry("hibernate.implicit_naming_strategy",
300302
context.getBean("testImplicitNamingStrategy")));
301303
assertThat(hibernateProperties)
302304
.doesNotContainKeys("hibernate.ejb.naming_strategy");
@@ -312,8 +314,9 @@ public void namingStrategyInstancesTakePrecedenceOverNamingStrategyProperties()
312314
"spring.jpa.hibernate.naming.physical-strategy:com.example.Physical",
313315
"spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit")
314316
.run((context) -> {
315-
Map<String, Object> hibernateProperties = context.getBean(
316-
HibernateJpaConfiguration.class).getVendorProperties();
317+
Map<String, Object> hibernateProperties = context
318+
.getBean(HibernateJpaConfiguration.class)
319+
.getVendorProperties();
317320
assertThat(hibernateProperties).contains(
318321
entry("hibernate.physical_naming_strategy",
319322
context.getBean("testPhysicalNamingStrategy")),
@@ -335,10 +338,12 @@ public void hibernatePropertiesCustomizerTakePrecedenceOverStrategyInstancesAndN
335338
"spring.jpa.hibernate.naming.physical-strategy:com.example.Physical",
336339
"spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit")
337340
.run((context) -> {
338-
Map<String, Object> hibernateProperties = context.getBean(
339-
HibernateJpaConfiguration.class).getVendorProperties();
340-
TestHibernatePropertiesCustomizerConfiguration configuration = context.getBean(
341-
TestHibernatePropertiesCustomizerConfiguration.class);
341+
Map<String, Object> hibernateProperties = context
342+
.getBean(HibernateJpaConfiguration.class)
343+
.getVendorProperties();
344+
TestHibernatePropertiesCustomizerConfiguration configuration = context
345+
.getBean(
346+
TestHibernatePropertiesCustomizerConfiguration.class);
342347
assertThat(hibernateProperties).contains(
343348
entry("hibernate.physical_naming_strategy",
344349
configuration.physicalNamingStrategy),
@@ -349,7 +354,6 @@ public void hibernatePropertiesCustomizerTakePrecedenceOverStrategyInstancesAndN
349354
});
350355
}
351356

352-
353357
@Configuration
354358
@TestAutoConfigurationPackage(City.class)
355359
static class TestInitializedJpaConfiguration {

0 commit comments

Comments
 (0)