Skip to content

S
spring-boot
Commit c826310f authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Polish

parent ba16f135
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 26 deletions
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationWithLog4j2AndLogbackTests.java
View file @ c826310f
...@@ -43,9 +43,8 @@ public class MetricsAutoConfigurationWithLog4j2AndLogbackTests { ...@@ -43,9 +43,8 @@ public class MetricsAutoConfigurationWithLog4j2AndLogbackTests {
@Test @Test
public void doesNotConfigureLogbackMetrics() { public void doesNotConfigureLogbackMetrics() {
this.contextRunner.run((context) -> { this.contextRunner.run(
assertThat(context).doesNotHaveBean(LogbackMetrics.class); (context) -> assertThat(context).doesNotHaveBean(LogbackMetrics.class));
});
} }
} }
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/cache/HazelcastCacheMeterBinderProvider.java
View file @ c826310f
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package org.springframework.boot.actuate.metrics.cache; package org.springframework.boot.actuate.metrics.cache;
import com.hazelcast.core.IMap;
import com.hazelcast.spring.cache.HazelcastCache; import com.hazelcast.spring.cache.HazelcastCache;
import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.binder.MeterBinder; import io.micrometer.core.instrument.binder.MeterBinder;
...@@ -32,10 +31,8 @@ public class HazelcastCacheMeterBinderProvider ...@@ -32,10 +31,8 @@ public class HazelcastCacheMeterBinderProvider
implements CacheMeterBinderProvider<HazelcastCache> { implements CacheMeterBinderProvider<HazelcastCache> {
@Override @Override
@SuppressWarnings("unchecked")
public MeterBinder getMeterBinder(HazelcastCache cache, Iterable<Tag> tags) { public MeterBinder getMeterBinder(HazelcastCache cache, Iterable<Tag> tags) {
return new HazelcastCacheMetrics((IMap<Object, Object>) cache.getNativeCache(), return new HazelcastCacheMetrics(cache.getNativeCache(), tags);
tags);
} }
} }
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java
View file @ c826310f
...@@ -112,7 +112,8 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration { ...@@ -112,7 +112,8 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration {
ImplicitNamingStrategy implicitNamingStrategy, ImplicitNamingStrategy implicitNamingStrategy,
List<HibernatePropertiesCustomizer> hibernatePropertiesCustomizers) { List<HibernatePropertiesCustomizer> hibernatePropertiesCustomizers) {
if (physicalNamingStrategy != null || implicitNamingStrategy != null) { if (physicalNamingStrategy != null || implicitNamingStrategy != null) {
LinkedList<HibernatePropertiesCustomizer> customizers = new LinkedList<>(hibernatePropertiesCustomizers); LinkedList<HibernatePropertiesCustomizer> customizers = new LinkedList<>(
hibernatePropertiesCustomizers);
customizers.addFirst(new NamingStrategiesHibernatePropertiesCustomizer( customizers.addFirst(new NamingStrategiesHibernatePropertiesCustomizer(
physicalNamingStrategy, implicitNamingStrategy)); physicalNamingStrategy, implicitNamingStrategy));
return customizers; return customizers;
...@@ -129,9 +130,9 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration { ...@@ -129,9 +130,9 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration {
protected Map<String, Object> getVendorProperties() { protected Map<String, Object> getVendorProperties() {
Supplier<String> defaultDdlMode = () -> this.defaultDdlAutoProvider Supplier<String> defaultDdlMode = () -> this.defaultDdlAutoProvider
.getDefaultDdlAuto(getDataSource()); .getDefaultDdlAuto(getDataSource());
return new LinkedHashMap<>(getProperties() return new LinkedHashMap<>(
.getHibernateProperties(new HibernateSettings().ddlAuto(defaultDdlMode) getProperties().getHibernateProperties(new HibernateSettings()
.hibernatePropertiesCustomizers( .ddlAuto(defaultDdlMode).hibernatePropertiesCustomizers(
this.hibernatePropertiesCustomizers))); this.hibernatePropertiesCustomizers)));
} }
......
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
View file @ c826310f
...@@ -278,10 +278,11 @@ public class HibernateJpaAutoConfigurationTests ...@@ -278,10 +278,11 @@ public class HibernateJpaAutoConfigurationTests
contextRunner() contextRunner()
.withUserConfiguration(TestPhysicalNamingStrategyConfiguration.class) .withUserConfiguration(TestPhysicalNamingStrategyConfiguration.class)
.run((context) -> { .run((context) -> {
Map<String, Object> hibernateProperties = context.getBean( Map<String, Object> hibernateProperties = context
HibernateJpaConfiguration.class).getVendorProperties(); .getBean(HibernateJpaConfiguration.class)
assertThat(hibernateProperties).contains( .getVendorProperties();
entry("hibernate.physical_naming_strategy", assertThat(hibernateProperties)
.contains(entry("hibernate.physical_naming_strategy",
context.getBean("testPhysicalNamingStrategy"))); context.getBean("testPhysicalNamingStrategy")));
assertThat(hibernateProperties) assertThat(hibernateProperties)
.doesNotContainKeys("hibernate.ejb.naming_strategy"); .doesNotContainKeys("hibernate.ejb.naming_strategy");
...@@ -293,10 +294,11 @@ public class HibernateJpaAutoConfigurationTests ...@@ -293,10 +294,11 @@ public class HibernateJpaAutoConfigurationTests
contextRunner() contextRunner()
.withUserConfiguration(TestImplicitNamingStrategyConfiguration.class) .withUserConfiguration(TestImplicitNamingStrategyConfiguration.class)
.run((context) -> { .run((context) -> {
Map<String, Object> hibernateProperties = context.getBean( Map<String, Object> hibernateProperties = context
HibernateJpaConfiguration.class).getVendorProperties(); .getBean(HibernateJpaConfiguration.class)
assertThat(hibernateProperties).contains( .getVendorProperties();
entry("hibernate.implicit_naming_strategy", assertThat(hibernateProperties)
.contains(entry("hibernate.implicit_naming_strategy",
context.getBean("testImplicitNamingStrategy"))); context.getBean("testImplicitNamingStrategy")));
assertThat(hibernateProperties) assertThat(hibernateProperties)
.doesNotContainKeys("hibernate.ejb.naming_strategy"); .doesNotContainKeys("hibernate.ejb.naming_strategy");
...@@ -312,8 +314,9 @@ public class HibernateJpaAutoConfigurationTests ...@@ -312,8 +314,9 @@ public class HibernateJpaAutoConfigurationTests
"spring.jpa.hibernate.naming.physical-strategy:com.example.Physical", "spring.jpa.hibernate.naming.physical-strategy:com.example.Physical",
"spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit") "spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit")
.run((context) -> { .run((context) -> {
Map<String, Object> hibernateProperties = context.getBean( Map<String, Object> hibernateProperties = context
HibernateJpaConfiguration.class).getVendorProperties(); .getBean(HibernateJpaConfiguration.class)
.getVendorProperties();
assertThat(hibernateProperties).contains( assertThat(hibernateProperties).contains(
entry("hibernate.physical_naming_strategy", entry("hibernate.physical_naming_strategy",
context.getBean("testPhysicalNamingStrategy")), context.getBean("testPhysicalNamingStrategy")),
...@@ -335,10 +338,12 @@ public class HibernateJpaAutoConfigurationTests ...@@ -335,10 +338,12 @@ public class HibernateJpaAutoConfigurationTests
"spring.jpa.hibernate.naming.physical-strategy:com.example.Physical", "spring.jpa.hibernate.naming.physical-strategy:com.example.Physical",
"spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit") "spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit")
.run((context) -> { .run((context) -> {
Map<String, Object> hibernateProperties = context.getBean( Map<String, Object> hibernateProperties = context
HibernateJpaConfiguration.class).getVendorProperties(); .getBean(HibernateJpaConfiguration.class)
TestHibernatePropertiesCustomizerConfiguration configuration = context.getBean( .getVendorProperties();
TestHibernatePropertiesCustomizerConfiguration.class); TestHibernatePropertiesCustomizerConfiguration configuration = context
.getBean(
TestHibernatePropertiesCustomizerConfiguration.class);
assertThat(hibernateProperties).contains( assertThat(hibernateProperties).contains(
entry("hibernate.physical_naming_strategy", entry("hibernate.physical_naming_strategy",
configuration.physicalNamingStrategy), configuration.physicalNamingStrategy),
...@@ -349,7 +354,6 @@ public class HibernateJpaAutoConfigurationTests ...@@ -349,7 +354,6 @@ public class HibernateJpaAutoConfigurationTests
}); });
} }
@Configuration @Configuration
@TestAutoConfigurationPackage(City.class) @TestAutoConfigurationPackage(City.class)
static class TestInitializedJpaConfiguration { static class TestInitializedJpaConfiguration {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment