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>

1 files changed, 1 insertions, 25 deletions

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);
     }