HHH-19324 - Switch tests using hbm.xml to use mapping.xml #9956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

sebersole merged 1 commit into hibernate:main from sebersole:drop-hbm

May 2, 2025

Member

sebersole commented Apr 3, 2025 •

edited by hibernate-github-bot bot

Loading

HHH-19324 - Switch tests using hbm.xml to use mapping.xml
HHH-19310 - Simplified declaration of type for basic mappings in XML

This is preliminary work which is converting tests using hbm.xml mappings to instead use mapping.xml and addressing gaps. Ultimately this PR will get merged into main (7.x).

Once all tests have been converted and gaps addressed (which just might mean Jira created for thre moment), we can start actually removing the code for applying hbm.xml - though that will be 8.x specific

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

https://hibernate.atlassian.net/browse/HHH-19324

github-advanced-security bot found potential problems

View reviewed changes

hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/DynamicModelHelper.java Fixed Show fixed Hide fixed

hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/DynamicModelHelper.java Fixed Show fixed Hide fixed

hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/DynamicModelHelper.java Fixed Show fixed Hide fixed

sebersole force-pushed the drop-hbm branch from 37a1655 to f16363b Compare

April 7, 2025 18:47

sebersole changed the title ~~HHH-17503 - Remove support for hbm.xml mappings~~ HHH-19324 - Switch tests using hbm.xml to use mapping.xml

sebersole force-pushed the drop-hbm branch from db5ef44 to 5a69197 Compare

April 25, 2025 17:00

github-advanced-security bot found potential problems

View reviewed changes

...e/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicTests.java

+              	@Test
+              	public void testFullQueryReference(SessionFactoryScope scope) {
+              		scope.inTransaction(
+              				session -> session.createQuery( "from DynamicCompositeIdBasic e where e.id.key1 = 1" ).list()

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

...e/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicTests.java

+              	@Test
+              	public void testEmbeddedQueryReference(SessionFactoryScope scope) {
+              		scope.inTransaction(
+              				session -> session.createQuery( "from DynamicCompositeIdBasic e where e.key1 = 1" ).list()

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

...m/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneTests.java

+              	public void testFullQueryReference(SessionFactoryScope scope) {
+              		scope.inTransaction(
+              				(session) -> {
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

...m/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneTests.java

+              		scope.inTransaction(
+              				(session) -> {
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e" ).list();
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e where e.id.key1 = 1" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

...m/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneTests.java

+              				(session) -> {
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e" ).list();
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e where e.id.key1 = 1" ).list();
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e where e.id.key2.name = 'abc'" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

...m/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneTests.java

+              	public void testEmbeddedQueryReference(SessionFactoryScope scope) {
+              		scope.inTransaction(
+              				(session) -> {
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

...m/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneTests.java

+              		scope.inTransaction(
+              				(session) -> {
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e" ).list();
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e where e.key1 = 1" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

...m/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneTests.java

+              				(session) -> {
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e" ).list();
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e where e.key1 = 1" ).list();
+              					session.createQuery( "select e from DynamicCompositeIdManyToOne e where e.key2.name = 'abc'" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

github-advanced-security bot found potential problems

View reviewed changes

.../java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicXmlTests.java

+              	@Test
+              	public void testUsage(SessionFactoryScope factoryScope) {
+              		factoryScope.inTransaction( (session) -> {
+              			session.createQuery( "from SimpleDynamicEntity" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

.../java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicXmlTests.java

+              	public void testUsage(SessionFactoryScope factoryScope) {
+              		factoryScope.inTransaction( (session) -> {
+              			session.createQuery( "from SimpleDynamicEntity" ).list();
+              			session.createQuery( "select e from SimpleDynamicEntity e" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

.../java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicXmlTests.java

+              		factoryScope.inTransaction( (session) -> {
+              			session.createQuery( "from SimpleDynamicEntity" ).list();
+              			session.createQuery( "select e from SimpleDynamicEntity e" ).list();
+              			session.createQuery( "select e from SimpleDynamicEntity e where e.name = 'abc'" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

...c/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimplePojoXmlTests.java

+              	@Test
+              	void testUsage(SessionFactoryScope factoryScope) {
+              		factoryScope.inTransaction( (session) -> {
+              			session.createQuery( "from SimpleEntity" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

...c/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimplePojoXmlTests.java

+              	void testUsage(SessionFactoryScope factoryScope) {
+              		factoryScope.inTransaction( (session) -> {
+              			session.createQuery( "from SimpleEntity" ).list();
+              			session.createQuery( "select e from SimpleEntity e" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

...c/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimplePojoXmlTests.java

+              		factoryScope.inTransaction( (session) -> {
+              			session.createQuery( "from SimpleEntity" ).list();
+              			session.createQuery( "select e from SimpleEntity e" ).list();
+              			session.createQuery( "select e from SimpleEntity e where e.name = 'abc'" ).list();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

github-advanced-security bot found potential problems

View reviewed changes

hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java

    
              		factoryScope.inTransaction( (session) -> {

              			session.setCacheMode( CacheMode.IGNORE );

              			int i = 0;

              			try (ScrollableResults sr = session.createQuery( "from DataPoint dp order by dp.x asc" )

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java

    
              				if ( ++i % nBeforeFlush == 0 ) {

              					s.flush();

              					s.clear();

              			try (ScrollableResults sr = session.createQuery( "from DataPoint dp order by dp.x asc" )

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createQuery

should be avoided because it has been deprecated.

sebersole force-pushed the drop-hbm branch 3 times, most recently from 5ecc0f3 to a657c4c Compare

May 1, 2025 16:48

sebersole marked this pull request as ready for review

May 1, 2025 16:48

Member Author

sebersole commented May 1, 2025

Some initial work on converting hbm.xml mappings in tests to mapping.xml.

Additionally addresses the following, which were discovered during this process.

https://hibernate.atlassian.net/browse/HHH-19310 - Simplified declaration of type for basic mappings in XML
https://hibernate.atlassian.net/browse/HHH-19422 - Introduce @CollectionIdJavaClass


          HHH-19324 - Switch tests using hbm.xml to use mapping.xml

d656b3f

HHH-19310 - Simplified declaration of type for basic mappings in XML
HHH-19422 - Introduce @CollectionIdJavaClass

sebersole force-pushed the drop-hbm branch from a657c4c to d656b3f Compare

May 2, 2025 13:25

sebersole merged commit 6fb622c into hibernate:main

23 of 25 checks passed

sebersole deleted the drop-hbm branch

May 2, 2025 14:45

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet