CAY-2897 Add no-op default implementations to the GraphChangeHandler interface

stariy95 · stariy95 · commit dcf85f7be490 · 2025-09-26T19:28:56.000+04:00
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -15,6 +15,7 @@ Changes/New Features:
 
 CAY-2884 Upgrade gradle to 8.13
 CAY-2893 Update velocity-engine-core dependency
+CAY-2897 Add no-op default implementations to the GraphChangeHandler interface
 
 Bug Fixes:
 
diff --git a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/DeletedDiffProcessor.java b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/DeletedDiffProcessor.java
@@ -27,7 +27,6 @@
 import org.apache.cayenne.commitlog.model.MutableChangeMap;
 import org.apache.cayenne.commitlog.model.MutableObjectChange;
 import org.apache.cayenne.commitlog.model.ObjectChangeType;
-import org.apache.cayenne.graph.ArcId;
 import org.apache.cayenne.graph.GraphChangeHandler;
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.query.ObjectIdQuery;
@@ -124,29 +123,4 @@ public boolean visitToMany(ToManyProperty property) {
 
 		});
 	}
-
-	@Override
-	public void nodeIdChanged(Object nodeId, Object newId) {
-		// do nothing
-	}
-
-	@Override
-	public void nodeCreated(Object nodeId) {
-		// do nothing
-	}
-
-	@Override
-	public void nodePropertyChanged(Object nodeId, String property, Object oldValue, Object newValue) {
-		// do nothing
-	}
-
-	@Override
-	public void arcCreated(Object nodeId, Object targetNodeId, ArcId arcId) {
-		// do nothing
-	}
-
-	@Override
-	public void arcDeleted(Object nodeId, Object targetNodeId, ArcId arcId) {
-		// do nothing
-	}
 }
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/DataChannelSyncCallbackAction.java b/cayenne-server/src/main/java/org/apache/cayenne/DataChannelSyncCallbackAction.java
@@ -143,10 +143,6 @@ public void arcDeleted(Object nodeId, Object targetNodeId, ArcId arcId) {
         nodeUpdated(nodeId);
     }
 
-    @Override
-    public void nodeIdChanged(Object nodeId, Object newId) {
-    }
-
     @Override
     public void nodePropertyChanged(
             Object nodeId,
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataContextMergeHandler.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataContextMergeHandler.java
@@ -149,11 +149,6 @@ public void nodeIdChanged(Object nodeId, Object newId) {
         context.getObjectStore().processIdChange(nodeId, newId);
     }
 
-    @Override
-    public void nodeCreated(Object nodeId) {
-        // noop
-    }
-
     @Override
     public void nodeRemoved(Object nodeId) {
         ObjectStore os = context.getObjectStore();
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java
@@ -240,13 +240,4 @@ public void nodeCreated(Object nodeId) {
         this.currentId = nodeId;
     }
 
-    @Override
-    public void nodeRemoved(Object nodeId) {
-        // noop
-    }
-
-    @Override
-    public void nodeIdChanged(Object nodeId, Object newId) {
-        // noop
-    }
 }
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java
@@ -155,24 +155,4 @@ public void arcDeleted(Object nodeId, Object targetNodeId, ArcId arcId) {
             }
         }
     }
-
-    @Override
-    public void nodeIdChanged(Object nodeId, Object newId) {
-        // noop
-    }
-
-    @Override
-    public void nodeCreated(Object nodeId) {
-        // noop
-    }
-
-    @Override
-    public void nodeRemoved(Object nodeId) {
-        // noop
-    }
-
-    @Override
-    public void nodePropertyChanged(Object nodeId, String property, Object oldValue, Object newValue) {
-        // noop
-    }
 }
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectStore.java b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectStore.java
@@ -443,35 +443,10 @@ public void postprocessAfterCommit(GraphDiff parentChanges) {
         // re-register changed object ids
         if (!parentChanges.isNoop()) {
             parentChanges.apply(new GraphChangeHandler() {
-
-                @Override
-                public void arcCreated(Object nodeId, Object targetNodeId, ArcId arcId) {
-                }
-
-                @Override
-                public void arcDeleted(Object nodeId, Object targetNodeId, ArcId arcId) {
-                }
-
-                @Override
-                public void nodeCreated(Object nodeId) {
-                }
-
                 @Override
                 public void nodeIdChanged(Object nodeId, Object newId) {
                     processIdChange(nodeId, newId);
                 }
-
-                @Override
-                public void nodePropertyChanged(
-                        Object nodeId,
-                        String property,
-                        Object oldValue,
-                        Object newValue) {
-                }
-
-                @Override
-                public void nodeRemoved(Object nodeId) {
-                }
             });
         }
 
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchProcessorNode.java b/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchProcessorNode.java
@@ -270,21 +270,5 @@ public void arcDeleted(Object nodeId, Object targetNodeId, ArcId arcId) {
                 hasArcDiff = true;
             }
         }
-
-        @Override
-        public void nodeIdChanged(Object nodeId, Object newId) {
-        }
-
-        @Override
-        public void nodeCreated(Object nodeId) {
-        }
-
-        @Override
-        public void nodeRemoved(Object nodeId) {
-        }
-
-        @Override
-        public void nodePropertyChanged(Object nodeId, String property, Object oldValue, Object newValue) {
-        }
     }
 }
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/flush/ArcValuesCreationHandler.java b/cayenne-server/src/main/java/org/apache/cayenne/access/flush/ArcValuesCreationHandler.java
@@ -250,23 +250,6 @@ protected void processRelationship(DbRelationship dbRelationship, ObjectId srcId
         }
     }
 
-    // not interested in following events in this handler
-    @Override
-    public void nodeIdChanged(Object nodeId, Object newId) {
-    }
-
-    @Override
-    public void nodeCreated(Object nodeId) {
-    }
-
-    @Override
-    public void nodeRemoved(Object nodeId) {
-    }
-
-    @Override
-    public void nodePropertyChanged(Object nodeId, String property, Object oldValue, Object newValue) {
-    }
-
     private static class ValuePropagationVisitor implements DbRowOpVisitor<Void> {
         private final DbAttribute attribute;
         private final boolean add;
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/flush/DataDomainIndirectDiffBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/access/flush/DataDomainIndirectDiffBuilder.java
@@ -85,24 +85,4 @@ private void processArcChange(ObjectId nodeId, ArcId arcId) {
             }
         }
     }
-
-    @Override
-    public void nodeIdChanged(Object nodeId, Object newId) {
-        // noop
-    }
-
-    @Override
-    public void nodeCreated(Object nodeId) {
-        // noop
-    }
-
-    @Override
-    public void nodeRemoved(Object nodeId) {
-        // noop
-    }
-
-    @Override
-    public void nodePropertyChanged(Object nodeId, String property, Object oldValue, Object newValue) {
-        // noop
-    }
 }
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/graph/GraphChangeHandler.java b/cayenne-server/src/main/java/org/apache/cayenne/graph/GraphChangeHandler.java
@@ -32,34 +32,40 @@ public interface GraphChangeHandler {
     /**
      * Notifies implementing object that a node was assigned a new id.
      */
-    void nodeIdChanged(Object nodeId, Object newId);
+    default void nodeIdChanged(Object nodeId, Object newId) {
+    }
 
     /**
      * Notifies implementing object that a new node was created in the graph.
      */
-    void nodeCreated(Object nodeId);
+    default void nodeCreated(Object nodeId) {
+    }
 
     /**
      * Notifies implementing object that a node was removed from the graph.
      */
-    void nodeRemoved(Object nodeId);
+    default void nodeRemoved(Object nodeId) {
+    }
 
     /**
      * Notifies implementing object that a node's property was modified.
      */
-    void nodePropertyChanged(
+    default void nodePropertyChanged(
             Object nodeId,
             String property,
             Object oldValue,
-            Object newValue);
+            Object newValue) {
+    }
 
     /**
      * Notifies implementing object that a new arc was created between two nodes.
      */
-    void arcCreated(Object nodeId, Object targetNodeId, ArcId arcId);
+    default void arcCreated(Object nodeId, Object targetNodeId, ArcId arcId) {
+    }
 
     /**
      * Notifies implementing object that an arc between two nodes was deleted.
      */
-    void arcDeleted(Object nodeId, Object targetNodeId, ArcId arcId);
+    default void arcDeleted(Object nodeId, Object targetNodeId, ArcId arcId) {
+    }
 }
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/graph/GraphMap.java b/cayenne-server/src/main/java/org/apache/cayenne/graph/GraphMap.java
@@ -71,39 +71,4 @@ public synchronized Object unregisterNode(Object nodeId) {
         return nodes.remove(nodeId);
     }
 
-    // *** methods for tracking local changes declared in GraphChangeHandler interface
-
-    @Override
-    public void arcCreated(Object nodeId, Object targetNodeId, ArcId arcId) {
-        // noop
-    }
-
-    @Override
-    public void arcDeleted(Object nodeId, Object targetNodeId, ArcId arcId) {
-        // noop
-    }
-
-    @Override
-    public void nodeCreated(Object nodeId) {
-        // noop
-    }
-
-    @Override
-    public void nodeRemoved(Object nodeId) {
-        // noop
-    }
-
-    @Override
-    public void nodeIdChanged(Object nodeId, Object newId) {
-        // noop
-    }
-
-    @Override
-    public void nodePropertyChanged(
-            Object nodeId,
-            String property,
-            Object oldValue,
-            Object newValue) {
-        // noop
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -240,13 +240,4 @@ public void nodeCreated(Object nodeId) {`
`240`	`240`	`this.currentId = nodeId;`
`241`	`241`	`}`
`242`	`242`
`243`		`- @Override`
`244`		`- public void nodeRemoved(Object nodeId) {`
`245`		`- // noop`
`246`		`- }`
`247`		`-`
`248`		`- @Override`
`249`		`- public void nodeIdChanged(Object nodeId, Object newId) {`
`250`		`- // noop`
`251`		`- }`
`252`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,21 +270,5 @@ public void arcDeleted(Object nodeId, Object targetNodeId, ArcId arcId) {`
`270`	`270`	`hasArcDiff = true;`
`271`	`271`	`}`
`272`	`272`	`}`
`273`		`-`
`274`		`- @Override`
`275`		`- public void nodeIdChanged(Object nodeId, Object newId) {`
`276`		`- }`
`277`		`-`
`278`		`- @Override`
`279`		`- public void nodeCreated(Object nodeId) {`
`280`		`- }`
`281`		`-`
`282`		`- @Override`
`283`		`- public void nodeRemoved(Object nodeId) {`
`284`		`- }`
`285`		`-`
`286`		`- @Override`
`287`		`- public void nodePropertyChanged(Object nodeId, String property, Object oldValue, Object newValue) {`
`288`		`- }`
`289`	`273`	`}`
`290`	`274`	`}`