root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2015-06-29 17:44:57 -07:00
parent 268b7911dd
commit 5c6fef903d
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
View File

@ -158,7 +158,7 @@ public class JpaProperties {
private Map<String, String> getAdditionalProperties(Map<String, String> existing, private Map<String, String> getAdditionalProperties(Map<String, String> existing,
DataSource dataSource) { DataSource dataSource) {
Map<String, String> result = new HashMap<String, String>(existing); Map<String, String> result = new HashMap<String, String>(existing);
if (!isAlreadyProvided(existing, "ejb.naming_strategy_delegator")) { if (!existing.containsKey("hibernate." + "ejb.naming_strategy_delegator")) {
result.put("hibernate.ejb.naming_strategy", result.put("hibernate.ejb.naming_strategy",
getHibernateNamingStrategy(existing)); getHibernateNamingStrategy(existing));
} }
@ -173,7 +173,7 @@ public class JpaProperties {
} }
private String getHibernateNamingStrategy(Map<String, String> existing) { private String getHibernateNamingStrategy(Map<String, String> existing) {
if (!isAlreadyProvided(existing, "ejb.naming_strategy") if (!existing.containsKey("hibernate." + "ejb.naming_strategy")
&& this.namingStrategy != null) { && this.namingStrategy != null) {
return this.namingStrategy.getName(); return this.namingStrategy.getName();
} }
@ -184,10 +184,11 @@ public class JpaProperties {
DataSource dataSource) { DataSource dataSource) {
String ddlAuto = (this.ddlAuto != null ? this.ddlAuto String ddlAuto = (this.ddlAuto != null ? this.ddlAuto
: getDefaultDdlAuto(dataSource)); : getDefaultDdlAuto(dataSource));
if (!isAlreadyProvided(existing, "hbm2ddl.auto") && !"none".equals(ddlAuto)) { if (!existing.containsKey("hibernate." + "hbm2ddl.auto")
&& !"none".equals(ddlAuto)) {
return ddlAuto; return ddlAuto;
} }
if (isAlreadyProvided(existing, "hbm2ddl.auto")) { if (existing.containsKey("hibernate." + "hbm2ddl.auto")) {
return existing.get("hibernate.hbm2ddl.auto"); return existing.get("hibernate.hbm2ddl.auto");
} }
return "none"; return "none";
@ -200,10 +201,6 @@ public class JpaProperties {
return "none"; return "none";
} }
private boolean isAlreadyProvided(Map<String, String> existing, String key) {
return existing.containsKey("hibernate." + key);
}
} }
} }