From 5c6fef903df5ba4e9f3e14e69cb67dea4b5745eb Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 29 Jun 2015 17:44:57 -0700
Subject: [PATCH] Polish

---
 .../boot/autoconfigure/orm/jpa/JpaProperties.java   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

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