HHH-10217 - ModelBinder fails to bind version property when generated="always"

(cherry picked from commit 56fae44)

Author: sebersole

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java

@@ -2476,46 +2476,23 @@ private void bindProperty(
 
 				// generated properties can *never* be insertable...
 				if ( property.isInsertable() ) {
-					if ( singularAttributeSource.isInsertable() == null ) {
-						// insertable simply because that is the user did not specify
-						// anything; just override it
-						property.setInsertable( false );
-					}
-					else {
-						// the user specifically supplied insert="true",
-						// which constitutes an illegal combo
-						throw new MappingException(
-								String.format(
-										Locale.ENGLISH,
-										"Cannot specify both insert=\"true\" and generated=\"%s\" for property %s",
-										generationTiming.name().toLowerCase(Locale.ROOT),
-										propertySource.getName()
-								),
-								mappingDocument.getOrigin()
-						);
-					}
+					log.debugf(
+							"Property [%s] specified %s generation, setting insertable to false : %s",
+							propertySource.getName(),
+							generationTiming.name(),
+							mappingDocument.getOrigin()
+					);
+					property.setInsertable( false );
 				}
 
 				// properties generated on update can never be updatable...
 				if ( property.isUpdateable() && generationTiming == GenerationTiming.ALWAYS ) {
-					if ( singularAttributeSource.isUpdatable() == null ) {
-						// updatable only because the user did not specify
-						// anything; just override it
-						property.setUpdateable( false );
-					}
-					else {
-						// the user specifically supplied update="true",
-						// which constitutes an illegal combo
-						throw new MappingException(
-								String.format(
-										Locale.ENGLISH,
-										"Cannot specify both update=\"true\" and generated=\"%s\" for property %s",
-										generationTiming.name().toLowerCase(Locale.ROOT),
-										propertySource.getName()
-								),
-								mappingDocument.getOrigin()
-						);
-					}
+					log.debugf(
+							"Property [%s] specified ALWAYS generation, setting updateable to false : %s",
+							propertySource.getName(),
+							mappingDocument.getOrigin()
+					);
+					property.setUpdateable( false );
 				}
 			}
 		}

…va/org/hibernate/test/hbm/IndexTest.java …/hibernate/test/hbm/index/IndexTest.javahibernate-core/src/test/java/org/hibernate/test/hbm/IndexTest.java renamed to hibernate-core/src/test/java/org/hibernate/test/hbm/index/IndexTest.java hibernate-core/src/test/java/org/hibernate/test/hbm/IndexTest.java renamed to hibernate-core/src/test/java/org/hibernate/test/hbm/index/IndexTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.hbm;
+package org.hibernate.test.hbm.index;
 
 import java.util.Collections;
 
@@ -18,7 +18,6 @@
 import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.hibernate.test.hbm.JournalingSchemaToolingTarget;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

…t/hbm/JournalingSchemaToolingTarget.java …index/JournalingSchemaToolingTarget.javahibernate-core/src/test/java/org/hibernate/test/hbm/JournalingSchemaToolingTarget.java renamed to hibernate-core/src/test/java/org/hibernate/test/hbm/index/JournalingSchemaToolingTarget.java hibernate-core/src/test/java/org/hibernate/test/hbm/JournalingSchemaToolingTarget.java renamed to hibernate-core/src/test/java/org/hibernate/test/hbm/index/JournalingSchemaToolingTarget.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.hbm;
+package org.hibernate.test.hbm.index;
 
 import java.util.ArrayList;
 import java.util.List;

…/java/org/hibernate/test/hbm/Person.java …org/hibernate/test/hbm/index/Person.javahibernate-core/src/test/java/org/hibernate/test/hbm/Person.java renamed to hibernate-core/src/test/java/org/hibernate/test/hbm/index/Person.java hibernate-core/src/test/java/org/hibernate/test/hbm/Person.java renamed to hibernate-core/src/test/java/org/hibernate/test/hbm/index/Person.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.hbm;
+package org.hibernate.test.hbm.index;
 
 public class Person {
 	private long id;

…/org/hibernate/test/hbm/PersonGroup.java …ibernate/test/hbm/index/PersonGroup.javahibernate-core/src/test/java/org/hibernate/test/hbm/PersonGroup.java renamed to hibernate-core/src/test/java/org/hibernate/test/hbm/index/PersonGroup.java hibernate-core/src/test/java/org/hibernate/test/hbm/PersonGroup.java renamed to hibernate-core/src/test/java/org/hibernate/test/hbm/index/PersonGroup.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.hbm;
+package org.hibernate.test.hbm.index;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/test/java/org/hibernate/test/hbm/version/GeneratedVersionBindingTest.java

@@ -0,0 +1,25 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.hbm.version;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.junit.Test;
+
+/**
+ * @author Steve Ebersole
+ */
+public class GeneratedVersionBindingTest extends BaseUnitTestCase {
+	@Test
+	public void testIt() {
+		final Metadata metadata = new MetadataSources()
+				.addResource("org/hibernate/test/hbm/version/Mappings.hbm.xml")
+				.buildMetadata();
+	}
+}

hibernate-core/src/test/java/org/hibernate/test/hbm/version/Order.java

@@ -0,0 +1,40 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.hbm.version;
+
+/**
+ * @author Steve Ebersole
+ */
+public class Order {
+	private Integer id;
+	private String referenceCode;
+	private byte[] rv;
+
+	public Integer getId() {
+		return this.id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getReferenceCode() {
+		return this.referenceCode;
+	}
+
+	public void setReferenceCode(String referenceCode) {
+		this.referenceCode = referenceCode;
+	}
+
+	public byte[] getRv() {
+		return this.rv;
+	}
+
+	public void setRv(byte[] rv) {
+		this.rv = rv;
+	}
+}

hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_manytoone.hbm.xml

@@ -9,7 +9,7 @@
         "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
-<hibernate-mapping package="org.hibernate.test.hbm">
+<hibernate-mapping package="org.hibernate.test.hbm.index">
 
     <class name="PersonGroup">
         <id name="id" type="long">

hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_property.hbm.xml

@@ -9,7 +9,7 @@
         "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
-<hibernate-mapping package="org.hibernate.test.hbm">
+<hibernate-mapping package="org.hibernate.test.hbm.index">
 
     <class name="Person">
         <id name="id" type="long">

hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_propertycolumn.hbm.xml

@@ -9,7 +9,7 @@
         "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
-<hibernate-mapping package="org.hibernate.test.hbm">
+<hibernate-mapping package="org.hibernate.test.hbm.index">
 
     <class name="Person">
         <id name="id" type="long">