HHH-18384 @JoinColumnsOrFormulas broken

[cigaly]

See Jira issue HHH-18384

In org.hibernate.boot.model.internal.PropertyBinder#addPropertyelement annotated with @Id should be added before not annotated elements, but after previously added annotated elements

Additionally, preserving hierarchy order.

---

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.

---

[mbladel]

Thanks @cigaly! This change looks reasonable to me, just left a couple nitpicks and a comment - if you could please check it would be great.

[gavinking]

Unless I'm misunderstanding the test for this is using .hbm.xml, but the issue also affects annotations.

Should we add a test that uses annotations?

[cigaly]

It seems that already existing test using annotations:

	@Test
	@DomainModel( annotatedClasses = {Address.class, Contact.class} )
	void testAnnotations(DomainModelScope domainModelScope) {
		verifyMapping( domainModelScope );
	}

[mbladel]

LGTM, but let's hear from @sebersole who created the Jira since he assigned it to himself before merging.

[gavinking]

It seems that already existing test using annotations

OK, so I was misunderstanding. Thanks.

[gavinking]

What's the hold-up on this one? Can we just merge it?

[mbladel]

Was waiting to hear from @sebersole since he had the issue assigned before this PR was created.

[gavinking]

OK but that was two weeks ago. So can we just go ahead?

[mbladel]

Done, I'll also backport it to 6.6. Thanks @cigaly!

[gavinking]

Perfect thank you!!