From 36355df3a27f48a15da74db3931639ceceabf9c3 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 1 Jul 2024 15:54:19 +0300 Subject: [PATCH] HBX-2835: Move classes from package 'org.hibernate.tool.orm.jbt.util' to package 'org.hibernate.tool.orm.jbt.internal.util' - Move class 'org.hibernate.tool.orm.jbt.util.MetadataHelper' - Move test class 'org.hibernate.tool.orm.jbt.util.MetadataHelperTest' Signed-off-by: Koen Aers --- .../orm/jbt/internal/factory/ColumnWrapperFactory.java | 2 +- .../jbt/internal/factory/HqlCodeAssistWrapperFactory.java | 2 +- .../jbt/internal/factory/SchemaExportWrapperFactory.java | 2 +- .../internal/util/ConfigurationMetadataDescriptor.java | 1 - .../tool/orm/jbt/{ => internal}/util/MetadataHelper.java | 2 +- .../hibernate/tool/orm/jbt/util/NativeConfiguration.java | 1 + .../tool/orm/jbt/api/factory/WrapperFactoryTest.java | 2 +- .../tool/orm/jbt/api/wrp/ConfigurationWrapperTest.java | 2 +- .../orm/jbt/{ => internal}/util/MetadataHelperTest.java | 8 +++++--- .../tool/orm/jbt/util/NativeConfigurationTest.java | 1 + 10 files changed, 13 insertions(+), 10 deletions(-) rename jbt/src/main/java/org/hibernate/tool/orm/jbt/{ => internal}/util/MetadataHelper.java (98%) rename jbt/src/test/java/org/hibernate/tool/orm/jbt/{ => internal}/util/MetadataHelperTest.java (91%) diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/ColumnWrapperFactory.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/ColumnWrapperFactory.java index c0fe19c104..c5d35483b0 100644 --- a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/ColumnWrapperFactory.java +++ b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/ColumnWrapperFactory.java @@ -6,8 +6,8 @@ import org.hibernate.tool.orm.jbt.api.wrp.ColumnWrapper; import org.hibernate.tool.orm.jbt.api.wrp.ConfigurationWrapper; import org.hibernate.tool.orm.jbt.api.wrp.ValueWrapper; +import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper; import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper; -import org.hibernate.tool.orm.jbt.util.MetadataHelper; public class ColumnWrapperFactory { diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/HqlCodeAssistWrapperFactory.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/HqlCodeAssistWrapperFactory.java index e7f2496666..b067195649 100644 --- a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/HqlCodeAssistWrapperFactory.java +++ b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/HqlCodeAssistWrapperFactory.java @@ -6,8 +6,8 @@ import org.hibernate.tool.orm.jbt.api.wrp.ConfigurationWrapper; import org.hibernate.tool.orm.jbt.api.wrp.HqlCodeAssistWrapper; import org.hibernate.tool.orm.jbt.internal.util.HqlCompletionRequestor; +import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper; import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper; -import org.hibernate.tool.orm.jbt.util.MetadataHelper; public class HqlCodeAssistWrapperFactory { diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/SchemaExportWrapperFactory.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/SchemaExportWrapperFactory.java index 25511684f2..6f72ec55cb 100644 --- a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/SchemaExportWrapperFactory.java +++ b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/SchemaExportWrapperFactory.java @@ -7,8 +7,8 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.orm.jbt.api.wrp.ConfigurationWrapper; import org.hibernate.tool.orm.jbt.api.wrp.SchemaExportWrapper; +import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper; import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper; -import org.hibernate.tool.orm.jbt.util.MetadataHelper; import org.hibernate.tool.schema.TargetType; public class SchemaExportWrapperFactory { diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/ConfigurationMetadataDescriptor.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/ConfigurationMetadataDescriptor.java index f54409ad34..3a1a452e4c 100644 --- a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/ConfigurationMetadataDescriptor.java +++ b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/ConfigurationMetadataDescriptor.java @@ -5,7 +5,6 @@ import org.hibernate.boot.Metadata; import org.hibernate.cfg.Configuration; import org.hibernate.tool.api.metadata.MetadataDescriptor; -import org.hibernate.tool.orm.jbt.util.MetadataHelper; public class ConfigurationMetadataDescriptor implements MetadataDescriptor { diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/util/MetadataHelper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/MetadataHelper.java similarity index 98% rename from jbt/src/main/java/org/hibernate/tool/orm/jbt/util/MetadataHelper.java rename to jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/MetadataHelper.java index b3a49a28e5..cd160265bc 100644 --- a/jbt/src/main/java/org/hibernate/tool/orm/jbt/util/MetadataHelper.java +++ b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/MetadataHelper.java @@ -1,4 +1,4 @@ -package org.hibernate.tool.orm.jbt.util; +package org.hibernate.tool.orm.jbt.internal.util; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/util/NativeConfiguration.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/util/NativeConfiguration.java index 2ede9562ae..3a8af24398 100644 --- a/jbt/src/main/java/org/hibernate/tool/orm/jbt/util/NativeConfiguration.java +++ b/jbt/src/main/java/org/hibernate/tool/orm/jbt/util/NativeConfiguration.java @@ -20,6 +20,7 @@ import org.hibernate.mapping.Table; import org.hibernate.tool.api.reveng.RevengStrategy; import org.hibernate.tool.orm.jbt.internal.util.ExtendedConfiguration; +import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper; import org.w3c.dom.Document; import org.xml.sax.EntityResolver; diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/factory/WrapperFactoryTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/factory/WrapperFactoryTest.java index 214371903d..0c1d44f2c1 100644 --- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/factory/WrapperFactoryTest.java +++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/factory/WrapperFactoryTest.java @@ -73,7 +73,7 @@ import org.hibernate.tool.orm.jbt.internal.util.ConfigurationMetadataDescriptor; import org.hibernate.tool.orm.jbt.internal.util.DummyMetadataBuildingContext; import org.hibernate.tool.orm.jbt.internal.util.JpaConfiguration; -import org.hibernate.tool.orm.jbt.util.MetadataHelper; +import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper; import org.hibernate.tool.orm.jbt.util.NativeConfiguration; import org.hibernate.tool.orm.jbt.util.RevengConfiguration; import org.hibernate.tool.orm.jbt.util.SpecialRootClass; diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ConfigurationWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ConfigurationWrapperTest.java index d23ee733b6..f8d124d9b1 100644 --- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ConfigurationWrapperTest.java +++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ConfigurationWrapperTest.java @@ -36,7 +36,7 @@ import org.hibernate.tool.orm.jbt.internal.factory.NamingStrategyWrapperFactory; import org.hibernate.tool.orm.jbt.internal.factory.RevengStrategyWrapperFactory; import org.hibernate.tool.orm.jbt.internal.util.JpaConfiguration; -import org.hibernate.tool.orm.jbt.util.MetadataHelper; +import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper; import org.hibernate.tool.orm.jbt.util.MockConnectionProvider; import org.hibernate.tool.orm.jbt.util.MockDialect; import org.hibernate.tool.orm.jbt.util.NativeConfiguration; diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/MetadataHelperTest.java similarity index 91% rename from jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java rename to jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/MetadataHelperTest.java index b5c8c30f74..e4567b7246 100644 --- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java +++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/MetadataHelperTest.java @@ -1,4 +1,4 @@ -package org.hibernate.tool.orm.jbt.util; +package org.hibernate.tool.orm.jbt.internal.util; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; @@ -13,6 +13,8 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; +import org.hibernate.tool.orm.jbt.util.MockConnectionProvider; +import org.hibernate.tool.orm.jbt.util.MockDialect; import org.junit.jupiter.api.Test; public class MetadataHelperTest { @@ -46,7 +48,7 @@ public void testGetMetadata() { configuration.setProperty(AvailableSettings.DIALECT, MockDialect.class.getName()); configuration.setProperty(AvailableSettings.CONNECTION_PROVIDER, MockConnectionProvider.class.getName()); Metadata metadata = MetadataHelper.getMetadata(configuration); - assertNotNull(metadata.getEntityBinding("org.hibernate.tool.orm.jbt.util.MetadataHelperTest$Foo")); + assertNotNull(metadata.getEntityBinding("org.hibernate.tool.orm.jbt.internal.util.MetadataHelperTest$Foo")); } private static class MetadataMethodConfiguration extends Configuration { @@ -89,7 +91,7 @@ private static class Foo { "" + - "" + + "" + " " + " " + " " + diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/NativeConfigurationTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/NativeConfigurationTest.java index dc013f1ede..b97918ccda 100644 --- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/NativeConfigurationTest.java +++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/NativeConfigurationTest.java @@ -24,6 +24,7 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; import org.hibernate.tool.internal.reveng.strategy.DefaultStrategy; +import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.w3c.dom.Document;