From 7a09e836eea8a5df50968112d20cd730974dd5a0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 13 Dec 2022 17:50:38 +0100 Subject: [PATCH] Deprecate DataObjectReadingUtil This class is not used anywhere and is a rather heavy user of reflection. Deprecate it for removal. JIRA: MDSAL-802 Change-Id: If3f94622b9ae11b8f63f4d93e3ee211d456725f8 Signed-off-by: Robert Varga --- .../mdsal/binding/spec/util/DataObjectReadingUtil.java | 8 +++----- .../binding/spec/util/DataObjectReadingUtilTest.java | 1 + .../opendaylight/mdsal/binding/spec/util/FooChild.java | 1 + .../opendaylight/mdsal/binding/spec/util/GroupingFoo.java | 1 + .../org/opendaylight/mdsal/binding/spec/util/Node.java | 1 + .../org/opendaylight/mdsal/binding/spec/util/NodeKey.java | 1 + .../org/opendaylight/mdsal/binding/spec/util/Nodes.java | 1 + 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java index 1bbe219ba9..1d8f64af77 100644 --- a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java +++ b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java @@ -10,7 +10,6 @@ package org.opendaylight.mdsal.binding.spec.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import java.lang.reflect.InvocationTargetException; @@ -34,9 +33,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.IdentifiableIt import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument; -@Beta +@Deprecated(since = "11.0.3", forRemoval = true) public final class DataObjectReadingUtil { - private static final DataObjectReadingStrategy REAUSABLE_AUGMENTATION_READING_STRATEGY = new AugmentationReadingStrategy(); @@ -146,14 +144,14 @@ public final class DataObjectReadingUtil { checkArgument(DataContainer.class.isAssignableFrom(childType)); this.parentType = parentType; this.childType = childType; - this.getterMethod = resolveGetterMethod(parentType, childType); + getterMethod = resolveGetterMethod(parentType, childType); } @SuppressWarnings("unchecked") DataObjectReadingStrategy(final Class parentType, final Class childType, final Method getter) { this.parentType = parentType; this.childType = childType; - this.getterMethod = getter; + getterMethod = getter; } @SuppressWarnings("unused") diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java index 6b3b701893..67bfe172bc 100644 --- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java +++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java @@ -27,6 +27,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.Identifiable; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +@Deprecated(since = "11.0.3", forRemoval = true) @RunWith(MockitoJUnitRunner.StrictStubs.class) public class DataObjectReadingUtilTest { @Mock diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/FooChild.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/FooChild.java index c8c655256d..dd5ac3c70b 100644 --- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/FooChild.java +++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/FooChild.java @@ -9,6 +9,7 @@ package org.opendaylight.mdsal.binding.spec.util; import org.opendaylight.yangtools.yang.binding.ChildOf; +@Deprecated(since = "11.0.3", forRemoval = true) public interface FooChild extends ChildOf { } diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/GroupingFoo.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/GroupingFoo.java index eb3fb35256..39b4941781 100644 --- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/GroupingFoo.java +++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/GroupingFoo.java @@ -7,6 +7,7 @@ */ package org.opendaylight.mdsal.binding.spec.util; +@Deprecated(since = "11.0.3", forRemoval = true) public interface GroupingFoo { } diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/Node.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/Node.java index 06120118b9..c0059a4022 100644 --- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/Node.java +++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/Node.java @@ -11,6 +11,7 @@ import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.Identifiable; +@Deprecated(since = "11.0.3", forRemoval = true) public interface Node extends DataObject, Identifiable, ChildOf { } diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/NodeKey.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/NodeKey.java index e0cdc74bc3..fb639bd98e 100644 --- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/NodeKey.java +++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/NodeKey.java @@ -10,6 +10,7 @@ package org.opendaylight.mdsal.binding.spec.util; import java.io.Serial; import org.opendaylight.yangtools.yang.binding.Identifier; +@Deprecated(since = "11.0.3", forRemoval = true) public class NodeKey implements Identifier { @Serial private static final long serialVersionUID = 1L; diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/Nodes.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/Nodes.java index 775bf90819..add3b4cee4 100644 --- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/Nodes.java +++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/Nodes.java @@ -11,6 +11,7 @@ import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.DataRoot; +@Deprecated(since = "11.0.3", forRemoval = true) public interface Nodes extends ChildOf, DataObject { Iterable getNode(); -- 2.36.6