JBIDE-29224: Update hibernate tools dependency of org.jboss.tools.hib…

…ernate.orm.runtime.v_6_5 to version 6.5.3.Final

Signed-off-by: Koen Aers <[email protected]>

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

@@ -21,8 +21,8 @@ Require-Bundle: org.jboss.tools.hibernate.orm.runtime.common,
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ClassPath: .,
- lib/hibernate-ant-6.5.2.Final.jar,
- lib/hibernate-core-6.5.2.Final.jar,
- lib/hibernate-tools-orm-6.5.2.Final.jar,
- lib/hibernate-tools-orm-jbt-6.5.2.Final.jar,
- lib/hibernate-tools-utils-6.5.2.Final.jar
+ lib/hibernate-ant-6.5.3.Final.jar,
+ lib/hibernate-core-6.5.3.Final.jar,
+ lib/hibernate-tools-orm-6.5.3.Final.jar,
+ lib/hibernate-tools-orm-jbt-6.5.3.Final.jar,
+ lib/hibernate-tools-utils-6.5.3.Final.jar

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

@@ -12,7 +12,7 @@
  <packaging>eclipse-plugin</packaging>
 
  <properties>
- <hibernate.version>6.5.2.Final</hibernate.version>
+ <hibernate.version>6.5.3.Final</hibernate.version>
  </properties>
 
  <build>

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

@@ -21,8 +21,8 @@
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.tool.api.reveng.RevengStrategy;
 import org.hibernate.tool.internal.export.cfg.CfgExporter;
-import org.hibernate.tool.orm.jbt.util.JpaMappingFileHelper;
-import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
+import org.hibernate.tool.orm.jbt.internal.util.JpaMappingFileHelper;
 import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
 import org.jboss.tools.hibernate.orm.runtime.common.IDatabaseReader;
 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

@@ -14,8 +14,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
 import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
 import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
 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,8 +5,9 @@
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.RootClass;
-import org.hibernate.tool.orm.jbt.util.DummyMetadataBuildingContext;
-import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
+import org.hibernate.tool.orm.jbt.internal.util.DummyMetadataBuildingContext;
 import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
 import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
 import org.jboss.tools.hibernate.runtime.spi.ICfg2HbmTool;
@@ -39,7 +40,8 @@ public void testGetTagProperty() throws Exception {
  IProperty propertyFacade = (IProperty)GenericFacadeFactory.createFacade(
  IProperty.class, 
  WrapperFactory.createPropertyWrapper());
- Property propertyTarget = (Property)((IFacade)propertyFacade).getTarget();
+ Wrapper wrapper = (Wrapper)((IFacade)propertyFacade).getTarget();
+ Property propertyTarget = (Property)wrapper.getWrappedObject();
  RootClass rc = new RootClass(DummyMetadataBuildingContext.INSTANCE);
  BasicValue basicValue = new BasicValue(DummyMetadataBuildingContext.INSTANCE);
  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

@@ -15,10 +15,10 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.tool.orm.jbt.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
+import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.hibernate.type.CollectionType;
 import org.hibernate.type.Type;
 import org.hibernate.type.internal.NamedBasicTypeImpl;
@@ -85,7 +85,8 @@ public void beforeEach() throws Exception {
  configuration.configure(cfgXmlFile);
  sessionFactoryFacade = configuration.buildSessionFactory();
  classMetadataFacade = sessionFactoryFacade.getClassMetadata(Foo.class.getName());
- classMetadataTarget = (EntityPersister)((IFacade)classMetadataFacade).getTarget();
+ Wrapper wrapper = (Wrapper)((IFacade)classMetadataFacade).getTarget();
+ classMetadataTarget = (EntityPersister)wrapper.getWrappedObject();
  }
 
  @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

@@ -11,9 +11,10 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.tool.orm.jbt.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
-import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
+import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
 import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
 import org.jboss.tools.hibernate.runtime.spi.ICollectionMetadata;
@@ -75,7 +76,8 @@ public void beforeEach() throws Exception {
  configuration.configure(cfgXmlFile);
  sessionFactoryFacade = configuration.buildSessionFactory();
  collectionMetadataFacade = sessionFactoryFacade.getCollectionMetadata(Foo.class.getName() + ".bars");
- collectionMetadataTarget = (CollectionPersister)((IFacade)collectionMetadataFacade).getTarget();
+ Wrapper wrapper = (Wrapper)((IFacade)collectionMetadataFacade).getTarget();
+ collectionMetadataTarget = (CollectionPersister)wrapper.getWrappedObject();
  }
 
  @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

@@ -15,12 +15,11 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Value;
-import org.hibernate.tool.orm.jbt.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
-import org.hibernate.tool.orm.jbt.wrp.ColumnWrapper;
-import org.hibernate.tool.orm.jbt.wrp.DelegatingColumnWrapperImpl;
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.wrp.ColumnWrapper;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
+import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
 import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
@@ -40,7 +39,7 @@ public void beforeEach() throws Exception {
  columnFacade = (IColumn)GenericFacadeFactory.createFacade(
  IColumn.class, 
  WrapperFactory.createColumnWrapper(null));
- columnTarget = ((ColumnWrapper)((IFacade)columnFacade).getTarget()).getWrappedObject();
+ columnTarget = (Column)((ColumnWrapper)((IFacade)columnFacade).getTarget()).getWrappedObject();
  }
 
  @Test
@@ -73,7 +72,7 @@ public void testGetSqlType() {
  columnFacade = (IColumn)GenericFacadeFactory.createFacade(
  IColumn.class, 
  WrapperFactory.createColumnWrapper(null));
- columnTarget = ((ColumnWrapper)((IFacade)columnFacade).getTarget()).getWrappedObject();
+ columnTarget = (Column)((ColumnWrapper)((IFacade)columnFacade).getTarget()).getWrappedObject();
  columnTarget.setValue(createValue());
  IConfiguration configurationFacade = (IConfiguration)GenericFacadeFactory.createFacade(
  IConfiguration.class, 
@@ -92,7 +91,7 @@ public void testGetLength() {
 
  @Test
  public void testGetDefaultLength() throws Exception {
- Field defaultLengthField = DelegatingColumnWrapperImpl.class.getDeclaredField("DEFAULT_LENGTH");
+ Field defaultLengthField = ColumnWrapper.class.getDeclaredField("DEFAULT_LENGTH");
  defaultLengthField.setAccessible(true);
  assertEquals(defaultLengthField.get(null), columnFacade.getDefaultLength());
  }
@@ -106,7 +105,7 @@ public void testGetPrecision() {
 
  @Test
  public void testGetDefaultPrecision() throws Exception {
- Field defaultPrecisionField = DelegatingColumnWrapperImpl.class.getDeclaredField("DEFAULT_PRECISION");
+ Field defaultPrecisionField = ColumnWrapper.class.getDeclaredField("DEFAULT_PRECISION");
  defaultPrecisionField.setAccessible(true);
  assertEquals(defaultPrecisionField.get(null), columnFacade.getDefaultPrecision());
  }
@@ -120,7 +119,7 @@ public void testGetScale() {
 
  @Test
  public void testGetDefaultScale() throws Exception {
- Field defaultScaleField = DelegatingColumnWrapperImpl.class.getDeclaredField("DEFAULT_SCALE");
+ Field defaultScaleField = ColumnWrapper.class.getDeclaredField("DEFAULT_SCALE");
  defaultScaleField.setAccessible(true);
  assertEquals(defaultScaleField.get(null), columnFacade.getDefaultScale());
  }

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

@@ -34,13 +34,14 @@
 import org.hibernate.cfg.NamingStrategy;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.tool.api.reveng.RevengStrategy;
-import org.hibernate.tool.orm.jbt.util.JpaConfiguration;
-import org.hibernate.tool.orm.jbt.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;
-import org.hibernate.tool.orm.jbt.util.RevengConfiguration;
-import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
+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.internal.util.MockDialect;
+import org.hibernate.tool.orm.jbt.internal.util.NativeConfiguration;
+import org.hibernate.tool.orm.jbt.internal.util.RevengConfiguration;
 import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
 import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
 import org.jboss.tools.hibernate.runtime.spi.IConfiguration;
@@ -272,7 +273,7 @@ public void testSetNamingStrategy() throws Exception {
  // For native configuration
  Field namingStrategyField = nativeConfigurationTarget.getClass().getDeclaredField("namingStrategy");
  namingStrategyField.setAccessible(true);
- NamingStrategy namingStrategyTarget = (NamingStrategy)((IFacade)namingStrategyFacade).getTarget();
+ NamingStrategy namingStrategyTarget = (NamingStrategy)((Wrapper)((IFacade)namingStrategyFacade).getTarget()).getWrappedObject();
  assertNull(namingStrategyField.get(nativeConfigurationTarget));
  nativeConfigurationFacade.setNamingStrategy(namingStrategyFacade);
  assertNotNull(namingStrategyField.get(nativeConfigurationTarget));
@@ -555,6 +556,8 @@ public void testBuildSessionFactory() throws Throwable {
  assertNotNull(sessionFactoryFacade);
  Object sessionFactory = ((IFacade)sessionFactoryFacade).getTarget();
  assertNotNull(sessionFactory);
+ assertTrue(sessionFactory instanceof Wrapper);
+ sessionFactory = ((Wrapper)sessionFactory).getWrappedObject();
  assertTrue(sessionFactory instanceof SessionFactory);
  sessionFactoryFacade = null;
  assertNull(sessionFactoryFacade);
@@ -574,6 +577,8 @@ public void testBuildSessionFactory() throws Throwable {
  assertNotNull(sessionFactoryFacade);
  sessionFactory = ((IFacade)sessionFactoryFacade).getTarget();
  assertNotNull(sessionFactory);
+ assertTrue(sessionFactory instanceof Wrapper);
+ sessionFactory = ((Wrapper)sessionFactory).getWrappedObject();
  assertTrue(sessionFactory instanceof SessionFactory);
  }
 
@@ -660,7 +665,7 @@ public void testSetReverseEngineeringStrategy() {
  (IReverseEngineeringStrategy)GenericFacadeFactory.createFacade(
  IReverseEngineeringStrategy.class, 
  WrapperFactory.createRevengStrategyWrapper());
- RevengStrategy reverseEngineeringStrategy = (RevengStrategy)((IFacade)strategyFacade).getTarget();
+ RevengStrategy reverseEngineeringStrategy = (RevengStrategy)((Wrapper)((IFacade)strategyFacade).getTarget()).getWrappedObject();
  // For native configuration 
  try {
  nativeConfigurationFacade.setReverseEngineeringStrategy(strategyFacade);
@@ -772,7 +777,7 @@ public void testGetNamingStrategy() {
  nativeConfigurationTarget.setNamingStrategy(namingStrategy);
  INamingStrategy namingStrategyFacade = nativeConfigurationFacade.getNamingStrategy();
  assertNotNull(namingStrategyFacade);
- Object namingStrategyTarget = ((IFacade)namingStrategyFacade).getTarget();
+ Object namingStrategyTarget = ((Wrapper)((IFacade)namingStrategyFacade).getTarget()).getWrappedObject();
  assertSame(namingStrategyTarget, namingStrategy);
  // For reveng configuration 
  try {
@@ -898,17 +903,20 @@ private void initializeFacadesAndTargets() {
  nativeConfigurationFacade = (IConfiguration)GenericFacadeFactory.createFacade(
  IConfiguration.class, 
  WrapperFactory.createNativeConfigurationWrapper());
- nativeConfigurationTarget = (NativeConfiguration)((IFacade)nativeConfigurationFacade).getTarget();
+ Wrapper wrapper = (Wrapper)((IFacade)nativeConfigurationFacade).getTarget();
+ nativeConfigurationTarget = (NativeConfiguration)wrapper.getWrappedObject();
  nativeConfigurationTarget.setProperty(AvailableSettings.DIALECT, MockDialect.class.getName());
  nativeConfigurationTarget.setProperty(AvailableSettings.CONNECTION_PROVIDER, MockConnectionProvider.class.getName());
  revengConfigurationFacade = (IConfiguration)GenericFacadeFactory.createFacade(
  IConfiguration.class, 
  WrapperFactory.createRevengConfigurationWrapper());
- revengConfigurationTarget = (RevengConfiguration)((IFacade)revengConfigurationFacade).getTarget();
+ wrapper = (Wrapper)((IFacade)revengConfigurationFacade).getTarget();
+ revengConfigurationTarget = (RevengConfiguration)wrapper.getWrappedObject();
  jpaConfigurationFacade = (IConfiguration)GenericFacadeFactory.createFacade(
  IConfiguration.class, 
  WrapperFactory.createJpaConfigurationWrapper("foobar", null));
- jpaConfigurationTarget = (JpaConfiguration)((IFacade)jpaConfigurationFacade).getTarget(); 
+ wrapper = (Wrapper)((IFacade)jpaConfigurationFacade).getTarget();
+ jpaConfigurationTarget = (JpaConfiguration)wrapper.getWrappedObject(); 
  }
 
 }

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

@@ -18,9 +18,11 @@
 import java.util.Set;
 
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.tool.orm.jbt.util.MockConnectionProvider;
-import org.hibernate.tool.orm.jbt.util.MockDialect;
-import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
+import org.hibernate.query.Query;
+import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
+import org.hibernate.tool.orm.jbt.internal.util.MockConnectionProvider;
+import org.hibernate.tool.orm.jbt.internal.util.MockDialect;
 import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
 import org.jboss.tools.hibernate.orm.runtime.common.IFacade;
 import org.jboss.tools.hibernate.runtime.spi.IConfiguration;
@@ -31,8 +33,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import jakarta.persistence.Query;
-
 public class ICriteriaTest {
 
  private static final String TEST_CFG_XML_STRING =
@@ -63,7 +63,8 @@ static class Foo {
  public File tempDir;
 
  private ICriteria criteriaFacade = null;
- private Query criteriaTarget = null;
+ private Wrapper criteriaWrapper = null;
+ private Query<?> criteriaTarget = null;
 
  @BeforeEach
  public void beforeEach() throws Exception {
@@ -84,7 +85,8 @@ public void beforeEach() throws Exception {
  ISessionFactory sessionFactoryFacade = configuration.buildSessionFactory();
  ISession sessionFacade = sessionFactoryFacade.openSession();
  criteriaFacade = sessionFacade.createCriteria(Foo.class);
- criteriaTarget = (Query)((IFacade)criteriaFacade).getTarget();
+ criteriaWrapper = (Wrapper)((IFacade)criteriaFacade).getTarget();
+ criteriaTarget = (Query<?>)criteriaWrapper.getWrappedObject();
  }
 
  @Test
@@ -103,25 +105,22 @@ public void testSetMaxResults() {
  @Test
  public void testList() throws Exception {
  final List<String> list = Arrays.asList("foo", "bar");
- Class<?> criteriaExtensionClass = Class.forName(
- "org.hibernate.tool.orm.jbt.wrp.CriteriaWrapperFactory$CriteriaExtension");
- Query query = (Query)Proxy.newProxyInstance(
+ Query<?> query = (Query<?>)Proxy.newProxyInstance(
  getClass().getClassLoader(),
- new Class[] { criteriaExtensionClass }, 
+ new Class[] { Query.class }, 
  new InvocationHandler() { 
  @Override
  public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- if ("getResultList".equals(method.getName())) {
+ if ("list".equals(method.getName())) {
  return list;
  }
  return null;
  }
- });
- InvocationHandler invocationHandler = Proxy.getInvocationHandler(criteriaTarget);
- Field targetField = invocationHandler.getClass().getDeclaredField("target");
- targetField.setAccessible(true);
- targetField.set(invocationHandler, query);
- List<?> l1 = criteriaTarget.getResultList();
+ }); 
+ Field queryField = criteriaWrapper.getClass().getDeclaredField("query");
+ queryField.setAccessible(true);
+ queryField.set(criteriaWrapper, query);
+ List<?> l1 = query.list();
  assertSame(l1, list);
  List<?> l2 = criteriaFacade.list();
  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

@@ -5,7 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertSame;
 
 import org.hibernate.cfg.Environment;
-import org.hibernate.tool.orm.jbt.wrp.WrapperFactory;
+import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
 import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
 import org.jboss.tools.hibernate.runtime.spi.IEnvironment;
 import org.junit.jupiter.api.BeforeEach;