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, 10 insertions, 5 deletions

diff --git a/v3po/translate-api/src/main/yang/translate-api.yang b/v3po/translate-api/src/main/yang/translate-api.yang
index 414ee20e1..796632dd2 100644
--- a/v3po/translate-api/src/main/yang/translate-api.yang
+++ b/v3po/translate-api/src/main/yang/translate-api.yang
@@ -14,14 +14,19 @@ module translate-api {
             "Initial revision.";
     }
 
-    identity honeycomb-reader {
+    identity honeycomb-reader-factory {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.read.Reader;
+        config:java-class io.fd.honeycomb.v3po.translate.read.ReaderFactory;
     }
 
     identity honeycomb-reader-registry {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.read.ReaderRegistry;
+        config:java-class io.fd.honeycomb.v3po.translate.read.registry.ModifiableReaderRegistryBuilder;
+    }
+
+    identity honeycomb-reader-registry-builder {
+        base "config:service-type";
+        config:java-class io.fd.honeycomb.v3po.translate.read.registry.ReaderRegistryBuilder;
     }
 
     identity honeycomb-writer-factory {
@@ -31,12 +36,12 @@ module translate-api {
 
     identity honeycomb-writer-registry {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.write.ModifiableWriterRegistry;
+        config:java-class io.fd.honeycomb.v3po.translate.write.registry.ModifiableWriterRegistryBuilder;
     }
 
     identity honeycomb-writer-registry-builder {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.write.WriterRegistryBuilder;
+        config:java-class io.fd.honeycomb.v3po.translate.write.registry.WriterRegistryBuilder;
     }
 
     identity honeycomb-mapping-context {