diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilder.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilder.java index bb14ef2d31e..2ee6b5d72c3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilder.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilder.java @@ -137,7 +137,7 @@ public class EntityManagerFactoryBuilder { * @param properties the properties to use * @return the builder for fluent usage */ - public Builder properties(Map properties) { + public Builder properties(Map properties) { this.properties.putAll(properties); return this; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java index 8d3945af113..28157dab338 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java @@ -71,13 +71,13 @@ public class HibernateJpaAutoConfiguration extends JpaBaseConfiguration { } @Override - protected Map getVendorProperties() { + protected Map getVendorProperties() { return this.properties.getInitialHibernateProperties(this.dataSource); } @Override protected EntityManagerFactoryBeanCallback getVendorCallback() { - final Map map = this.properties + final Map map = this.properties .getHibernateProperties(this.dataSource); return new EntityManagerFactoryBeanCallback() { @Override @@ -93,18 +93,18 @@ public class HibernateJpaAutoConfiguration extends JpaBaseConfiguration { private static class DeferredSchemaAction implements ApplicationListener { - private Map map; + private Map map; private LocalContainerEntityManagerFactoryBean factory; public DeferredSchemaAction(LocalContainerEntityManagerFactoryBean factory, - Map map) { + Map map) { this.factory = factory; this.map = map; } @Override public void onApplicationEvent(ContextRefreshedEvent event) { - String ddlAuto = (String) this.map.get("hibernate.hbm2ddl.auto"); + String ddlAuto = this.map.get("hibernate.hbm2ddl.auto"); if (ddlAuto == null || "none".equals(ddlAuto)) { return; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java index 5fd8e3e8fb5..b97c6dcb844 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java @@ -105,7 +105,7 @@ public abstract class JpaBaseConfiguration implements BeanFactoryAware { protected abstract AbstractJpaVendorAdapter createJpaVendorAdapter(); - protected abstract Map getVendorProperties(); + protected abstract Map getVendorProperties(); protected abstract EntityManagerFactoryBuilder.EntityManagerFactoryBeanCallback getVendorCallback(); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java index 5207aa011e1..7cc9e51000d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java @@ -40,7 +40,7 @@ public class JpaProperties { private static final Log logger = LogFactory.getLog(JpaProperties.class); - private Map properties = new HashMap(); + private Map properties = new HashMap(); private String databasePlatform; @@ -52,11 +52,11 @@ public class JpaProperties { private Hibernate hibernate = new Hibernate(); - public Map getProperties() { + public Map getProperties() { return this.properties; } - public void setProperties(Map properties) { + public void setProperties(Map properties) { this.properties = properties; } @@ -107,7 +107,7 @@ public class JpaProperties { * @param dataSource the DataSource in case it is needed to determine the properties * @return some Hibernate properties for configuration */ - public Map getInitialHibernateProperties(DataSource dataSource) { + public Map getInitialHibernateProperties(DataSource dataSource) { return this.hibernate.getAdditionalProperties(this.properties); } @@ -116,7 +116,7 @@ public class JpaProperties { * @param dataSource the DataSource in case it is needed to determine the properties * @return some Hibernate properties for configuration */ - public Map getHibernateProperties(DataSource dataSource) { + public Map getHibernateProperties(DataSource dataSource) { return this.hibernate .getDeferredAdditionalProperties(this.properties, dataSource); } @@ -158,7 +158,7 @@ public class JpaProperties { return this.deferDdl; } - private String getDeferredDdlAuto(Map existing, + private String getDeferredDdlAuto(Map existing, DataSource dataSource) { if (!this.deferDdl) { return "none"; @@ -169,7 +169,7 @@ public class JpaProperties { return ddlAuto; } if (isAlreadyProvided(existing, "hbm2ddl.auto")) { - return (String) existing.get("hibernate.hbm2ddl.auto"); + return existing.get("hibernate.hbm2ddl.auto"); } return "none"; } @@ -178,16 +178,16 @@ public class JpaProperties { this.ddlAuto = ddlAuto; } - private Map getDeferredAdditionalProperties( - Map properties, DataSource dataSource) { - Map deferred = getAdditionalProperties(properties); + private Map getDeferredAdditionalProperties( + Map properties, DataSource dataSource) { + Map deferred = getAdditionalProperties(properties); deferred.put("hibernate.hbm2ddl.auto", getDeferredDdlAuto(properties, dataSource)); return deferred; } - private Map getAdditionalProperties(Map existing) { - Map result = new HashMap(); + private Map getAdditionalProperties(Map existing) { + Map result = new HashMap(); if (!isAlreadyProvided(existing, "ejb.naming_strategy") && this.namingStrategy != null) { result.put("hibernate.ejb.naming_strategy", this.namingStrategy.getName()); @@ -205,7 +205,7 @@ public class JpaProperties { return result; } - private boolean isAlreadyProvided(Map existing, String key) { + private boolean isAlreadyProvided(Map existing, String key) { return existing.containsKey("hibernate." + key); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java index dfc544e55de..7dc05fe7622 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java @@ -139,7 +139,7 @@ public abstract class AbstractJpaAutoConfigurationTests { @Test public void customJpaProperties() throws Exception { EnvironmentTestUtils.addEnvironment(this.context, "spring.jpa.properties.a:b", - "spring.jpa.properties.c:d"); + "spring.jpa.properties.a.b:c", "spring.jpa.properties.c:d"); setupTestConfiguration(); this.context.refresh(); LocalContainerEntityManagerFactoryBean bean = this.context @@ -147,6 +147,7 @@ public abstract class AbstractJpaAutoConfigurationTests { Map map = bean.getJpaPropertyMap(); assertThat(map.get("a"), equalTo((Object) "b")); assertThat(map.get("c"), equalTo((Object) "d")); + assertThat(map.get("a.b"), equalTo((Object) "c")); } @Test diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java index 4b4908bba31..b6d4edabb96 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java @@ -61,7 +61,7 @@ public class CustomHibernateJpaAutoConfigurationTests { this.context.refresh(); JpaProperties bean = this.context.getBean(JpaProperties.class); DataSource dataSource = this.context.getBean(DataSource.class); - String actual = (String) bean.getHibernateProperties(dataSource).get( + String actual = bean.getHibernateProperties(dataSource).get( "hibernate.hbm2ddl.auto"); // Default is generic and safe assertThat(actual, equalTo("none")); @@ -78,7 +78,7 @@ public class CustomHibernateJpaAutoConfigurationTests { this.context.refresh(); JpaProperties bean = this.context.getBean(JpaProperties.class); DataSource dataSource = this.context.getBean(DataSource.class); - String actual = (String) bean.getHibernateProperties(dataSource).get( + String actual = bean.getHibernateProperties(dataSource).get( "hibernate.hbm2ddl.auto"); assertThat(actual, equalTo("create-drop")); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilderTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilderTests.java index d9c5b1ccf10..3061d1aec14 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilderTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilderTests.java @@ -47,7 +47,7 @@ public class EntityManagerFactoryBuilderTests { new HibernateJpaVendorAdapter(), this.properties, null); LocalContainerEntityManagerFactoryBean result1 = factory .dataSource(this.dataSource1) - .properties(Collections.singletonMap("foo", (Object) "spam")).build(); + .properties(Collections.singletonMap("foo", "spam")).build(); assertFalse(result1.getJpaPropertyMap().isEmpty()); assertTrue(this.properties.getProperties().isEmpty()); } @@ -58,7 +58,7 @@ public class EntityManagerFactoryBuilderTests { new HibernateJpaVendorAdapter(), this.properties, null); LocalContainerEntityManagerFactoryBean result1 = factory .dataSource(this.dataSource1) - .properties(Collections.singletonMap("foo", (Object) "spam")).build(); + .properties(Collections.singletonMap("foo", "spam")).build(); assertFalse(result1.getJpaPropertyMap().isEmpty()); LocalContainerEntityManagerFactoryBean result2 = factory.dataSource( this.dataSource2).build();