Cleanup API assumptions

Migrate Identifier.Item use and allow DataObjectModification
to return a collection of implementations.

JIRA: MDSAL-342
Change-Id: I65e398ca6d6c1aabbd5a12eb75601cafb551d22e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/DataObjectModificationImpl.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/DataObjectModificationImpl.java
index a1f7cbd112c9b592774d96246c23fef155a2b24e..c9cb7ba38f95f4165e627c5dd05a8ccee8dc355b 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/DataObjectModificationImpl.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/DataObjectModificationImpl.java
@@ -71,21 +71,20 @@ public class DataObjectModificationImpl<T extends DataObject> implements DataObj
     @SuppressWarnings("unchecked")
     public <C extends Identifiable<K> & ChildOf<? super T>, K extends Identifier<C>> DataObjectModification<C>
         getModifiedChildListItem(final Class<C> listItem, final K listKey) {
-        return (DataObjectModification<C>) getModifiedChild(
-                new InstanceIdentifier.IdentifiableItem<>(listItem, listKey));
+        return (DataObjectModification<C>) getModifiedChild(InstanceIdentifier.IdentifiableItem.of(listItem, listKey));
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public <C extends ChildOf<? super T>> DataObjectModification<C> getModifiedChildContainer(final Class<C> arg) {
-        return (DataObjectModification<C>) getModifiedChild(new InstanceIdentifier.Item<>(arg));
+        return (DataObjectModification<C>) getModifiedChild(InstanceIdentifier.Item.of(arg));
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public <C extends Augmentation<T> & DataObject> DataObjectModification<C> getModifiedAugmentation(
             final Class<C> augmentation) {
-        return (DataObjectModification<C>) getModifiedChild(new InstanceIdentifier.Item<>(augmentation));
+        return (DataObjectModification<C>) getModifiedChild(InstanceIdentifier.Item.of(augmentation));
     }
 
     @Override

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactCommandAggregator.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactCommandAggregator.java
index efb7f3d40caf7fc2e76735e2e9cfda1d8d9d28f0..3e0ac6ff0535c66ae0507b82aef935d8ef368d6a 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactCommandAggregator.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactCommandAggregator.java
@@ -133,7 +133,7 @@ public class TransactCommandAggregator implements TransactCommand {
         }
     }
 
-    private void extractDataChanged(final Collection<DataObjectModification<? extends DataObject>> children,
+    private void extractDataChanged(final Collection<? extends DataObjectModification<? extends DataObject>> children,
                                     final Map<Class<? extends Identifiable>, List<Identifiable>> updatedData,
                                     final Map<Class<? extends Identifiable>, List<Identifiable>> deletedData) {
         if (children == null) {

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalDataChangeListener.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalDataChangeListener.java
index cbfa8bcefffdcd311ae46b046a7ae8d222f021c6..0eee749afb817e32445adcca7427fdadf69be673 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalDataChangeListener.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalDataChangeListener.java
@@ -70,8 +70,7 @@ public class HwvtepOperationalDataChangeListener implements ClusteredDataTreeCha
             DataObjectModification<HwvtepGlobalAugmentation> aug =
                     mod.getModifiedAugmentation(HwvtepGlobalAugmentation.class);
             if (aug != null && getModificationType(aug) != null) {
-                Collection<DataObjectModification<? extends DataObject>> children = aug.getModifiedChildren();
-                for (DataObjectModification<? extends DataObject> child : children) {
+                for (DataObjectModification<? extends DataObject> child : aug.getModifiedChildren()) {
                     updateDeviceOpData(key, child);
                 }
             }