HONEYCOMB-122 Update reader registry to share similar APIs as writer

+ Extract common registry builder base code
(Reader registry is not flat, so there is not full control over ordering as with writers
but it is sufficient)
+ Split CompositeReader into CompositeReader, SubtreeReader and GenericReader
+ No need to build composite structure in ReaderFactories (registry does that internally)
+ Keep only ReaderCustomizer + ListReaderCustomizer, no root reader (same for writers)

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

4 files changed, 106 insertions, 88 deletions

diff --git a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/read/ReflexiveAugmentReaderCustomizerTest.java b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/read/ReflexiveAugmentReaderCustomizerTest.java
deleted file mode 100644
index 3edc001a8..000000000
--- a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/read/ReflexiveAugmentReaderCustomizerTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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 static org.junit.Assert.assertSame;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceStateAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceStateAugmentationBuilder;
-
-public class ReflexiveAugmentReaderCustomizerTest {
-
-    private ReflexiveAugmentReaderCustomizer<VppInterfaceStateAugmentation, VppInterfaceStateAugmentationBuilder>
-        vppIfcStateAugmentCustomizer;
-
-    @Before
-    public void setUp() throws Exception {
-        vppIfcStateAugmentCustomizer =
-            new ReflexiveAugmentReaderCustomizer<>(VppInterfaceStateAugmentationBuilder.class,
-                VppInterfaceStateAugmentation.class);
-    }
-
-    @Test
-    public void testAddAugment() throws Exception {
-        final InterfaceBuilder parentBuilder = new InterfaceBuilder();
-        final VppInterfaceStateAugmentation augmentation = vppIfcStateAugmentCustomizer.getBuilder(null).build();
-        vppIfcStateAugmentCustomizer.merge(parentBuilder, augmentation);
-        assertSame(augmentation, parentBuilder.getAugmentation(VppInterfaceStateAugmentation.class));
-    }
-}
\ No newline at end of file
diff --git a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/read/registry/TypeHierarchyTest.java b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/read/registry/TypeHierarchyTest.java
new file mode 100644
index 000000000..92449af28
--- /dev/null
+++ b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/read/registry/TypeHierarchyTest.java
@@ -0,0 +1,88 @@
+/*
+ * 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.registry;
+
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.Sets;
+import org.junit.Test;
+import org.opendaylight.yangtools.yang.binding.ChildOf;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public class TypeHierarchyTest {
+
+    @Test
+    public void testHierarchy() throws Exception {
+        final TypeHierarchy typeHierarchy = TypeHierarchy.create(Sets.newHashSet(
+                DataObject3.DataObject31.DataObject311.IID,
+                DataObject3.DataObject31.IID,/* Included in previous already */
+                DataObject1.IID,
+                DataObject2.DataObject21.IID));
+
+        // Roots
+        assertThat(typeHierarchy.getRoots().size(), is(3));
+        assertThat(typeHierarchy.getRoots(), hasItems(DataObject1.IID, DataObject2.IID, DataObject3.IID));
+
+        // Leaves
+        assertThat(typeHierarchy.getDirectChildren(DataObject1.IID).size(), is(0));
+        assertThat(typeHierarchy.getDirectChildren(DataObject2.DataObject21.IID).size(), is(0));
+        assertThat(typeHierarchy.getDirectChildren(DataObject3.DataObject31.DataObject311.IID).size(), is(0));
+
+        // Intermediate leaves
+        assertThat(typeHierarchy.getDirectChildren(DataObject2.IID).size(), is(1));
+        assertThat(typeHierarchy.getDirectChildren(DataObject2.IID), hasItem(DataObject2.DataObject21.IID));
+        assertEquals(typeHierarchy.getDirectChildren(DataObject2.IID), typeHierarchy.getAllChildren(DataObject2.IID));
+
+        assertThat(typeHierarchy.getDirectChildren(DataObject3.DataObject31.IID).size(), is(1));
+        assertThat(typeHierarchy.getDirectChildren(DataObject3.DataObject31.IID), hasItem(
+                DataObject3.DataObject31.DataObject311.IID));
+        assertEquals(typeHierarchy.getDirectChildren(DataObject3.DataObject31.IID), typeHierarchy.getAllChildren(
+                DataObject3.DataObject31.IID));
+
+        assertThat(typeHierarchy.getDirectChildren(DataObject3.IID).size(), is(1));
+        assertThat(typeHierarchy.getDirectChildren(DataObject3.IID), hasItem(DataObject3.DataObject31.IID));
+        assertThat(typeHierarchy.getAllChildren(DataObject3.IID).size(), is(2));
+        assertTrue(typeHierarchy.getAllChildren(DataObject3.IID).contains(DataObject3.DataObject31.IID));
+        assertTrue(typeHierarchy.getAllChildren(DataObject3.IID).contains(DataObject3.DataObject31.DataObject311.IID));
+    }
+
+    private abstract static class DataObject1 implements DataObject {
+        static InstanceIdentifier<DataObject1> IID = InstanceIdentifier.create(DataObject1.class);
+    }
+    private abstract static class DataObject2 implements DataObject {
+        static InstanceIdentifier<DataObject2> IID = InstanceIdentifier.create(DataObject2.class);
+        private abstract static class DataObject21 implements DataObject, ChildOf<DataObject2> {
+            static InstanceIdentifier<DataObject21> IID = DataObject2.IID.child(DataObject21.class);
+        }
+    }
+    private abstract static class DataObject3 implements DataObject {
+        static InstanceIdentifier<DataObject3> IID = InstanceIdentifier.create(DataObject3.class);
+        private abstract static class DataObject31 implements DataObject, ChildOf<DataObject3> {
+            static InstanceIdentifier<DataObject31> IID = DataObject3.IID.child(DataObject31.class);
+            private abstract static class DataObject311 implements DataObject, ChildOf<DataObject31> {
+                static InstanceIdentifier<DataObject311> IID = DataObject31.IID.child(DataObject311.class);
+            }
+        }
+    }
+}
+
diff --git a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryBuilderTest.java b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryBuilderTest.java
index ec407b685..da7ac0947 100644
--- a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryBuilderTest.java
+++ b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryBuilderTest.java
@@ -31,13 +31,13 @@ public class FlatWriterRegistryBuilderTest {
             1   ->  2   ->  3
                         ->  4
          */
-        flatWriterRegistryBuilder.addWriter(mockWriter(DataObject3.class));
-        flatWriterRegistryBuilder.addWriter(mockWriter(DataObject4.class));
-        flatWriterRegistryBuilder.addWriterBefore(mockWriter(DataObject2.class),
+        flatWriterRegistryBuilder.add(mockWriter(DataObject3.class));
+        flatWriterRegistryBuilder.add(mockWriter(DataObject4.class));
+        flatWriterRegistryBuilder.addBefore(mockWriter(DataObject2.class),
                 Lists.newArrayList(DataObject3.IID, DataObject4.IID));
-        flatWriterRegistryBuilder.addWriterBefore(mockWriter(DataObject1.class), DataObject2.IID);
+        flatWriterRegistryBuilder.addBefore(mockWriter(DataObject1.class), DataObject2.IID);
         final ImmutableMap<InstanceIdentifier<?>, Writer<?>> mappedWriters =
-                flatWriterRegistryBuilder.getMappedWriters();
+                flatWriterRegistryBuilder.getMappedHandlers();
 
         final ArrayList<InstanceIdentifier<?>> typesInList = Lists.newArrayList(mappedWriters.keySet());
         assertEquals(DataObject1.IID, typesInList.get(0));
@@ -53,12 +53,12 @@ public class FlatWriterRegistryBuilderTest {
             1   ->  2   ->  3
                         ->  4
          */
-        flatWriterRegistryBuilder.addWriter(mockWriter(DataObject1.class));
-        flatWriterRegistryBuilder.addWriterAfter(mockWriter(DataObject2.class), DataObject1.IID);
-        flatWriterRegistryBuilder.addWriterAfter(mockWriter(DataObject3.class), DataObject2.IID);
-        flatWriterRegistryBuilder.addWriterAfter(mockWriter(DataObject4.class), DataObject2.IID);
+        flatWriterRegistryBuilder.add(mockWriter(DataObject1.class));
+        flatWriterRegistryBuilder.addAfter(mockWriter(DataObject2.class), DataObject1.IID);
+        flatWriterRegistryBuilder.addAfter(mockWriter(DataObject3.class), DataObject2.IID);
+        flatWriterRegistryBuilder.addAfter(mockWriter(DataObject4.class), DataObject2.IID);
         final ImmutableMap<InstanceIdentifier<?>, Writer<?>> mappedWriters =
-                flatWriterRegistryBuilder.getMappedWriters();
+                flatWriterRegistryBuilder.getMappedHandlers();
 
         final List<InstanceIdentifier<?>> typesInList = Lists.newArrayList(mappedWriters.keySet());
         assertEquals(DataObject1.IID, typesInList.get(0));
@@ -73,27 +73,27 @@ public class FlatWriterRegistryBuilderTest {
         /*
             1   ->  2   ->  1
          */
-        flatWriterRegistryBuilder.addWriter(mockWriter(DataObject1.class));
-        flatWriterRegistryBuilder.addWriterAfter(mockWriter(DataObject2.class), DataObject1.IID);
-        flatWriterRegistryBuilder.addWriterAfter(mockWriter(DataObject1.class), DataObject2.IID);
+        flatWriterRegistryBuilder.add(mockWriter(DataObject1.class));
+        flatWriterRegistryBuilder.addAfter(mockWriter(DataObject2.class), DataObject1.IID);
+        flatWriterRegistryBuilder.addAfter(mockWriter(DataObject1.class), DataObject2.IID);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testAddWriterTwice() throws Exception {
         final FlatWriterRegistryBuilder flatWriterRegistryBuilder = new FlatWriterRegistryBuilder();
-        flatWriterRegistryBuilder.addWriter(mockWriter(DataObject1.class));
-        flatWriterRegistryBuilder.addWriter(mockWriter(DataObject1.class));
+        flatWriterRegistryBuilder.add(mockWriter(DataObject1.class));
+        flatWriterRegistryBuilder.add(mockWriter(DataObject1.class));
     }
 
     @Test
     public void testAddSubtreeWriter() throws Exception {
         final FlatWriterRegistryBuilder flatWriterRegistryBuilder = new FlatWriterRegistryBuilder();
-        flatWriterRegistryBuilder.addSubtreeWriter(
+        flatWriterRegistryBuilder.subtreeAdd(
                 Sets.newHashSet(DataObject4.DataObject5.IID,
                                 DataObject4.DataObject5.IID),
                 mockWriter(DataObject4.class));
         final ImmutableMap<InstanceIdentifier<?>, Writer<?>> mappedWriters =
-                flatWriterRegistryBuilder.getMappedWriters();
+                flatWriterRegistryBuilder.getMappedHandlers();
         final ArrayList<InstanceIdentifier<?>> typesInList = Lists.newArrayList(mappedWriters.keySet());
 
         assertEquals(DataObject4.IID, typesInList.get(0));
diff --git a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryTest.java b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryTest.java
index df3296557..1b4a059ea 100644
--- a/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryTest.java
+++ b/v3po/translate-utils/src/test/java/io/fd/honeycomb/v3po/translate/util/write/registry/FlatWriterRegistryTest.java
@@ -20,7 +20,7 @@ import com.google.common.collect.Multimap;
 import io.fd.honeycomb.v3po.translate.write.DataObjectUpdate;
 import io.fd.honeycomb.v3po.translate.write.WriteContext;
 import io.fd.honeycomb.v3po.translate.write.Writer;
-import io.fd.honeycomb.v3po.translate.write.WriterRegistry;
+import io.fd.honeycomb.v3po.translate.write.registry.WriterRegistry;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;
@@ -49,19 +49,6 @@ public class FlatWriterRegistryTest {
     }
 
     @Test
-    public void testSingleUpdate() throws Exception {
-        final FlatWriterRegistry flatWriterRegistry =
-                new FlatWriterRegistry(ImmutableMap.of(DataObject1.IID, writer1));
-
-        final InstanceIdentifier<DataObject1> iid = InstanceIdentifier.create(DataObject1.class);
-        final DataObject1 before = mock(DataObject1.class);
-        final DataObject1 after = mock(DataObject1.class);
-        flatWriterRegistry.update(iid, before, after, ctx);
-
-        verify(writer1).update(iid, before, after, ctx);
-    }
-
-    @Test
     public void testMultipleUpdatesForSingleWriter() throws Exception {
         final FlatWriterRegistry flatWriterRegistry =
                 new FlatWriterRegistry(ImmutableMap.of(DataObject1.IID, writer1, DataObject2.IID, writer2));
@@ -272,17 +259,6 @@ public class FlatWriterRegistryTest {
         updates.put(iid, DataObjectUpdate.create(iid, mock(type), mock(type)));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testSingleUpdateMissingWriter() throws Exception {
-        final FlatWriterRegistry flatWriterRegistry =
-                new FlatWriterRegistry(ImmutableMap.of());
-
-        final InstanceIdentifier<DataObject1> iid = InstanceIdentifier.create(DataObject1.class);
-        final DataObject1 before = mock(DataObject1.class);
-        final DataObject1 after = mock(DataObject1.class);
-        flatWriterRegistry.update(iid, before, after, ctx);
-    }
-
     private abstract static class DataObject1 implements DataObject {
         static final InstanceIdentifier<DataObject1> IID = InstanceIdentifier.create(DataObject1.class);
     }