Deprecate AssertDataObjects

XtendBuilderExtensions class is proven to be unnecessary,
remove its usage and mark it for removal.

JIRA: MDSAL-716
Change-Id: I92cf5e060b41320b1d8b7b067c76e5bfdf61fc5c
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 1fbc15a384476ed652e45faa6e9dc4d41234aae0)

diff --git a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjects.java b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjects.java
index 8646496f1bd085da5021c2765009a9ab4c81bed3..71f8c0b5fd13cd04f901d34cb8444e0746611b65 100644 (file)
--- a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjects.java
+++ b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjects.java
@@ -32,13 +32,13 @@ import org.slf4j.LoggerFactory;
  *
  * @author Michael Vorburger
  */
+@Deprecated(since = "8.0.9", forRemoval = true)
 public final class AssertDataObjects {
-
     private static final Logger LOG = LoggerFactory.getLogger(AssertDataObjects.class);
-
     private static final XtendYangBeanGenerator GENERATOR = new XtendYangBeanGenerator();
 
     private AssertDataObjects() {
+        // Hidden on purpose
     }
 
     /**

diff --git a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/XtendBuilderExtensions.java b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/XtendBuilderExtensions.java
index 6ba5db52113f52f84c1236f561055347d47f24a2..a20d9fc937a14c93cca0d8b40ed2cb2e00c8f4ff 100644 (file)
--- a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/XtendBuilderExtensions.java
+++ b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/XtendBuilderExtensions.java
@@ -31,16 +31,16 @@ import org.opendaylight.yangtools.concepts.Builder;
  * <p>See also org.eclipse.xtext.xbase.lib.ObjectExtensions.operator_doubleArrow for background.
  *
  * @author Michael Vorburger
+ * @deprecated This class is not needed and will be removed in the next release.
  */
+@Deprecated(since = "8.0.9", forRemoval = true)
 public final class XtendBuilderExtensions {
-
     private XtendBuilderExtensions() {
-
+        // Hidden on purpose
     }
 
-    public static <P extends Object, T extends Builder<P>> P operator_doubleGreaterThan(
-            final T object, final Procedure1<? super T> block) {
-
+    public static <P extends Object, T extends Builder<P>> P operator_doubleGreaterThan(final T object,
+            final Procedure1<? super T> block) {
         block.apply(object);
         return object.build();
     }

diff --git a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/XtendYangBeanGenerator.java b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/XtendYangBeanGenerator.java
index 015e0c4b0ae3f760d769bf52380238bc9e28d0fe..d9ab57a2c5b297ad7dcdb6357ad84fbfac123578 100644 (file)
--- a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/XtendYangBeanGenerator.java
+++ b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/XtendYangBeanGenerator.java
@@ -37,6 +37,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
  * @author Michael Vorburger
  */
 // package-local: no need to expose this, consider it an implementation detail; public API is the AssertDataObjects
+@Deprecated(since = "8.0.9", forRemoval = true)
 class XtendYangBeanGenerator extends XtendBeanGenerator {
 
     @Override

diff --git a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjectsTest.java b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjectsTest.java
index bb8be6862630a8dc5f6ea97f30779b0f49727b09..0d05c74669c04b0a3bfe5ae53db00d9b7e0225d8 100644 (file)
--- a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjectsTest.java
+++ b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjectsTest.java
@@ -25,8 +25,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  *
  * @author Michael Vorburger
  */
+@Deprecated(since = "8.0.9", forRemoval = true)
 public class AssertDataObjectsTest extends AbstractDataBrokerTest {
-
     private static final String HEADER = "import static extension org.opendaylight.mdsal.binding.testutils."
             + "XtendBuilderExtensions.operator_doubleGreaterThan\n\n";
 
@@ -100,8 +100,8 @@ public class AssertDataObjectsTest extends AbstractDataBrokerTest {
         AssertDataObjects.assertEqualByText(expectedTopText, actualTop);
     }
 
-    <T extends DataObject> void put(WriteTransaction tx, LogicalDatastoreType store,
-            Entry<InstanceIdentifier<T>, T> obj) {
+    <T extends DataObject> void put(final WriteTransaction tx, final LogicalDatastoreType store,
+            final Entry<InstanceIdentifier<T>, T> obj) {
         tx.put(OPERATIONAL, obj.getKey(), obj.getValue());
     }
 

diff --git a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertNonDataObjectsTest.java b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertNonDataObjectsTest.java
index f66cf81cc59d518aa56615803cdb08ad2294267f..8bfcd6fc3382a12b3d1ca804dcd77adb10b254d4 100644 (file)
--- a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertNonDataObjectsTest.java
+++ b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertNonDataObjectsTest.java
@@ -27,6 +27,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
  *
  * @author Michael Vorburger
  */
+@Deprecated(since = "8.0.9", forRemoval = true)
 public class AssertNonDataObjectsTest {
 
     public static class SomeBean {

diff --git a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExampleYangObjects.java b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExampleYangObjects.java
index 340a9a138cbbc5bf3b947b148578936eec480c27..bbb3422b6104290be423054c11fb5215fd059f0b 100644 (file)
--- a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExampleYangObjects.java
+++ b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExampleYangObjects.java
@@ -18,9 +18,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.te
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelList;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+@Deprecated(since = "8.0.9", forRemoval = true)
 public final class ExampleYangObjects {
     private ExampleYangObjects() {
-
+        // Hidden on purpose
     }
 
     public static AbstractMap.SimpleImmutableEntry<InstanceIdentifier<Top>, Top> topEmpty() {

diff --git a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java
index f7645569e9a47f0766b656f3c509b1a1957e4829..4eae8b3d64ec6aad2d911cf65dc5c8de9b93c328 100644 (file)
--- a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java
+++ b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.mdsal.binding.testutils;
 
-import com.google.common.collect.Maps;
-import java.util.Collections;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugmentBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.complex.from.grouping.ContainerWithUsesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
@@ -16,6 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.te
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelListBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelListKey;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 /**
  * The object initialization code in this class was generated by AssertDataObjects.
@@ -23,10 +22,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.te
  * @see AssertDataObjects
  * @see AssertDataObjectsTest
  */
+@Deprecated(since = "8.0.9", forRemoval = true)
 public final class ExpectedObjects {
 
     private ExpectedObjects() {
-
+        // Hidden on purpose
     }
 
     public static TopLevelList topLevelList() {
@@ -41,12 +41,12 @@ public final class ExpectedObjects {
 
     public static Top top() {
         return new TopBuilder()
-                .setTopLevelList(Maps.uniqueIndex(Collections.singletonList(new TopLevelListBuilder()
+                .setTopLevelList(BindingMap.of(new TopLevelListBuilder()
                     .setName("foo")
                     .addAugmentation(new TreeComplexUsesAugmentBuilder()
                         .setContainerWithUses(new ContainerWithUsesBuilder().setLeafFromGrouping("foo").build())
                         .build())
-                    .build()), TopLevelList::key))
+                    .build()))
                 .build();
     }
 }

diff --git a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/UnionTest.java b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/UnionTest.java
index 8a4fd7b2df93d8efcecfb5ff9a57b573e09fc66c..558d271f5677f513537ceb25058d087b930ce471 100644 (file)
--- a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/UnionTest.java
+++ b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/UnionTest.java
@@ -19,6 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.yangtool
  *
  * @author Michael Vorburger
  */
+@Deprecated(since = "8.0.9", forRemoval = true)
 public class UnionTest {
     @Test
     public void testUnionType() {