-
Notifications
You must be signed in to change notification settings - Fork 3.6k
HHH-19495 Remove the default "true" from optimistic-lock in the mapping xsd #10295
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.
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
Merged
yrodiere
merged 2 commits into
hibernate:main
from
marko-bekhta:fix/HHH-19495-remove-default-optisitc-locking-from-orm-mapping
Jun 10, 2025
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/BaseShop.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * Copyright Red Hat Inc. and Hibernate Authors | ||
| */ | ||
| package org.hibernate.orm.test.jpa.xml; | ||
|
|
||
|
|
||
|
|
||
| public class BaseShop { | ||
|
|
||
| private int id; | ||
|
|
||
| private int version; | ||
|
|
||
| public int getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(int id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public int getVersion() { | ||
| return version; | ||
| } | ||
|
|
||
| public void setVersion(int version) { | ||
| this.version = version; | ||
| } | ||
| } |
45 changes: 45 additions & 0 deletions
45
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Consumer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * Copyright Red Hat Inc. and Hibernate Authors | ||
| */ | ||
| package org.hibernate.orm.test.jpa.xml; | ||
|
|
||
| import jakarta.persistence.Id; | ||
| import jakarta.persistence.Version; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class Consumer { | ||
|
|
||
| @Id | ||
| private int id; | ||
|
|
||
| private List<ConsumerItem> consumerItems; | ||
|
|
||
| @Version | ||
| private int version; | ||
|
|
||
| public int getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(int id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public List<ConsumerItem> getConsumerItems() { | ||
| return consumerItems; | ||
| } | ||
|
|
||
| public void setConsumerItems(List<ConsumerItem> consumerItems) { | ||
| this.consumerItems = consumerItems; | ||
| } | ||
|
|
||
| public int getVersion() { | ||
| return version; | ||
| } | ||
|
|
||
| public void setVersion(int version) { | ||
| this.version = version; | ||
| } | ||
| } | ||
41 changes: 41 additions & 0 deletions
41
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/ConsumerItem.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * Copyright Red Hat Inc. and Hibernate Authors | ||
| */ | ||
| package org.hibernate.orm.test.jpa.xml; | ||
|
|
||
| import jakarta.persistence.Version; | ||
|
|
||
| public class ConsumerItem { | ||
|
|
||
| private int id; | ||
|
|
||
| private Consumer consumer; | ||
|
|
||
| @Version | ||
| private int version; | ||
|
|
||
| public int getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(int id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public Consumer getConsumer() { | ||
| return consumer; | ||
| } | ||
|
|
||
| public void setConsumer(Consumer consumer) { | ||
| this.consumer = consumer; | ||
| } | ||
|
|
||
| public int getVersion() { | ||
| return version; | ||
| } | ||
|
|
||
| public void setVersion(int version) { | ||
| this.version = version; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.