From 4d3be23c5bffb7744f2426d5c162dfe06a903f63 Mon Sep 17 00:00:00 2001
From: Koen Aers <koen.aers@gmail.com>
Date: Mon, 1 Jul 2024 18:16:22 +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.MockDialect'   - Move test class
 'org.hibernate.tool.orm.jbt.util.MockDialectTest'

Signed-off-by: Koen Aers <koen.aers@gmail.com>
---
 .../orm/jbt/internal/util/DummyMetadataBuildingContext.java    | 1 -
 .../tool/orm/jbt/{ => internal}/util/MockDialect.java          | 2 +-
 .../tool/orm/jbt/api/wrp/ClassMetadataWrapperTest.java         | 2 +-
 .../tool/orm/jbt/api/wrp/CollectionMetadataWrapperTest.java    | 2 +-
 .../org/hibernate/tool/orm/jbt/api/wrp/ColumnWrapperTest.java  | 2 +-
 .../tool/orm/jbt/api/wrp/ConfigurationWrapperTest.java         | 2 +-
 .../tool/orm/jbt/api/wrp/SchemaExportWrapperTest.java          | 2 +-
 .../tool/orm/jbt/api/wrp/SessionFactoryWrapperTest.java        | 2 +-
 .../org/hibernate/tool/orm/jbt/api/wrp/SessionWrapperTest.java | 2 +-
 .../jbt/internal/util/ConfigurationMetadataDescriptorTest.java | 1 -
 .../jbt/internal/util/DummyMetadataBuildingContextTest.java    | 1 -
 .../tool/orm/jbt/internal/util/JpaConfigurationTest.java       | 1 -
 .../tool/orm/jbt/internal/util/MetadataHelperTest.java         | 1 -
 .../tool/orm/jbt/{ => internal}/util/MockDialectTest.java      | 3 ++-
 .../hibernate/tool/orm/jbt/util/NativeConfigurationTest.java   | 1 +
 15 files changed, 11 insertions(+), 14 deletions(-)
 rename jbt/src/main/java/org/hibernate/tool/orm/jbt/{ => internal}/util/MockDialect.java (82%)
 rename jbt/src/test/java/org/hibernate/tool/orm/jbt/{ => internal}/util/MockDialectTest.java (79%)

diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/DummyMetadataBuildingContext.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/DummyMetadataBuildingContext.java
index 72a54c633e..e5224924d6 100644
--- a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/DummyMetadataBuildingContext.java
+++ b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/DummyMetadataBuildingContext.java
@@ -11,7 +11,6 @@
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
 
 public class DummyMetadataBuildingContext {
 	
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/util/MockDialect.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/MockDialect.java
similarity index 82%
rename from jbt/src/main/java/org/hibernate/tool/orm/jbt/util/MockDialect.java
rename to jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/MockDialect.java
index 68d166e5de..8f4caba707 100644
--- a/jbt/src/main/java/org/hibernate/tool/orm/jbt/util/MockDialect.java
+++ b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/MockDialect.java
@@ -1,4 +1,4 @@
-package org.hibernate.tool.orm.jbt.util;
+package org.hibernate.tool.orm.jbt.internal.util;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.SimpleDatabaseVersion;
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ClassMetadataWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ClassMetadataWrapperTest.java
index 4f7933685e..73bf2bfb11 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ClassMetadataWrapperTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ClassMetadataWrapperTest.java
@@ -21,7 +21,7 @@
 import org.hibernate.tool.orm.jbt.internal.factory.ClassMetadataWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.factory.SessionWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.hibernate.type.CollectionType;
 import org.hibernate.type.internal.NamedBasicTypeImpl;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/CollectionMetadataWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/CollectionMetadataWrapperTest.java
index 3f00edf9d6..7b84999dc0 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/CollectionMetadataWrapperTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/CollectionMetadataWrapperTest.java
@@ -16,7 +16,7 @@
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.tool.orm.jbt.internal.factory.CollectionMetadataWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ColumnWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ColumnWrapperTest.java
index 439da4cfb6..7a00351faf 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ColumnWrapperTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ColumnWrapperTest.java
@@ -17,7 +17,7 @@
 import org.hibernate.tool.orm.jbt.internal.factory.ColumnWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.factory.ConfigurationWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
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 c4a43e1a07..674a5379eb 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
@@ -38,7 +38,7 @@
 import org.hibernate.tool.orm.jbt.internal.util.JpaConfiguration;
 import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper;
 import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.hibernate.tool.orm.jbt.util.NativeConfiguration;
 import org.hibernate.tool.orm.jbt.util.RevengConfiguration;
 import org.junit.jupiter.api.AfterEach;
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SchemaExportWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SchemaExportWrapperTest.java
index 82cc0063a9..048bdea2c1 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SchemaExportWrapperTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SchemaExportWrapperTest.java
@@ -15,7 +15,7 @@
 import org.hibernate.tool.orm.jbt.internal.factory.ConfigurationWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.factory.SchemaExportWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.hibernate.tool.schema.TargetType;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SessionFactoryWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SessionFactoryWrapperTest.java
index 7aa7743733..83965ee5f0 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SessionFactoryWrapperTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SessionFactoryWrapperTest.java
@@ -20,7 +20,7 @@
 import org.hibernate.cfg.Configuration;
 import org.hibernate.tool.orm.jbt.internal.factory.SessionFactoryWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SessionWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SessionWrapperTest.java
index 5db06d3e6c..3c1e80c8bf 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SessionWrapperTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SessionWrapperTest.java
@@ -19,7 +19,7 @@
 import org.hibernate.query.Query;
 import org.hibernate.tool.orm.jbt.internal.factory.SessionWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/ConfigurationMetadataDescriptorTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/ConfigurationMetadataDescriptorTest.java
index 44e109d845..1370436326 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/ConfigurationMetadataDescriptorTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/ConfigurationMetadataDescriptorTest.java
@@ -10,7 +10,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/DummyMetadataBuildingContextTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/DummyMetadataBuildingContextTest.java
index 8bfaf3ae25..643a437134 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/DummyMetadataBuildingContextTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/DummyMetadataBuildingContextTest.java
@@ -7,7 +7,6 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.tool.orm.jbt.internal.util.DummyMetadataBuildingContext;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
 import org.junit.jupiter.api.Test;
 
 public class DummyMetadataBuildingContextTest {
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/JpaConfigurationTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/JpaConfigurationTest.java
index 8b68da664b..53c22ebf4a 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/JpaConfigurationTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/JpaConfigurationTest.java
@@ -30,7 +30,6 @@
 import org.hibernate.mapping.Table;
 import org.hibernate.tool.internal.reveng.strategy.DefaultStrategy;
 import org.hibernate.tool.orm.jbt.internal.util.JpaConfiguration;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/MetadataHelperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/MetadataHelperTest.java
index 3cb92293c3..3f5a33f84b 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/MetadataHelperTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/MetadataHelperTest.java
@@ -13,7 +13,6 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
 import org.junit.jupiter.api.Test;
 
 public class MetadataHelperTest {
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MockDialectTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/MockDialectTest.java
similarity index 79%
rename from jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MockDialectTest.java
rename to jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/MockDialectTest.java
index aa54ae49b9..c6fe83d175 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MockDialectTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/MockDialectTest.java
@@ -1,8 +1,9 @@
-package org.hibernate.tool.orm.jbt.util;
+package org.hibernate.tool.orm.jbt.internal.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.hibernate.dialect.DatabaseVersion;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.junit.jupiter.api.Test;
 
 public class MockDialectTest {
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 a02205365a..0362f89d95 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
@@ -26,6 +26,7 @@
 import org.hibernate.tool.internal.reveng.strategy.DefaultStrategy;
 import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper;
 import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;