Skip to content

Commit 73ec7c6

Browse files
koentsjekoentsje
committed
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.NativeConfiguration' - Move test class 'org.hibernate.tool.orm.jbt.util.NativeConfigurationTest' Signed-off-by: Koen Aers <[email protected]>
1 parent 43c431b commit 73ec7c6

File tree

5 files changed

+12
-17
lines changed

5 files changed

+12
-17
lines changed

‎jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/ConfigurationWrapperFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import org.hibernate.tool.orm.jbt.api.wrp.TableWrapper;
1919
import org.hibernate.tool.orm.jbt.internal.util.ExtendedConfiguration;
2020
import org.hibernate.tool.orm.jbt.internal.util.JpaConfiguration;
21+
import org.hibernate.tool.orm.jbt.internal.util.NativeConfiguration;
2122
import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
22-
import org.hibernate.tool.orm.jbt.util.NativeConfiguration;
2323
import org.hibernate.tool.orm.jbt.util.RevengConfiguration;
2424
import org.w3c.dom.Document;
2525
import org.xml.sax.EntityResolver;

‎jbt/src/main/java/org/hibernate/tool/orm/jbt/util/NativeConfiguration.java renamed to ‎jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/util/NativeConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.hibernate.tool.orm.jbt.util;
1+
package org.hibernate.tool.orm.jbt.internal.util;
22

33
import java.io.File;
44
import java.io.FileWriter;
@@ -19,8 +19,6 @@
1919
import org.hibernate.mapping.PersistentClass;
2020
import org.hibernate.mapping.Table;
2121
import org.hibernate.tool.api.reveng.RevengStrategy;
22-
import org.hibernate.tool.orm.jbt.internal.util.ExtendedConfiguration;
23-
import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper;
2422
import org.w3c.dom.Document;
2523
import org.xml.sax.EntityResolver;
2624

‎jbt/src/test/java/org/hibernate/tool/orm/jbt/api/factory/WrapperFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
import org.hibernate.tool.orm.jbt.internal.util.DummyMetadataBuildingContext;
7575
import org.hibernate.tool.orm.jbt.internal.util.JpaConfiguration;
7676
import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper;
77-
import org.hibernate.tool.orm.jbt.util.NativeConfiguration;
77+
import org.hibernate.tool.orm.jbt.internal.util.NativeConfiguration;
7878
import org.hibernate.tool.orm.jbt.util.RevengConfiguration;
7979
import org.hibernate.tool.orm.jbt.util.SpecialRootClass;
8080
import org.junit.jupiter.api.Test;

‎jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ConfigurationWrapperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper;
4040
import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
4141
import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
42-
import org.hibernate.tool.orm.jbt.util.NativeConfiguration;
42+
import org.hibernate.tool.orm.jbt.internal.util.NativeConfiguration;
4343
import org.hibernate.tool.orm.jbt.util.RevengConfiguration;
4444
import org.junit.jupiter.api.AfterEach;
4545
import org.junit.jupiter.api.BeforeEach;

‎jbt/src/test/java/org/hibernate/tool/orm/jbt/util/NativeConfigurationTest.java renamed to ‎jbt/src/test/java/org/hibernate/tool/orm/jbt/internal/util/NativeConfigurationTest.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.hibernate.tool.orm.jbt.util;
1+
package org.hibernate.tool.orm.jbt.internal.util;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -24,9 +24,6 @@
2424
import org.hibernate.mapping.PersistentClass;
2525
import org.hibernate.mapping.Table;
2626
import org.hibernate.tool.internal.reveng.strategy.DefaultStrategy;
27-
import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper;
28-
import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
29-
import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
3027
import org.junit.jupiter.api.BeforeEach;
3128
import org.junit.jupiter.api.Test;
3229
import org.w3c.dom.Document;
@@ -37,7 +34,7 @@
3734
public class NativeConfigurationTest {
3835

3936
private static final String TEST_HBM_XML_STRING =
40-
"<hibernate-mapping package='org.hibernate.tool.orm.jbt.util'>" +
37+
"<hibernate-mapping package='org.hibernate.tool.orm.jbt.internal.util'>" +
4138
" <class name='NativeConfigurationTest$Foo'>" +
4239
" <id name='id'/>" +
4340
" </class>" +
@@ -101,7 +98,7 @@ public void testConfigureDocument() throws Exception {
10198
fileWriter.close();
10299

103100
String fooClassName =
104-
"org.hibernate.tool.orm.jbt.util.NativeConfigurationTest$Foo";
101+
"org.hibernate.tool.orm.jbt.internal.util.NativeConfigurationTest$Foo";
105102
Metadata metadata = MetadataHelper.getMetadata(nativeConfiguration);
106103
assertNull(metadata.getEntityBinding(fooClassName));
107104
nativeConfiguration.configure(document);
@@ -120,10 +117,10 @@ public void testBuildMappings() throws Exception {
120117

121118
@Test
122119
public void testGetClassMappings() throws Exception {
123-
String fooHbmXmlFilePath = "org/hibernate/tool/orm/jbt/util";
120+
String fooHbmXmlFilePath = "org/hibernate/tool/orm/jbt/internal/util";
124121
String fooHbmXmlFileName = "NativeConfigurationTest$Foo.hbm.xml";
125122
String fooClassName =
126-
"org.hibernate.tool.orm.jbt.util.NativeConfigurationTest$Foo";
123+
"org.hibernate.tool.orm.jbt.internal.util.NativeConfigurationTest$Foo";
127124
URL url = getClass().getProtectionDomain().getCodeSource().getLocation();
128125
File hbmXmlFileDir = new File(new File(url.toURI()),fooHbmXmlFilePath);
129126
hbmXmlFileDir.deleteOnExit();
@@ -205,10 +202,10 @@ public void testGetEntityResolver() throws Exception {
205202

206203
@Test
207204
public void testGetClassMapping() throws Exception {
208-
String fooHbmXmlFilePath = "org/hibernate/tool/orm/jbt/util";
205+
String fooHbmXmlFilePath = "org/hibernate/tool/orm/jbt/internal/util";
209206
String fooHbmXmlFileName = "NativeConfigurationTest$Foo.hbm.xml";
210207
String fooClassName =
211-
"org.hibernate.tool.orm.jbt.util.NativeConfigurationTest$Foo";
208+
"org.hibernate.tool.orm.jbt.internal.util.NativeConfigurationTest$Foo";
212209
URL url = getClass().getProtectionDomain().getCodeSource().getLocation();
213210
File hbmXmlFileDir = new File(new File(url.toURI()),fooHbmXmlFilePath);
214211
hbmXmlFileDir.deleteOnExit();
@@ -228,7 +225,7 @@ public void testGetClassMapping() throws Exception {
228225

229226
@Test
230227
public void testGetTableMappings() throws Exception {
231-
String fooHbmXmlFilePath = "org/hibernate/tool/orm/jbt/util";
228+
String fooHbmXmlFilePath = "org/hibernate/tool/orm/jbt/internal/util";
232229
String fooHbmXmlFileName = "NativeConfigurationTest$Foo.hbm.xml";
233230
URL url = getClass().getProtectionDomain().getCodeSource().getLocation();
234231
File hbmXmlFileDir = new File(new File(url.toURI()),fooHbmXmlFilePath);

0 commit comments

Comments
 (0)