(cayenne) branch master updated: Deprecating unused stuff

[aadamchik]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new 306a28000 Deprecating unused stuff
306a28000 is described below

commit 306a2800016c8474e1b3c300620baf65d8932549
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Sat May 23 19:09:33 2026 -0400

    Deprecating unused stuff
---
 .../java/org/apache/cayenne/util/DeepMergeOperation.java   | 14 ++++++++------
 .../java/org/apache/cayenne/util/DeepMergeOperationIT.java |  1 +
 .../cayenne/util/DeepMergeOperationInheritanceIT.java      |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git 
a/cayenne/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java 
b/cayenne/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java
index 414475baa..29341ef83 100644
--- a/cayenne/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java
+++ b/cayenne/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java
@@ -19,12 +19,6 @@
 
 package org.apache.cayenne.util;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.ObjectId;
@@ -37,6 +31,12 @@ import org.apache.cayenne.reflect.ToManyMapProperty;
 import org.apache.cayenne.reflect.ToManyProperty;
 import org.apache.cayenne.reflect.ToOneProperty;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
 /**
  * An operation that merges changes from an object graph, whose objects are 
registered in
  * some ObjectContext, to peer objects in an ObjectConext that is a child of 
that context.
@@ -44,7 +44,9 @@ import org.apache.cayenne.reflect.ToOneProperty;
  * unresolved relationships.
  * 
  * @since 1.2
+ * @deprecated unused
  */
+@Deprecated(since = "5.0", forRemoval = true)
 public class DeepMergeOperation {
 
     private final EntityResolver entityResolver;
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java 
b/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java
index e9068fa88..379f047cd 100644
--- a/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java
@@ -33,6 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
+@Deprecated
 public class DeepMergeOperationIT {
 
     @RegisterExtension
diff --git 
a/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
 
b/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
index 706aed325..6a62c4ea6 100644
--- 
a/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
+++ 
b/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+@Deprecated
 public class DeepMergeOperationInheritanceIT extends PeopleTestBase {
 
     private DataContext context;