Skip to content

delete obsolete instance variables in Collection, Join, and PersistentClass #10857

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.

Sign up for GitHub

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
merged 1 commit into from
Sep 2, 2025
+0 −28
Merged

delete obsolete instance variables in Collection, Join, and PersistentClass #10857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,12 @@ public abstract sealed class Collection

private String customSQLInsert;
private boolean customInsertCallable;
private ExecuteUpdateResultCheckStyle insertCheckStyle;
private String customSQLUpdate;
private boolean customUpdateCallable;
private ExecuteUpdateResultCheckStyle updateCheckStyle;
private String customSQLDelete;
private boolean customDeleteCallable;
private ExecuteUpdateResultCheckStyle deleteCheckStyle;
private String customSQLDeleteAll;
private boolean customDeleteAllCallable;
private ExecuteUpdateResultCheckStyle deleteAllCheckStyle;

private Column softDeleteColumn;
private SoftDeleteType softDeleteStrategy;
Expand Down Expand Up @@ -171,16 +167,12 @@ protected Collection(Collection original) {
this.synchronizedTables.addAll( original.synchronizedTables );
this.customSQLInsert = original.customSQLInsert;
this.customInsertCallable = original.customInsertCallable;
this.insertCheckStyle = original.insertCheckStyle;
this.customSQLUpdate = original.customSQLUpdate;
this.customUpdateCallable = original.customUpdateCallable;
this.updateCheckStyle = original.updateCheckStyle;
this.customSQLDelete = original.customSQLDelete;
this.customDeleteCallable = original.customDeleteCallable;
this.deleteCheckStyle = original.deleteCheckStyle;
this.customSQLDeleteAll = original.customSQLDeleteAll;
this.customDeleteAllCallable = original.customDeleteAllCallable;
this.deleteAllCheckStyle = original.deleteAllCheckStyle;
this.insertExpectation = original.insertExpectation;
this.updateExpectation = original.updateExpectation;
this.deleteExpectation = original.deleteExpectation;
Expand Down Expand Up @@ -602,7 +594,6 @@ public void setQueryCacheLayout(CacheLayout queryCacheLayout) {
public void setCustomSQLInsert(String customSQLInsert, boolean callable, ExecuteUpdateResultCheckStyle checkStyle) {
this.customSQLInsert = customSQLInsert;
this.customInsertCallable = callable;
this.insertCheckStyle = checkStyle;
this.insertExpectation = expectationConstructor( checkStyle );
}

Expand All @@ -617,7 +608,6 @@ public boolean isCustomInsertCallable() {
public void setCustomSQLUpdate(String customSQLUpdate, boolean callable, ExecuteUpdateResultCheckStyle checkStyle) {
this.customSQLUpdate = customSQLUpdate;
this.customUpdateCallable = callable;
this.updateCheckStyle = checkStyle;
this.updateExpectation = expectationConstructor( checkStyle );
}

Expand All @@ -632,7 +622,6 @@ public boolean isCustomUpdateCallable() {
public void setCustomSQLDelete(String customSQLDelete, boolean callable, ExecuteUpdateResultCheckStyle checkStyle) {
this.customSQLDelete = customSQLDelete;
this.customDeleteCallable = callable;
this.deleteCheckStyle = checkStyle;
this.deleteExpectation = expectationConstructor( checkStyle );
}

Expand All @@ -650,7 +639,6 @@ public void setCustomSQLDeleteAll(
ExecuteUpdateResultCheckStyle checkStyle) {
this.customSQLDeleteAll = customSQLDeleteAll;
this.customDeleteAllCallable = callable;
this.deleteAllCheckStyle = checkStyle;
this.deleteAllExpectation = expectationConstructor( checkStyle );
}

Expand All @@ -662,10 +650,6 @@ public boolean isCustomDeleteAllCallable() {
return customDeleteAllCallable;
}

public ExecuteUpdateResultCheckStyle getCustomSQLDeleteAllCheckStyle() {
return deleteAllCheckStyle;
}

@Override
public void addFilter(
String name,
Expand Down
6 changes: 0 additions & 6 deletions hibernate-core/src/main/java/org/hibernate/mapping/Join.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,10 @@ public class Join implements AttributeContainer, Serializable {
// Custom SQL
private String customSQLInsert;
private boolean customInsertCallable;
private ExecuteUpdateResultCheckStyle insertCheckStyle;
private String customSQLUpdate;
private boolean customUpdateCallable;
private ExecuteUpdateResultCheckStyle updateCheckStyle;
private String customSQLDelete;
private boolean customDeleteCallable;
private ExecuteUpdateResultCheckStyle deleteCheckStyle;

private Supplier<? extends Expectation> insertExpectation;
private Supplier<? extends Expectation> updateExpectation;
Expand Down Expand Up @@ -139,7 +136,6 @@ public int getPropertySpan() {
public void setCustomSQLInsert(String customSQLInsert, boolean callable, ExecuteUpdateResultCheckStyle checkStyle) {
this.customSQLInsert = customSQLInsert;
this.customInsertCallable = callable;
this.insertCheckStyle = checkStyle;
this.insertExpectation = expectationConstructor( checkStyle );
}

Expand All @@ -154,7 +150,6 @@ public boolean isCustomInsertCallable() {
public void setCustomSQLUpdate(String customSQLUpdate, boolean callable, ExecuteUpdateResultCheckStyle checkStyle) {
this.customSQLUpdate = customSQLUpdate;
this.customUpdateCallable = callable;
this.updateCheckStyle = checkStyle;
this.updateExpectation = expectationConstructor( checkStyle );
}

Expand All @@ -169,7 +164,6 @@ public boolean isCustomUpdateCallable() {
public void setCustomSQLDelete(String customSQLDelete, boolean callable, ExecuteUpdateResultCheckStyle checkStyle) {
this.customSQLDelete = customSQLDelete;
this.customDeleteCallable = callable;
this.deleteCheckStyle = checkStyle;
this.deleteExpectation = expectationConstructor( checkStyle );
}

Expand Down
6 changes: 0 additions & 6 deletions hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,10 @@ public abstract sealed class PersistentClass
// Custom SQL
private String customSQLInsert;
private boolean customInsertCallable;
private ExecuteUpdateResultCheckStyle insertCheckStyle;
private String customSQLUpdate;
private boolean customUpdateCallable;
private ExecuteUpdateResultCheckStyle updateCheckStyle;
private String customSQLDelete;
private boolean customDeleteCallable;
private ExecuteUpdateResultCheckStyle deleteCheckStyle;

private MappedSuperclass superMappedSuperclass;
private Component declaredIdentifierMapper;
Expand Down Expand Up @@ -767,7 +764,6 @@ public List<Property> getUnjoinedProperties() {
public void setCustomSQLInsert(String customSQLInsert, boolean callable, ExecuteUpdateResultCheckStyle checkStyle) {
this.customSQLInsert = customSQLInsert;
this.customInsertCallable = callable;
this.insertCheckStyle = checkStyle;
this.insertExpectation = expectationConstructor( checkStyle );
}

Expand All @@ -782,7 +778,6 @@ public boolean isCustomInsertCallable() {
public void setCustomSQLUpdate(String customSQLUpdate, boolean callable, ExecuteUpdateResultCheckStyle checkStyle) {
this.customSQLUpdate = customSQLUpdate;
this.customUpdateCallable = callable;
this.updateCheckStyle = checkStyle;
this.updateExpectation = expectationConstructor( checkStyle );
}

Expand All @@ -797,7 +792,6 @@ public boolean isCustomUpdateCallable() {
public void setCustomSQLDelete(String customSQLDelete, boolean callable, ExecuteUpdateResultCheckStyle checkStyle) {
this.customSQLDelete = customSQLDelete;
this.customDeleteCallable = callable;
this.deleteCheckStyle = checkStyle;
this.deleteExpectation = expectationConstructor( checkStyle );
}

Expand Down