Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove deprecated operations of LockOptions

This commit is contained in:
Gavin King 2024-12-12 23:57:38 +01:00
parent 9823fccfe8
commit 2a03f97b73
1 changed files with 18 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
hibernate-core/src/main/java/org/hibernate/LockOptions.java
View File

@ -18,6 +18,7 @@ import jakarta.persistence.RefreshOption;
import org.hibernate.query.Query;
import org.hibernate.query.spi.QueryOptions;
import static jakarta.persistence.PessimisticLockScope.NORMAL;
import static java.util.Collections.emptySet;
import static java.util.Collections.unmodifiableSet;
@ -138,7 +139,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
private final boolean immutable;
private LockMode lockMode;
private int timeout;
private boolean extendedScope;
private PessimisticLockScope pessimisticLockScope;
private Boolean followOnLocking;
private Map<String, LockMode> aliasSpecificLockModes;
@ -150,6 +151,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
immutable = false;
lockMode = LockMode.NONE;
timeout = WAIT_FOREVER;
pessimisticLockScope = NORMAL;
}
/**
@ -162,6 +164,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
immutable = false;
this.lockMode = lockMode;
timeout = WAIT_FOREVER;
pessimisticLockScope = NORMAL;
}
/**
@ -175,6 +178,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
immutable = false;
this.lockMode = lockMode;
this.timeout = timeout;
pessimisticLockScope = NORMAL;
}
/**
@ -189,7 +193,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
immutable = false;
this.lockMode = lockMode;
this.timeout = timeout;
this.extendedScope = scope == PessimisticLockScope.EXTENDED;
this.pessimisticLockScope = scope;
}
/**
@ -199,6 +203,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
this.immutable = immutable;
this.lockMode = lockMode;
timeout = WAIT_FOREVER;
pessimisticLockScope = NORMAL;
}
/**
* Determine of the lock options are empty.
@ -210,7 +215,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
return lockMode == LockMode.NONE
&& timeout == WAIT_FOREVER
&& followOnLocking == null
&& !extendedScope
&& pessimisticLockScope == NORMAL
&& !hasAliasSpecificLockModes();
}
@ -232,7 +237,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
*/
public LockOptions setLockMode(LockMode lockMode) {
if ( immutable ) {
throw new UnsupportedOperationException("immutable global instance of LockMode");
throw new UnsupportedOperationException("immutable global instance of LockOptions");
}
this.lockMode = lockMode;
return this;
@ -249,7 +254,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
*/
public LockOptions setAliasSpecificLockMode(String alias, LockMode lockMode) {
if ( immutable ) {
throw new UnsupportedOperationException("immutable global instance of LockMode");
throw new UnsupportedOperationException("immutable global instance of LockOptions");
}
if ( aliasSpecificLockModes == null ) {
aliasSpecificLockModes = new LinkedHashMap<>();
@ -413,7 +418,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
* @return the current {@link PessimisticLockScope}
*/
public PessimisticLockScope getLockScope() {
return extendedScope ? PessimisticLockScope.EXTENDED : PessimisticLockScope.NORMAL;
return pessimisticLockScope;
}
/**
@ -430,49 +435,9 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
*/
public LockOptions setLockScope(PessimisticLockScope scope) {
if ( immutable ) {
throw new UnsupportedOperationException("immutable global instance of LockMode");
throw new UnsupportedOperationException("immutable global instance of LockOptions");
}
return setScope(scope==PessimisticLockScope.EXTENDED);
}
/**
* The current lock scope setting:
* <ul>
* <li>{@code true} means the lock extends to rows of owned
* collections, but
* <li>{@code false} means only the entity table and secondary
* tables are locked.
* </ul>
*
* @return {@code true} if the lock extends to owned associations
*
* @deprecated use {@link #getLockScope()}
*/
@Deprecated(since = "6.2", forRemoval = true)
public boolean getScope() {
return extendedScope;
}
/**
* Set the lock scope setting:
* <ul>
* <li>{@code true} means the lock extends to rows of owned
* collections, but
* <li>{@code false} means only the entity table and secondary
* tables are locked.
* </ul>
*
* @param scope the new scope setting
* @return {@code this} for method chaining
*
* @deprecated use {@link #setLockScope(PessimisticLockScope)}
*/
@Deprecated(since = "6.2", forRemoval = true)
public LockOptions setScope(boolean scope) {
if ( immutable ) {
throw new UnsupportedOperationException("immutable global instance of LockMode");
}
this.extendedScope = scope;
pessimisticLockScope = scope;
return this;
}
@ -505,7 +470,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
*/
public LockOptions setFollowOnLocking(Boolean followOnLocking) {
if ( immutable ) {
throw new UnsupportedOperationException("immutable global instance of LockMode");
throw new UnsupportedOperationException("immutable global instance of LockOptions");
}
this.followOnLocking = followOnLocking;
return this;
@ -544,7 +509,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
*/
public void overlay(LockOptions lockOptions) {
setLockMode( lockOptions.getLockMode() );
setScope( lockOptions.getScope() );
setLockScope( lockOptions.getLockScope() );
setTimeOut( lockOptions.getTimeOut() );
if ( lockOptions.aliasSpecificLockModes != null ) {
lockOptions.aliasSpecificLockModes.forEach(this::setAliasSpecificLockMode);
@ -563,7 +528,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
*/
public static LockOptions copy(LockOptions source, LockOptions destination) {
destination.setLockMode( source.getLockMode() );
destination.setScope( source.getScope() );
destination.setLockScope( source.getLockScope() );
destination.setTimeOut( source.getTimeOut() );
if ( source.aliasSpecificLockModes != null ) {
destination.aliasSpecificLockModes = new HashMap<>( source.aliasSpecificLockModes );
@ -582,7 +547,7 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
}
else {
return timeout == that.timeout
&& extendedScope == that.extendedScope
&& pessimisticLockScope == that.pessimisticLockScope
&& lockMode == that.lockMode
&& Objects.equals( aliasSpecificLockModes, that.aliasSpecificLockModes )
&& Objects.equals( followOnLocking, that.followOnLocking );
@ -591,6 +556,6 @@ public class LockOptions implements FindOption, RefreshOption, Serializable {
@Override
public int hashCode() {
return Objects.hash( lockMode, timeout, aliasSpecificLockModes, followOnLocking, extendedScope);
return Objects.hash( lockMode, timeout, aliasSpecificLockModes, followOnLocking, pessimisticLockScope );
}
}