From 8f6922960a61ae5a9caec762aa3744fd6b75ef46 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Tue, 2 Sep 2025 14:56:27 +1000 Subject: [PATCH] delete obsolete instance variables in Collection, Join, and PersistentClass --- .../java/org/hibernate/mapping/Collection.java | 16 ---------------- .../main/java/org/hibernate/mapping/Join.java | 6 ------ .../org/hibernate/mapping/PersistentClass.java | 6 ------ 3 files changed, 28 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java index 5831e511037d..cc9006a7604e 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java @@ -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; @@ -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; @@ -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 ); } @@ -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 ); } @@ -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 ); } @@ -650,7 +639,6 @@ public void setCustomSQLDeleteAll( ExecuteUpdateResultCheckStyle checkStyle) { this.customSQLDeleteAll = customSQLDeleteAll; this.customDeleteAllCallable = callable; - this.deleteAllCheckStyle = checkStyle; this.deleteAllExpectation = expectationConstructor( checkStyle ); } @@ -662,10 +650,6 @@ public boolean isCustomDeleteAllCallable() { return customDeleteAllCallable; } - public ExecuteUpdateResultCheckStyle getCustomSQLDeleteAllCheckStyle() { - return deleteAllCheckStyle; - } - @Override public void addFilter( String name, diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Join.java b/hibernate-core/src/main/java/org/hibernate/mapping/Join.java index 39e44b6f3fa9..f9f4a4df32b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Join.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Join.java @@ -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 insertExpectation; private Supplier updateExpectation; @@ -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 ); } @@ -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 ); } @@ -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 ); } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java index 51a31fc0bfb3..39f107d5b98d 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java @@ -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; @@ -767,7 +764,6 @@ public List getUnjoinedProperties() { public void setCustomSQLInsert(String customSQLInsert, boolean callable, ExecuteUpdateResultCheckStyle checkStyle) { this.customSQLInsert = customSQLInsert; this.customInsertCallable = callable; - this.insertCheckStyle = checkStyle; this.insertExpectation = expectationConstructor( checkStyle ); } @@ -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 ); } @@ -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 ); }