Skip to content

Commit 43bcf10

Browse files
koentsjekoentsje
committed
JBIDE-29214: Update hibernate tools dependency of org.jboss.tools.hibernate.orm.runtime.v_7_0 to version 7.0.0.Alpha3
Signed-off-by: Koen Aers <koen.aers@gmail.com>
1 parent 8d42621 commit 43bcf10

File tree

8 files changed

+45
-53
lines changed

8 files changed

+45
-53
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ Require-Bundle: org.jboss.tools.hibernate.orm.runtime.common,
1818
Bundle-Localization: plugin
1919
Bundle-RequiredExecutionEnvironment: JavaSE-17
2020
Bundle-ClassPath: .,
21-
lib/hibernate-ant-7.0.0.Alpha2.jar,
22-
lib/hibernate-core-7.0.0.Alpha2.jar,
23-
lib/hibernate-tools-orm-7.0.0.Alpha2.jar,
24-
lib/hibernate-tools-orm-jbt-7.0.0.Alpha2.jar,
25-
lib/hibernate-tools-utils-7.0.0.Alpha2.jar,
26-
lib/hibernate-models-0.8.3.jar,
21+
lib/hibernate-ant-7.0.0.Alpha3.jar,
22+
lib/hibernate-core-7.0.0.Alpha3.jar,
23+
lib/hibernate-tools-orm-7.0.0.Alpha3.jar,
24+
lib/hibernate-tools-orm-jbt-7.0.0.Alpha3.jar,
25+
lib/hibernate-tools-utils-7.0.0.Alpha3.jar,
26+
lib/hibernate-models-0.8.5.jar,
2727
lib/byte-buddy-1.14.15.jar,
2828
lib/jakarta.persistence-api-3.2.0.jar

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<packaging>eclipse-plugin</packaging>
1313

1414
<properties>
15-
<hibernate.version>7.0.0.Alpha2</hibernate.version>
16-
<hibernate.models.version>0.8.3</hibernate.models.version>
15+
<hibernate.version>7.0.0.Alpha3</hibernate.version>
16+
<hibernate.models.version>0.8.5</hibernate.models.version>
1717
<bytebuddy.version>1.14.15</bytebuddy.version>
1818
<jakarta-persistence-api.version>3.2.0</jakarta-persistence-api.version>
1919
</properties>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import org.hibernate.boot.Metadata;
3030
import org.hibernate.boot.MetadataSources;
3131
import org.hibernate.boot.jaxb.spi.Binding;
32+
import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
33+
import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl;
3234
import org.hibernate.cfg.AvailableSettings;
33-
import org.hibernate.cfg.DefaultNamingStrategy;
34-
import org.hibernate.cfg.NamingStrategy;
3535
import org.hibernate.mapping.PersistentClass;
3636
import org.hibernate.tool.api.reveng.RevengStrategy;
3737
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
@@ -269,11 +269,11 @@ public void testSetEntityResolver() throws Exception {
269269
public void testSetNamingStrategy() throws Exception {
270270
INamingStrategy namingStrategyFacade = (INamingStrategy)GenericFacadeFactory.createFacade(
271271
INamingStrategy.class,
272-
WrapperFactory.createNamingStrategyWrapper(DefaultNamingStrategy.class.getName()));
272+
WrapperFactory.createNamingStrategyWrapper(ImplicitNamingStrategyJpaCompliantImpl.class.getName()));
273273
// For native configuration
274274
Field namingStrategyField = nativeConfigurationTarget.getClass().getDeclaredField("namingStrategy");
275275
namingStrategyField.setAccessible(true);
276-
NamingStrategy namingStrategyTarget = (NamingStrategy)((Wrapper)((IFacade)namingStrategyFacade).getTarget()).getWrappedObject();
276+
ImplicitNamingStrategy namingStrategyTarget = (ImplicitNamingStrategy)((Wrapper)((IFacade)namingStrategyFacade).getTarget()).getWrappedObject();
277277
assertNull(namingStrategyField.get(nativeConfigurationTarget));
278278
nativeConfigurationFacade.setNamingStrategy(namingStrategyFacade);
279279
assertNotNull(namingStrategyField.get(nativeConfigurationTarget));
@@ -772,7 +772,7 @@ public void testGetClassMapping() throws Exception {
772772
@Test
773773
public void testGetNamingStrategy() {
774774
// For native configuration
775-
NamingStrategy namingStrategy = new DefaultNamingStrategy();
775+
ImplicitNamingStrategy namingStrategy = new ImplicitNamingStrategyJpaCompliantImpl();
776776
assertNull(nativeConfigurationFacade.getNamingStrategy());
777777
nativeConfigurationTarget.setNamingStrategy(namingStrategy);
778778
INamingStrategy namingStrategyFacade = nativeConfigurationFacade.getNamingStrategy();

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void testGetTransactionManagerStrategy() {
3434

3535
@Test
3636
public void testGetDriver() {
37-
assertEquals("hibernate.connection.driver_class", environmentFacade.getDriver());
37+
assertEquals("jakarta.persistence.jdbc.driver", environmentFacade.getDriver());
3838
}
3939

4040
@Test
@@ -49,7 +49,7 @@ public void testGetDialect() {
4949

5050
@Test
5151
public void testGetDataSource() {
52-
assertEquals("hibernate.connection.datasource", environmentFacade.getDataSource());
52+
assertEquals("jakarta.persistence.jtaDataSource", environmentFacade.getDataSource());
5353
}
5454

5555
@Test
@@ -59,17 +59,17 @@ public void testGetConnectionProvider() {
5959

6060
@Test
6161
public void testGetURL() {
62-
assertEquals("hibernate.connection.url", environmentFacade.getURL());
62+
assertEquals("jakarta.persistence.jdbc.url", environmentFacade.getURL());
6363
}
6464

6565
@Test
6666
public void testGetUser() {
67-
assertEquals("hibernate.connection.username", environmentFacade.getUser());
67+
assertEquals("jakarta.persistence.jdbc.user", environmentFacade.getUser());
6868
}
6969

7070
@Test
7171
public void testGetPass() {
72-
assertEquals("hibernate.connection.password", environmentFacade.getPass());
72+
assertEquals("jakarta.persistence.jdbc.password", environmentFacade.getPass());
7373
}
7474

7575
@Test

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_7_0.test/src/org/jboss/tools/hibernate/orm/runtime/v_7_0/INamingStrategyTest.java‎

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

5-
import org.hibernate.cfg.DefaultNamingStrategy;
5+
import org.hibernate.boot.model.naming.Identifier;
6+
import org.hibernate.boot.model.naming.ImplicitBasicColumnNameSource;
7+
import org.hibernate.boot.model.naming.ImplicitCollectionTableNameSource;
8+
import org.hibernate.boot.model.naming.ImplicitEntityNameSource;
9+
import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl;
10+
import org.hibernate.boot.model.naming.ImplicitPrimaryKeyJoinColumnNameSource;
611
import org.hibernate.tool.orm.jbt.api.factory.WrapperFactory;
712
import org.jboss.tools.hibernate.orm.runtime.common.GenericFacadeFactory;
813
import org.jboss.tools.hibernate.runtime.spi.INamingStrategy;
@@ -38,7 +43,7 @@ public void testColumnName() {
3843

3944
@Test
4045
public void testPropertyToColumnName() {
41-
assertEquals("BarFooPropertyColumn", namingStrategyFacade.propertyToColumnName("bar"));
46+
assertEquals("FooBarColumnName", namingStrategyFacade.propertyToColumnName("bar"));
4247
}
4348

4449
@Test
@@ -53,45 +58,32 @@ public void testJoinKeyColumnName() {
5358

5459
@Test
5560
public void testClassToTableName() {
56-
assertEquals("FooBarClassTable", namingStrategyFacade.classToTableName("foobar"));
61+
assertEquals("BarFooTable", namingStrategyFacade.classToTableName("foobar"));
5762
}
5863

5964
@Test
6065
public void testGetStrategyClassName() {
6166
assertEquals(TestNamingStrategy.class.getName(), namingStrategyFacade.getStrategyClassName());
6267
}
6368

64-
public static class TestNamingStrategy extends DefaultNamingStrategy {
65-
private static final long serialVersionUID = 1L;
66-
@Override
67-
public String collectionTableName(
68-
String ownerEntity,
69-
String ownerEntityTable,
70-
String associatedEntity,
71-
String associatedEntityTable,
72-
String propertyName) {
73-
return "FooBarCollectionTableName";
74-
}
75-
@Override
76-
public String columnName(String columnName) {
77-
return "FooBarColumnName";
69+
@SuppressWarnings("serial")
70+
public static class TestNamingStrategy extends ImplicitNamingStrategyJpaCompliantImpl {
71+
@Override
72+
public Identifier determineCollectionTableName(ImplicitCollectionTableNameSource source) {
73+
return Identifier.toIdentifier("FooBarCollectionTableName");
7874
}
7975
@Override
80-
public String propertyToColumnName(String propertyName) {
81-
return "BarFooPropertyColumn";
76+
public Identifier determineBasicColumnName(ImplicitBasicColumnNameSource source) {
77+
return Identifier.toIdentifier("FooBarColumnName");
8278
}
8379
@Override
84-
public String tableName(String tableName) {
85-
return "BarFooTable";
80+
public Identifier determinePrimaryTableName(ImplicitEntityNameSource source) {
81+
return Identifier.toIdentifier("BarFooTable");
8682
}
8783
@Override
88-
public String joinKeyColumnName(String joinedColumn, String joinedTable) {
89-
return "FooBarJoinKeyColumnName";
90-
}
91-
@Override
92-
public String classToTableName(String className) {
93-
return "FooBarClassTable";
84+
public Identifier determinePrimaryKeyJoinColumnName(ImplicitPrimaryKeyJoinColumnNameSource source) {
85+
return Identifier.toIdentifier("FooBarJoinKeyColumnName");
9486
}
9587
}
96-
88+
9789
}

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_7_0.test/src/org/jboss/tools/hibernate/orm/runtime/v_7_0/ITypeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public void testIsComponentType() {
164164
component.setComponentClassName("java.lang.Object");
165165
IType componentTypeFacade = (IType)GenericFacadeFactory.createFacade(
166166
IType.class,
167-
TypeWrapperFactory.createTypeWrapper(new ComponentType(component, null, null)));
167+
TypeWrapperFactory.createTypeWrapper(new ComponentType(component, null)));
168168
assertTrue(componentTypeFacade.isComponentType());
169169
}
170170

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_7_0.test/src/org/jboss/tools/hibernate/orm/runtime/v_7_0/ServiceImplTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import java.util.List;
1515
import java.util.Properties;
1616

17+
import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
18+
import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl;
1719
import org.hibernate.cfg.AvailableSettings;
1820
import org.hibernate.cfg.Configuration;
19-
import org.hibernate.cfg.DefaultNamingStrategy;
2021
import org.hibernate.cfg.Environment;
21-
import org.hibernate.cfg.NamingStrategy;
2222
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
2323
import org.hibernate.mapping.Array;
2424
import org.hibernate.mapping.Bag;
@@ -231,15 +231,15 @@ public void testNewTypeFactory() {
231231

232232
@Test
233233
public void testNewNamingStrategy() {
234-
String strategyClassName = DefaultNamingStrategy.class.getName();
234+
String strategyClassName = ImplicitNamingStrategyJpaCompliantImpl.class.getName();
235235
INamingStrategy namingStrategy = service.newNamingStrategy(strategyClassName);
236236
assertNotNull(namingStrategy);
237237
Object target = ((IFacade)namingStrategy).getTarget();
238238
assertNotNull(target);
239239
assertTrue(target instanceof Wrapper);
240240
target = ((Wrapper)target).getWrappedObject();
241241
assertNotNull(target);
242-
assertTrue(NamingStrategy.class.isAssignableFrom(target.getClass()));
242+
assertTrue(ImplicitNamingStrategy.class.isAssignableFrom(target.getClass()));
243243
namingStrategy = null;
244244
assertNull(namingStrategy);
245245
try {

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_7_0.test/src/org/jboss/tools/hibernate/orm/runtime/v_7_0/VersionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ public class VersionTest {
1111

1212
@Test
1313
public void testCoreVersion() {
14-
assertEquals("7.0.0.Alpha2", org.hibernate.Version.getVersionString());
14+
assertEquals("7.0.0.Alpha3", org.hibernate.Version.getVersionString());
1515
}
1616

1717
@Test
1818
public void testToolsVersion() {
19-
assertEquals("7.0.0.Alpha2", org.hibernate.tool.api.version.Version.CURRENT_VERSION);
19+
assertEquals("7.0.0.Alpha3", org.hibernate.tool.api.version.Version.CURRENT_VERSION);
2020
}
2121

2222
@Test

0 commit comments

Comments
 (0)