From 6ff721351586480ae9d1e933843edec7ca1ca24f Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Tue, 7 Mar 2023 15:16:02 +0000 Subject: [PATCH] HHH-16223 Deprecate HBM2DDL_SCRIPTS_ACTION --- .../annotations/onetoone/OneToOneJoinTableUniquenessTest.java | 2 +- .../qualfiedTableNaming/DefaultCatalogAndSchemaTest.java | 2 +- .../SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java | 4 ++-- .../jpa/schemagen/SchemaScriptFileGenerationFailureTest.java | 2 +- .../test/jpa/schemagen/SchemaScriptFileGenerationTest.java | 2 +- .../HANASchemaMigrationTargetScriptCreationTest.java | 2 +- .../test/schemaupdate/SchemaCreationToOutputScriptTest.java | 2 +- .../orm/test/schemaupdate/SchemaDropToOutputScriptTest.java | 2 +- .../schemaupdate/SchemaMigrationTargetScriptCreationTest.java | 2 +- .../test/schemaupdate/SchemaMigrationToOutputScriptTest.java | 2 +- .../envers/integration/tools/OrderSequenceGenerationTest.java | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java index d6f5246dfb..008564a363 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java @@ -61,7 +61,7 @@ protected void configure(Configuration configuration) { } String value = output.toPath().toString(); configuration.setProperty( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, value ); - configuration.setProperty( AvailableSettings.HBM2DDL_SCRIPTS_ACTION, "create" ); + configuration.setProperty( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "create" ); configuration.setProperty( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "create-drop" ); configuration.setProperty( AvailableSettings.FORMAT_SQL, "false" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java index 9d894852f2..a7c7845069 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java @@ -688,7 +688,7 @@ private String generateScriptFromSessionFactory(String action) { serviceRegistry.getService( ConfigurationService.class ).getSettings() ); StringWriter writer = new StringWriter(); - settings.put( AvailableSettings.HBM2DDL_SCRIPTS_ACTION, action ); + settings.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, action ); settings.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, writer ); settings.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET, writer ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java index 0b171179d0..d4270132f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.hibernate.cfg.AvailableSettings.HBM2DDL_SCRIPTS_ACTION; +import static org.hibernate.cfg.AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION; import static org.hibernate.cfg.AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET; import static org.hibernate.cfg.AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -47,7 +47,7 @@ protected Map getConfig() { final Map config = Environment.getProperties(); config.put( JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, createSchema.toPath() ); config.put( JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET, dropSchema.toPath() ); - config.put( HBM2DDL_SCRIPTS_ACTION, "drop-and-create" ); + config.put( JAKARTA_HBM2DDL_SCRIPTS_ACTION, "drop-and-create" ); ArrayList classes = new ArrayList(); classes.addAll( Arrays.asList( new Class[] {TestEntity.class} ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java index 4290e7304e..cc85a9b7e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java @@ -111,7 +111,7 @@ private PersistenceUnitDescriptor buildPersistenceUnitDescriptor() { private Map getConfig() { final Map config = Environment.getProperties(); config.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET, writer ); - config.put( AvailableSettings.HBM2DDL_SCRIPTS_ACTION, "drop-and-create" ); + config.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "drop-and-create" ); config.put( AvailableSettings.HBM2DDL_HALT_ON_ERROR, "true" ); ArrayList classes = new ArrayList<>(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java index 5b892d3e44..45c90691b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java @@ -110,7 +110,7 @@ private Map getConfig() { final Map config = Environment.getProperties(); config.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, createSchema.toPath() ); config.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET, dropSchema.toPath() ); - config.put( AvailableSettings.HBM2DDL_SCRIPTS_ACTION, "drop-and-create" ); + config.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "drop-and-create" ); ArrayList classes = new ArrayList(); classes.addAll( Arrays.asList( new Class[] {TestEntity.class} ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java index cf8e35bbb2..852d48ff2e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java @@ -67,7 +67,7 @@ protected void configure(Configuration configuration) { fail( e.getMessage() ); } this.output.deleteOnExit(); - configuration.setProperty( Environment.HBM2DDL_SCRIPTS_ACTION, "create" ); + configuration.setProperty( Environment.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "create" ); configuration.setProperty( Environment.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, this.output.getAbsolutePath() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java index cdcb6aac6b..83dda936a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java @@ -79,7 +79,7 @@ public void setUp() throws Exception { private void createServiceRegistryAndMetadata(String append) { final StandardServiceRegistryBuilder standardServiceRegistryBuilder = new StandardServiceRegistryBuilder() .applySetting( Environment.FORMAT_SQL, "false" ) - .applySetting( Environment.HBM2DDL_SCRIPTS_ACTION, "create" ) + .applySetting( Environment.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "create" ) .applySetting( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, output.getAbsolutePath() ); if ( append != null ) { standardServiceRegistryBuilder.applySetting( AvailableSettings.HBM2DDL_SCRIPTS_CREATE_APPEND, append ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java index 4dea797ef8..734baab9d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java @@ -76,7 +76,7 @@ public void setUp() throws Exception { private void createServiceRegistryAndMetadata(String append) { final StandardServiceRegistryBuilder standardServiceRegistryBuilder = new StandardServiceRegistryBuilder() .applySetting( Environment.FORMAT_SQL, "false" ) - .applySetting( Environment.HBM2DDL_SCRIPTS_ACTION, "drop" ) + .applySetting( Environment.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "drop" ) .applySetting( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET, output.getAbsolutePath() ); if ( append != null ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java index 86ce432a5d..f59c91a6d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java @@ -61,7 +61,7 @@ protected void configure(Configuration configuration) { } output.deleteOnExit(); configuration.setProperty( Environment.JAKARTA_HBM2DDL_DATABASE_ACTION, "update" ); - configuration.setProperty( Environment.HBM2DDL_SCRIPTS_ACTION, "update" ); + configuration.setProperty( Environment.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "update" ); configuration.setProperty( Environment.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, output.getAbsolutePath() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java index 6d1aa9d0a1..0860d57c2e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java @@ -91,7 +91,7 @@ public void setUp() throws Exception { private void createServiceRegistryAndMetadata(String append) { final StandardServiceRegistryBuilder standardServiceRegistryBuilder = new StandardServiceRegistryBuilder() .applySetting( Environment.FORMAT_SQL, "false" ) - .applySetting( Environment.HBM2DDL_SCRIPTS_ACTION, "update" ) + .applySetting( Environment.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "update" ) .applySetting( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, output.getAbsolutePath() ); if ( append != null ) { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java index fc1a786634..be247fc7e4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java @@ -56,7 +56,7 @@ protected void addConfigOptions(Map options) { super.addConfigOptions( options ); options.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, createSchema.toPath() ); options.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET, dropSchema.toPath() ); - options.put( AvailableSettings.HBM2DDL_SCRIPTS_ACTION, "drop-and-create" ); + options.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "drop-and-create" ); options.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "create-drop" ); options.put( AvailableSettings.HBM2DDL_AUTO, "create-drop" ); }