HONEYCOMB-9: Migrate Interface listener

Change-Id: Iffde1ee21b749a8c8efa96c243f7f8bb0811b4c7
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

6 files changed, 140 insertions, 11 deletions

diff --git a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/RWUtils.java b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/RWUtils.java
index 027d9bbb7..dbfed04b0 100644
--- a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/RWUtils.java
+++ b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/RWUtils.java
@@ -89,6 +89,11 @@ public final class RWUtils {
         return Collections.<ChildWriter<? extends ChildOf<T>>>singletonList(item);
     }
 
+    public static <T> List<ChildWriter<? extends Augmentation<T>>> singletonAugWriterList(
+        ChildWriter<? extends Augmentation<T>> item) {
+        return Collections.<ChildWriter<? extends Augmentation<T>>>singletonList(item);
+    }
+
     /**
      * Replace last item in ID with a provided IdentifiableItem of the same type
      */
diff --git a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/CloseableReader.java b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/CloseableReader.java
new file mode 100644
index 000000000..5492062e3
--- /dev/null
+++ b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/CloseableReader.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.v3po.translate.util.read;
+
+import com.google.common.base.Optional;
+import io.fd.honeycomb.v3po.translate.read.ReadContext;
+import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
+import io.fd.honeycomb.v3po.translate.read.Reader;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+/**
+ * Closeable wrapper for a reader
+ */
+public final class CloseableReader<D extends DataObject> implements Reader<D>, AutoCloseable {
+
+    private Reader<D> compositeRootReader;
+
+    public CloseableReader(@Nonnull final Reader<D> compositeRootReader) {
+        this.compositeRootReader = compositeRootReader;
+    }
+
+    @Nonnull
+    @Override
+    public Optional<? extends DataObject> read(@Nonnull InstanceIdentifier<? extends DataObject> id,
+                                               @Nonnull ReadContext ctx) throws ReadFailedException {
+        return compositeRootReader.read(id, ctx);
+    }
+
+    @Nonnull
+    @Override
+    public InstanceIdentifier<D> getManagedDataObjectType() {
+        return compositeRootReader.getManagedDataObjectType();
+    }
+
+    @Override
+    public String toString() {
+        return compositeRootReader.toString();
+    }
+
+    @Override
+    public void close() throws Exception {
+        //NOOP
+    }
+}
diff --git a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/CloseableWriter.java b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/CloseableWriter.java
new file mode 100644
index 000000000..3442f8370
--- /dev/null
+++ b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/CloseableWriter.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.v3po.translate.util.write;
+
+import io.fd.honeycomb.v3po.translate.write.WriteContext;
+import io.fd.honeycomb.v3po.translate.write.WriteFailedException;
+import io.fd.honeycomb.v3po.translate.write.Writer;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+/**
+ * Closeable wrapper for a writer
+ */
+public final class CloseableWriter<D extends DataObject> implements Writer<D>, AutoCloseable {
+
+    private Writer<D> vppCompositeRootWriter;
+
+    public CloseableWriter(
+        final Writer<D> vppCompositeRootWriter) {
+        this.vppCompositeRootWriter = vppCompositeRootWriter;
+    }
+
+    @Override
+    public void update(
+        @Nonnull final InstanceIdentifier<? extends DataObject> id,
+        @Nullable final DataObject dataBefore,
+        @Nullable final DataObject dataAfter,
+        @Nonnull final WriteContext ctx) throws WriteFailedException {
+        vppCompositeRootWriter.update(id, dataBefore, dataAfter, ctx);
+    }
+
+    @Nonnull
+    @Override
+    public InstanceIdentifier<D> getManagedDataObjectType() {
+        return vppCompositeRootWriter.getManagedDataObjectType();
+    }
+
+    @Override
+    public String toString() {
+        return vppCompositeRootWriter.toString();
+    }
+
+    @Override
+    public void close() throws Exception {
+
+    }
+}
diff --git a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/DelegatingWriterRegistry.java b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/DelegatingWriterRegistry.java
index fda289e2b..f25ba5336 100644
--- a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/DelegatingWriterRegistry.java
+++ b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/DelegatingWriterRegistry.java
@@ -24,9 +24,9 @@ import com.google.common.collect.Collections2;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import io.fd.honeycomb.v3po.translate.TranslationException;
 import io.fd.honeycomb.v3po.translate.util.RWUtils;
 import io.fd.honeycomb.v3po.translate.write.WriteContext;
+import io.fd.honeycomb.v3po.translate.write.WriteFailedException;
 import io.fd.honeycomb.v3po.translate.write.Writer;
 import io.fd.honeycomb.v3po.translate.write.WriterRegistry;
 import java.util.LinkedList;
@@ -40,8 +40,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Simple writer registry able to perform and aggregated read (ROOT write) on top of all provided writers. Also able to
- * delegate a specific read to one of the delegate writers.
+ * Simple writer registry able to perform and aggregated write (ROOT write) on top of all provided writers. Also able to
+ * delegate a specific write to one of the delegate writers.
  *
  * This could serve as a utility to hold & hide all available writers in upper layers.
  */
@@ -82,7 +82,7 @@ public final class DelegatingWriterRegistry implements WriterRegistry {
     public void update(@Nonnull final InstanceIdentifier<? extends DataObject> id,
                        @Nullable final DataObject dataBefore,
                        @Nullable final DataObject dataAfter,
-                       @Nonnull final WriteContext ctx) throws TranslationException {
+                       @Nonnull final WriteContext ctx) throws WriteFailedException {
         final InstanceIdentifier.PathArgument first = checkNotNull(
                 Iterables.getFirst(id.getPathArguments(), null), "Empty id");
         final Writer<? extends DataObject> writer = rootWriters.get(first.getType());
@@ -94,7 +94,7 @@ public final class DelegatingWriterRegistry implements WriterRegistry {
     @Override
     public void update(@Nonnull final Map<InstanceIdentifier<?>, DataObject> nodesBefore,
                        @Nonnull final Map<InstanceIdentifier<?>, DataObject> nodesAfter,
-                       @Nonnull final WriteContext ctx) throws TranslationException {
+                       @Nonnull final WriteContext ctx) throws WriteFailedException {
         checkAllWritersPresent(nodesBefore);
         checkAllWritersPresent(nodesAfter);
 
diff --git a/v3po/translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/translate/utils/rev160406/DelegatingWriterRegistryModule.java b/v3po/translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/translate/utils/rev160406/DelegatingWriterRegistryModule.java
index a629a294f..72ec87691 100644
--- a/v3po/translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/translate/utils/rev160406/DelegatingWriterRegistryModule.java
+++ b/v3po/translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/translate/utils/rev160406/DelegatingWriterRegistryModule.java
@@ -5,6 +5,7 @@ import com.google.common.collect.Lists;
 import io.fd.honeycomb.v3po.translate.TranslationException;
 import io.fd.honeycomb.v3po.translate.util.write.DelegatingWriterRegistry;
 import io.fd.honeycomb.v3po.translate.write.WriteContext;
+import io.fd.honeycomb.v3po.translate.write.WriteFailedException;
 import io.fd.honeycomb.v3po.translate.write.Writer;
 import io.fd.honeycomb.v3po.translate.write.WriterRegistry;
 import java.util.List;
@@ -63,7 +64,7 @@ public class DelegatingWriterRegistryModule extends org.opendaylight.yang.gen.v1
         public void update(
             @Nonnull final InstanceIdentifier<? extends DataObject> id,
             @Nullable final DataObject dataBefore, @Nullable final DataObject dataAfter,
-            @Nonnull final WriteContext ctx) throws TranslationException {
+            @Nonnull final WriteContext ctx) throws WriteFailedException {
             delegatingWriterRegistry.update(id, dataBefore, dataAfter, ctx);
         }
 
diff --git a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/impl/write/util/DelegatingWriterRegistryTest.java b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/impl/write/util/DelegatingWriterRegistryTest.java
index e201890b5..f51e49db5 100644
--- a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/impl/write/util/DelegatingWriterRegistryTest.java
+++ b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/impl/write/util/DelegatingWriterRegistryTest.java
@@ -24,9 +24,9 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import io.fd.honeycomb.v3po.translate.TranslationException;
 import io.fd.honeycomb.v3po.translate.util.write.DelegatingWriterRegistry;
 import io.fd.honeycomb.v3po.translate.write.WriteContext;
+import io.fd.honeycomb.v3po.translate.write.WriteFailedException;
 import io.fd.honeycomb.v3po.translate.write.Writer;
 import io.fd.honeycomb.v3po.translate.write.WriterRegistry;
 import java.util.ArrayList;
@@ -117,8 +117,8 @@ public class DelegatingWriterRegistryTest {
         final DataObject dataAfter2 = mockDataObject("VppState after", VppState.class);
 
         // Fail on update
-        Mockito.doThrow(new TranslationException("vpp failed")).when(vppStateWriter)
-                .update(vppStateId, dataBefore2, dataAfter2, ctx);
+        Mockito.doThrow(new WriteFailedException(InstanceIdentifier.create(Vpp.class), "vpp failed"))
+            .when(vppStateWriter).update(vppStateId, dataBefore2, dataAfter2, ctx);
 
         // Run the test
         try {
@@ -154,11 +154,11 @@ public class DelegatingWriterRegistryTest {
         final DataObject dataAfter3 = mockDataObject("Interfaces after", Interfaces.class);
 
         // Fail on the third update
-        doThrow(new TranslationException("vpp failed")).when(interfacesWriter)
+        doThrow(new WriteFailedException(InstanceIdentifier.create(Vpp.class), "vpp failed")).when(interfacesWriter)
                 .update(interfaceId, dataBefore3, dataAfter3, ctx);
 
         // Fail on the second revert
-        doThrow(new TranslationException("vpp failed again")).when(writer)
+        doThrow(new WriteFailedException(InstanceIdentifier.create(Vpp.class), "vpp failed")).when(writer)
                 .update(vppId, dataAfter1, dataBefore1, ctx);
 
         // Run the test