From 0ab7c25d9f5b4920fc31bcbe4eb5b47bca4a32c9 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Fri, 24 Mar 2017 17:07:14 -0700 Subject: [PATCH] Revert "Change default for new_generator_mappings to true" This reverts commit 735dbc4583480475d1299ca56bb5eb0f609a7267. --- .../boot/autoconfigure/orm/jpa/JpaProperties.java | 2 +- .../boot/autoconfigure/orm/jpa/JpaPropertiesTests.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 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 eb253ce9165..2368092cebe 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 @@ -202,7 +202,7 @@ public class JpaProperties { this.useNewIdGeneratorMappings.toString()); } else if (!result.containsKey(USE_NEW_ID_GENERATOR_MAPPINGS)) { - result.put(USE_NEW_ID_GENERATOR_MAPPINGS, "true"); + result.put(USE_NEW_ID_GENERATOR_MAPPINGS, "false"); } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java index 6a37bd178fd..60a4c5be575 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java @@ -108,17 +108,17 @@ public class JpaPropertiesTests { Map hibernateProperties = properties .getHibernateProperties(mockStandaloneDataSource()); assertThat(hibernateProperties) - .containsEntry(AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true"); + .containsEntry(AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "false"); } @Test - public void useNewIdGeneratorMappingsFalse() throws Exception { + public void useNewIdGeneratorMappingsTrue() throws Exception { JpaProperties properties = load( - "spring.jpa.hibernate.use-new-id-generator-mappings:false"); + "spring.jpa.hibernate.use-new-id-generator-mappings:true"); Map hibernateProperties = properties .getHibernateProperties(mockStandaloneDataSource()); assertThat(hibernateProperties) - .containsEntry(AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "false"); + .containsEntry(AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true"); } @Test