HHH-19495 Remove the default "true" from optimistic-lock

so that no extra annotations are added unless explicitly defined.

Author: marko-bekhta

hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLockableAttribute.java

@@ -10,6 +10,6 @@
  * @author Steve Ebersole
  */
 public interface JaxbLockableAttribute extends JaxbPersistentAttribute {
-	boolean isOptimisticLock();
+	Boolean isOptimisticLock();
 	void setOptimisticLock(Boolean value);
 }

hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonAttributeProcessing.java

@@ -84,12 +84,15 @@ public static void applyOptimisticLock(
 			JaxbLockableAttribute jaxbAttribute,
 			MutableMemberDetails memberDetails,
 			XmlDocumentContext xmlDocumentContext) {
-		final boolean includeInOptimisticLock = jaxbAttribute.isOptimisticLock();
-		final OptimisticLockAnnotation optLockAnn = (OptimisticLockAnnotation) memberDetails.applyAnnotationUsage(
-				HibernateAnnotations.OPTIMISTIC_LOCK,
-				xmlDocumentContext.getModelBuildingContext()
-		);
-		optLockAnn.excluded( !includeInOptimisticLock );
+		final Boolean includeInOptimisticLock = jaxbAttribute.isOptimisticLock();
+
+		if ( includeInOptimisticLock != null ) {
+			final OptimisticLockAnnotation optLockAnn = (OptimisticLockAnnotation) memberDetails.applyAnnotationUsage(
+					HibernateAnnotations.OPTIMISTIC_LOCK,
+					xmlDocumentContext.getModelBuildingContext()
+			);
+			optLockAnn.excluded( !includeInOptimisticLock );
+		}
 	}
 
 	public static void applyFetching(

hibernate-core/src/main/resources/org/hibernate/xsd/mapping/mapping-7.0.xsd

@@ -601,7 +601,7 @@
         <xsd:attribute name="access" type="orm:access-type"/>
         <!-- hbm: Hibernate's pluggable accessor spi -->
         <xsd:attribute name="attribute-accessor" type="xsd:string" />
-        <xsd:attribute name="optimistic-lock" type="xsd:boolean" default="true" />
+        <xsd:attribute name="optimistic-lock" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:group name="basic-type-group">
@@ -1027,7 +1027,7 @@
         <xsd:attribute name="fetch-mode" type="orm:plural-fetch-mode"/>
         <xsd:attribute name="access" type="orm:access-type"/>
         <xsd:attribute name="attribute-accessor" type="xsd:string" />
-        <xsd:attribute name="optimistic-lock" type="xsd:boolean" default="true" />
+        <xsd:attribute name="optimistic-lock" type="xsd:boolean" />
         <xsd:attribute name="classification" type="orm:limited-collection-classification-enum" />
     </xsd:complexType>
 
@@ -1109,7 +1109,7 @@
         <xsd:attribute name="name" type="xsd:string" use="required"/>
         <xsd:attribute name="access" type="orm:access-type"/>
         <xsd:attribute name="attribute-accessor" type="xsd:string" />
-        <xsd:attribute name="optimistic-lock" type="xsd:boolean" default="true" />
+        <xsd:attribute name="optimistic-lock" type="xsd:boolean" />
     </xsd:complexType>
 
     <!-- **************************************************** -->
@@ -1614,7 +1614,7 @@
         <xsd:attribute name="orphan-removal" type="xsd:boolean"/>
         <xsd:attribute name="classification" type="orm:limited-collection-classification-enum" />
         <xsd:attribute name="not-found" type="orm:not-found-enum"/>
-        <xsd:attribute name="optimistic-lock" type="xsd:boolean" default="true" />
+        <xsd:attribute name="optimistic-lock" type="xsd:boolean" />
     </xsd:complexType>
 
     <!-- **************************************************** -->
@@ -1661,7 +1661,7 @@
         <xsd:attribute name="optional" type="xsd:boolean"/>
         <xsd:attribute name="access" type="orm:access-type"/>
         <xsd:attribute name="attribute-accessor" type="xsd:string" />
-        <xsd:attribute name="optimistic-lock" type="xsd:boolean" default="true" />
+        <xsd:attribute name="optimistic-lock" type="xsd:boolean" />
         <xsd:attribute name="maps-id" type="xsd:string"/>
         <xsd:attribute name="id" type="xsd:boolean"/>
         <xsd:attribute name="not-found" type="orm:not-found-enum"/>
@@ -2057,7 +2057,7 @@
         <xsd:attribute name="orphan-removal" type="xsd:boolean"/>
         <xsd:attribute name="classification" type="orm:limited-collection-classification-enum" />
         <xsd:attribute name="not-found" type="orm:not-found-enum"/>
-        <xsd:attribute name="optimistic-lock" type="xsd:boolean" default="true" />
+        <xsd:attribute name="optimistic-lock" type="xsd:boolean" />
     </xsd:complexType>
 
     <!-- **************************************************** -->
@@ -2113,7 +2113,7 @@
         <xsd:attribute name="optional" type="xsd:boolean"/>
         <xsd:attribute name="access" type="orm:access-type"/>
         <xsd:attribute name="attribute-accessor" type="xsd:string" />
-        <xsd:attribute name="optimistic-lock" type="xsd:boolean" default="true" />
+        <xsd:attribute name="optimistic-lock" type="xsd:boolean" />
         <xsd:attribute name="mapped-by" type="xsd:string"/>
         <xsd:attribute name="orphan-removal" type="xsd:boolean"/>
         <xsd:attribute name="maps-id" type="xsd:string"/>
@@ -3139,7 +3139,7 @@
         <xsd:attribute name="fetch" type="orm:fetch-type"/>
         <xsd:attribute name="fetch-mode" type="orm:singular-fetch-mode"/>
         <xsd:attribute name="optional" type="xsd:boolean"/>
-        <xsd:attribute name="optimistic-lock" type="xsd:boolean" default="true" />
+        <xsd:attribute name="optimistic-lock" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:complexType name="any-discriminator">
@@ -3208,7 +3208,7 @@
         <xsd:attribute name="fetch-mode" type="orm:plural-fetch-mode"/>
         <xsd:attribute name="access" type="orm:access-type"/>
         <xsd:attribute name="attribute-accessor" type="xsd:string" />
-        <xsd:attribute name="optimistic-lock" type="xsd:boolean" default="true" />
+        <xsd:attribute name="optimistic-lock" type="xsd:boolean" />
         <xsd:attribute name="classification" type="orm:limited-collection-classification-enum" />
     </xsd:complexType>
 
@@ -3532,4 +3532,4 @@
         <xsd:attribute name="type" use="required" type="xsd:string"/>
     </xsd:complexType>
 
-</xsd:schema>
+</xsd:schema>