Skip to content

Commit 0aee878

Browse files
koentsjekoentsje
committed
JBIDE-29224: Update hibernate tools dependency of org.jboss.tools.hibernate.orm.runtime.v_6_5 to version 6.5.3.Final
Signed-off-by: Koen Aers <[email protected]>
1 parent ce86dff commit 0aee878

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+402
-349
lines changed

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5/META-INF/MANIFEST.MF

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Require-Bundle: org.jboss.tools.hibernate.orm.runtime.common,
2121
Bundle-Localization: plugin
2222
Bundle-RequiredExecutionEnvironment: JavaSE-11
2323
Bundle-ClassPath: .,
24-
lib/hibernate-ant-6.5.2.Final.jar,
25-
lib/hibernate-core-6.5.2.Final.jar,
26-
lib/hibernate-tools-orm-6.5.2.Final.jar,
27-
lib/hibernate-tools-orm-jbt-6.5.2.Final.jar,
28-
lib/hibernate-tools-utils-6.5.2.Final.jar
24+
lib/hibernate-ant-6.5.3.Final.jar,
25+
lib/hibernate-core-6.5.3.Final.jar,
26+
lib/hibernate-tools-orm-6.5.3.Final.jar,
27+
lib/hibernate-tools-orm-jbt-6.5.3.Final.jar,
28+
lib/hibernate-tools-utils-6.5.3.Final.jar

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<packaging>eclipse-plugin</packaging>
1313

1414
<properties>
15-
<hibernate.version>6.5.2.Final</hibernate.version>
15+
<hibernate.version>6.5.3.Final</hibernate.version>
1616
</properties>
1717

1818
<build>

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5/src/org/hibernate/tool/hbm2x/DAOExporter.java

-5
This file was deleted.

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5/src/org/hibernate/tool/hbm2x/DocExporter.java

-3
This file was deleted.

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5/src/org/hibernate/tool/hbm2x/GenericExporter.java

-3
This file was deleted.

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5/src/org/hibernate/tool/hbm2x/Hbm2DDLExporter.java

-5
This file was deleted.

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5/src/org/hibernate/tool/hbm2x/QueryExporter.java

-3
This file was deleted.

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5/src/org/jboss/tools/hibernate/orm/runtime/v_6_5/ServiceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.hibernate.service.ServiceRegistry;
2222
import org.hibernate.tool.api.reveng.RevengStrategy;
2323
import org.hibernate.tool.internal.export.cfg.CfgExporter;
24-
import org.hibernate.tool.orm.jbt.util.JpaMappingFileHelper;
25-
import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
24+
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
25+
import org.hibernate.tool.orm.jbt.internal.util.JpaMappingFileHelper;
2626
import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
2727
import org.jboss.tools.hibernate.orm.runtime.common.IDatabaseReader;
2828
import org.jboss.tools.hibernate.orm.runtime.common.IFacade;

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_5/IArtifactCollectorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import java.util.Map;
1515
import java.util.Set;
1616

17-
import org.hibernate.tool.orm.jbt.wrp.Wrapper;
18-
import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
17+
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
18+
import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
1919
import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
2020
import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
2121
import org.jboss.tools.hibernate.runtime.spi.IArtifactCollector;

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_5/ICfg2HbmToolTest.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import org.hibernate.mapping.BasicValue;
66
import org.hibernate.mapping.Property;
77
import org.hibernate.mapping.RootClass;
8-
import org.hibernate.tool.orm.jbt.util.DummyMetadataBuildingContext;
9-
import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
8+
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
9+
import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
10+
import org.hibernate.tool.orm.jbt.internal.util.DummyMetadataBuildingContext;
1011
import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
1112
import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
1213
import org.jboss.tools.hibernate.runtime.spi.ICfg2HbmTool;
@@ -39,7 +40,8 @@ public void testGetTagProperty() throws Exception {
3940
IProperty propertyFacade = (IProperty)GenericFacadeFactory.createFacade(
4041
IProperty.class,
4142
WrapperFactory.createPropertyWrapper());
42-
Property propertyTarget = (Property)((IFacade)propertyFacade).getTarget();
43+
Wrapper wrapper = (Wrapper)((IFacade)propertyFacade).getTarget();
44+
Property propertyTarget = (Property)wrapper.getWrappedObject();
4345
RootClass rc = new RootClass(DummyMetadataBuildingContext.INSTANCE);
4446
BasicValue basicValue = new BasicValue(DummyMetadataBuildingContext.INSTANCE);
4547
basicValue.setTypeName("foobar");

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_5/IClassMetadataTest.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
import org.hibernate.cfg.AvailableSettings;
1717
import org.hibernate.persister.entity.EntityPersister;
18-
import org.hibernate.tool.orm.jbt.util.MockConnectionProvider;
19-
import org.hibernate.tool.orm.jbt.util.MockDialect;
20-
import org.hibernate.tool.orm.jbt.wrp.Wrapper;
21-
import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
18+
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
19+
import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
20+
import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
21+
import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
2222
import org.hibernate.type.CollectionType;
2323
import org.hibernate.type.Type;
2424
import org.hibernate.type.internal.NamedBasicTypeImpl;
@@ -85,7 +85,8 @@ public void beforeEach() throws Exception {
8585
configuration.configure(cfgXmlFile);
8686
sessionFactoryFacade = configuration.buildSessionFactory();
8787
classMetadataFacade = sessionFactoryFacade.getClassMetadata(Foo.class.getName());
88-
classMetadataTarget = (EntityPersister)((IFacade)classMetadataFacade).getTarget();
88+
Wrapper wrapper = (Wrapper)((IFacade)classMetadataFacade).getTarget();
89+
classMetadataTarget = (EntityPersister)wrapper.getWrappedObject();
8990
}
9091

9192
@Test

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_5/ICollectionMetadataTest.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
import org.hibernate.cfg.AvailableSettings;
1313
import org.hibernate.persister.collection.CollectionPersister;
14-
import org.hibernate.tool.orm.jbt.util.MockConnectionProvider;
15-
import org.hibernate.tool.orm.jbt.util.MockDialect;
16-
import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
14+
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
15+
import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
16+
import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
17+
import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
1718
import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
1819
import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
1920
import org.jboss.tools.hibernate.runtime.spi.ICollectionMetadata;
@@ -75,7 +76,8 @@ public void beforeEach() throws Exception {
7576
configuration.configure(cfgXmlFile);
7677
sessionFactoryFacade = configuration.buildSessionFactory();
7778
collectionMetadataFacade = sessionFactoryFacade.getCollectionMetadata(Foo.class.getName() + ".bars");
78-
collectionMetadataTarget = (CollectionPersister)((IFacade)collectionMetadataFacade).getTarget();
79+
Wrapper wrapper = (Wrapper)((IFacade)collectionMetadataFacade).getTarget();
80+
collectionMetadataTarget = (CollectionPersister)wrapper.getWrappedObject();
7981
}
8082

8183
@Test

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_5/IColumnTest.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
import org.hibernate.cfg.AvailableSettings;
1616
import org.hibernate.mapping.Column;
1717
import org.hibernate.mapping.Value;
18-
import org.hibernate.tool.orm.jbt.util.MockConnectionProvider;
19-
import org.hibernate.tool.orm.jbt.util.MockDialect;
20-
import org.hibernate.tool.orm.jbt.wrp.ColumnWrapper;
21-
import org.hibernate.tool.orm.jbt.wrp.DelegatingColumnWrapperImpl;
22-
import org.hibernate.tool.orm.jbt.wrp.Wrapper;
23-
import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
18+
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
19+
import org.hibernate.tool.orm.jbt.api.wrp.ColumnWrapper;
20+
import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
21+
import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
22+
import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
2423
import org.hibernate.type.spi.TypeConfiguration;
2524
import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
2625
import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
@@ -40,7 +39,7 @@ public void beforeEach() throws Exception {
4039
columnFacade = (IColumn)GenericFacadeFactory.createFacade(
4140
IColumn.class,
4241
WrapperFactory.createColumnWrapper(null));
43-
columnTarget = ((ColumnWrapper)((IFacade)columnFacade).getTarget()).getWrappedObject();
42+
columnTarget = (Column)((ColumnWrapper)((IFacade)columnFacade).getTarget()).getWrappedObject();
4443
}
4544

4645
@Test
@@ -73,7 +72,7 @@ public void testGetSqlType() {
7372
columnFacade = (IColumn)GenericFacadeFactory.createFacade(
7473
IColumn.class,
7574
WrapperFactory.createColumnWrapper(null));
76-
columnTarget = ((ColumnWrapper)((IFacade)columnFacade).getTarget()).getWrappedObject();
75+
columnTarget = (Column)((ColumnWrapper)((IFacade)columnFacade).getTarget()).getWrappedObject();
7776
columnTarget.setValue(createValue());
7877
IConfiguration configurationFacade = (IConfiguration)GenericFacadeFactory.createFacade(
7978
IConfiguration.class,
@@ -92,7 +91,7 @@ public void testGetLength() {
9291

9392
@Test
9493
public void testGetDefaultLength() throws Exception {
95-
Field defaultLengthField = DelegatingColumnWrapperImpl.class.getDeclaredField("DEFAULT_LENGTH");
94+
Field defaultLengthField = ColumnWrapper.class.getDeclaredField("DEFAULT_LENGTH");
9695
defaultLengthField.setAccessible(true);
9796
assertEquals(defaultLengthField.get(null), columnFacade.getDefaultLength());
9897
}
@@ -106,7 +105,7 @@ public void testGetPrecision() {
106105

107106
@Test
108107
public void testGetDefaultPrecision() throws Exception {
109-
Field defaultPrecisionField = DelegatingColumnWrapperImpl.class.getDeclaredField("DEFAULT_PRECISION");
108+
Field defaultPrecisionField = ColumnWrapper.class.getDeclaredField("DEFAULT_PRECISION");
110109
defaultPrecisionField.setAccessible(true);
111110
assertEquals(defaultPrecisionField.get(null), columnFacade.getDefaultPrecision());
112111
}
@@ -120,7 +119,7 @@ public void testGetScale() {
120119

121120
@Test
122121
public void testGetDefaultScale() throws Exception {
123-
Field defaultScaleField = DelegatingColumnWrapperImpl.class.getDeclaredField("DEFAULT_SCALE");
122+
Field defaultScaleField = ColumnWrapper.class.getDeclaredField("DEFAULT_SCALE");
124123
defaultScaleField.setAccessible(true);
125124
assertEquals(defaultScaleField.get(null), columnFacade.getDefaultScale());
126125
}

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_5/IConfigurationTest.java

+21-13
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@
3434
import org.hibernate.cfg.NamingStrategy;
3535
import org.hibernate.mapping.PersistentClass;
3636
import org.hibernate.tool.api.reveng.RevengStrategy;
37-
import org.hibernate.tool.orm.jbt.util.JpaConfiguration;
38-
import org.hibernate.tool.orm.jbt.util.MetadataHelper;
39-
import org.hibernate.tool.orm.jbt.util.MockConnectionProvider;
40-
import org.hibernate.tool.orm.jbt.util.MockDialect;
41-
import org.hibernate.tool.orm.jbt.util.NativeConfiguration;
42-
import org.hibernate.tool.orm.jbt.util.RevengConfiguration;
43-
import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
37+
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
38+
import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
39+
import org.hibernate.tool.orm.jbt.internal.util.JpaConfiguration;
40+
import org.hibernate.tool.orm.jbt.internal.util.MetadataHelper;
41+
import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
42+
import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
43+
import org.hibernate.tool.orm.jbt.internal.util.NativeConfiguration;
44+
import org.hibernate.tool.orm.jbt.internal.util.RevengConfiguration;
4445
import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
4546
import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
4647
import org.jboss.tools.hibernate.runtime.spi.IConfiguration;
@@ -272,7 +273,7 @@ public void testSetNamingStrategy() throws Exception {
272273
// For native configuration
273274
Field namingStrategyField = nativeConfigurationTarget.getClass().getDeclaredField("namingStrategy");
274275
namingStrategyField.setAccessible(true);
275-
NamingStrategy namingStrategyTarget = (NamingStrategy)((IFacade)namingStrategyFacade).getTarget();
276+
NamingStrategy namingStrategyTarget = (NamingStrategy)((Wrapper)((IFacade)namingStrategyFacade).getTarget()).getWrappedObject();
276277
assertNull(namingStrategyField.get(nativeConfigurationTarget));
277278
nativeConfigurationFacade.setNamingStrategy(namingStrategyFacade);
278279
assertNotNull(namingStrategyField.get(nativeConfigurationTarget));
@@ -555,6 +556,8 @@ public void testBuildSessionFactory() throws Throwable {
555556
assertNotNull(sessionFactoryFacade);
556557
Object sessionFactory = ((IFacade)sessionFactoryFacade).getTarget();
557558
assertNotNull(sessionFactory);
559+
assertTrue(sessionFactory instanceof Wrapper);
560+
sessionFactory = ((Wrapper)sessionFactory).getWrappedObject();
558561
assertTrue(sessionFactory instanceof SessionFactory);
559562
sessionFactoryFacade = null;
560563
assertNull(sessionFactoryFacade);
@@ -574,6 +577,8 @@ public void testBuildSessionFactory() throws Throwable {
574577
assertNotNull(sessionFactoryFacade);
575578
sessionFactory = ((IFacade)sessionFactoryFacade).getTarget();
576579
assertNotNull(sessionFactory);
580+
assertTrue(sessionFactory instanceof Wrapper);
581+
sessionFactory = ((Wrapper)sessionFactory).getWrappedObject();
577582
assertTrue(sessionFactory instanceof SessionFactory);
578583
}
579584

@@ -660,7 +665,7 @@ public void testSetReverseEngineeringStrategy() {
660665
(IReverseEngineeringStrategy)GenericFacadeFactory.createFacade(
661666
IReverseEngineeringStrategy.class,
662667
WrapperFactory.createRevengStrategyWrapper());
663-
RevengStrategy reverseEngineeringStrategy = (RevengStrategy)((IFacade)strategyFacade).getTarget();
668+
RevengStrategy reverseEngineeringStrategy = (RevengStrategy)((Wrapper)((IFacade)strategyFacade).getTarget()).getWrappedObject();
664669
// For native configuration
665670
try {
666671
nativeConfigurationFacade.setReverseEngineeringStrategy(strategyFacade);
@@ -772,7 +777,7 @@ public void testGetNamingStrategy() {
772777
nativeConfigurationTarget.setNamingStrategy(namingStrategy);
773778
INamingStrategy namingStrategyFacade = nativeConfigurationFacade.getNamingStrategy();
774779
assertNotNull(namingStrategyFacade);
775-
Object namingStrategyTarget = ((IFacade)namingStrategyFacade).getTarget();
780+
Object namingStrategyTarget = ((Wrapper)((IFacade)namingStrategyFacade).getTarget()).getWrappedObject();
776781
assertSame(namingStrategyTarget, namingStrategy);
777782
// For reveng configuration
778783
try {
@@ -898,17 +903,20 @@ private void initializeFacadesAndTargets() {
898903
nativeConfigurationFacade = (IConfiguration)GenericFacadeFactory.createFacade(
899904
IConfiguration.class,
900905
WrapperFactory.createNativeConfigurationWrapper());
901-
nativeConfigurationTarget = (NativeConfiguration)((IFacade)nativeConfigurationFacade).getTarget();
906+
Wrapper wrapper = (Wrapper)((IFacade)nativeConfigurationFacade).getTarget();
907+
nativeConfigurationTarget = (NativeConfiguration)wrapper.getWrappedObject();
902908
nativeConfigurationTarget.setProperty(AvailableSettings.DIALECT, MockDialect.class.getName());
903909
nativeConfigurationTarget.setProperty(AvailableSettings.CONNECTION_PROVIDER, MockConnectionProvider.class.getName());
904910
revengConfigurationFacade = (IConfiguration)GenericFacadeFactory.createFacade(
905911
IConfiguration.class,
906912
WrapperFactory.createRevengConfigurationWrapper());
907-
revengConfigurationTarget = (RevengConfiguration)((IFacade)revengConfigurationFacade).getTarget();
913+
wrapper = (Wrapper)((IFacade)revengConfigurationFacade).getTarget();
914+
revengConfigurationTarget = (RevengConfiguration)wrapper.getWrappedObject();
908915
jpaConfigurationFacade = (IConfiguration)GenericFacadeFactory.createFacade(
909916
IConfiguration.class,
910917
WrapperFactory.createJpaConfigurationWrapper("foobar", null));
911-
jpaConfigurationTarget = (JpaConfiguration)((IFacade)jpaConfigurationFacade).getTarget();
918+
wrapper = (Wrapper)((IFacade)jpaConfigurationFacade).getTarget();
919+
jpaConfigurationTarget = (JpaConfiguration)wrapper.getWrappedObject();
912920
}
913921

914922
}

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_5/ICriteriaTest.java

+17-18
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
import java.util.Set;
1919

2020
import org.hibernate.cfg.AvailableSettings;
21-
import org.hibernate.tool.orm.jbt.util.MockConnectionProvider;
22-
import org.hibernate.tool.orm.jbt.util.MockDialect;
23-
import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
21+
import org.hibernate.query.Query;
22+
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
23+
import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
24+
import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
25+
import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
2426
import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
2527
import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
2628
import org.jboss.tools.hibernate.runtime.spi.IConfiguration;
@@ -31,8 +33,6 @@
3133
import org.junit.jupiter.api.Test;
3234
import org.junit.jupiter.api.io.TempDir;
3335

34-
import jakarta.persistence.Query;
35-
3636
public class ICriteriaTest {
3737

3838
private static final String TEST_CFG_XML_STRING =
@@ -63,7 +63,8 @@ static class Foo {
6363
public File tempDir;
6464

6565
private ICriteria criteriaFacade = null;
66-
private Query criteriaTarget = null;
66+
private Wrapper criteriaWrapper = null;
67+
private Query<?> criteriaTarget = null;
6768

6869
@BeforeEach
6970
public void beforeEach() throws Exception {
@@ -84,7 +85,8 @@ public void beforeEach() throws Exception {
8485
ISessionFactory sessionFactoryFacade = configuration.buildSessionFactory();
8586
ISession sessionFacade = sessionFactoryFacade.openSession();
8687
criteriaFacade = sessionFacade.createCriteria(Foo.class);
87-
criteriaTarget = (Query)((IFacade)criteriaFacade).getTarget();
88+
criteriaWrapper = (Wrapper)((IFacade)criteriaFacade).getTarget();
89+
criteriaTarget = (Query<?>)criteriaWrapper.getWrappedObject();
8890
}
8991

9092
@Test
@@ -103,25 +105,22 @@ public void testSetMaxResults() {
103105
@Test
104106
public void testList() throws Exception {
105107
final List<String> list = Arrays.asList("foo", "bar");
106-
Class<?> criteriaExtensionClass = Class.forName(
107-
"org.hibernate.tool.orm.jbt.wrp.CriteriaWrapperFactory$CriteriaExtension");
108-
Query query = (Query)Proxy.newProxyInstance(
108+
Query<?> query = (Query<?>)Proxy.newProxyInstance(
109109
getClass().getClassLoader(),
110-
new Class[] { criteriaExtensionClass },
110+
new Class[] { Query.class },
111111
new InvocationHandler() {
112112
@Override
113113
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
114-
if ("getResultList".equals(method.getName())) {
114+
if ("list".equals(method.getName())) {
115115
return list;
116116
}
117117
return null;
118118
}
119-
});
120-
InvocationHandler invocationHandler = Proxy.getInvocationHandler(criteriaTarget);
121-
Field targetField = invocationHandler.getClass().getDeclaredField("target");
122-
targetField.setAccessible(true);
123-
targetField.set(invocationHandler, query);
124-
List<?> l1 = criteriaTarget.getResultList();
119+
});
120+
Field queryField = criteriaWrapper.getClass().getDeclaredField("query");
121+
queryField.setAccessible(true);
122+
queryField.set(criteriaWrapper, query);
123+
List<?> l1 = query.list();
125124
assertSame(l1, list);
126125
List<?> l2 = criteriaFacade.list();
127126
assertSame(l1, l2);

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_5/IEnvironmentTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import static org.junit.jupiter.api.Assertions.assertSame;
66

77
import org.hibernate.cfg.Environment;
8-
import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
8+
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
99
import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
1010
import org.jboss.tools.hibernate.runtime.spi.IEnvironment;
1111
import org.junit.jupiter.api.BeforeEach;

0 commit comments

Comments
 (0)