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, 3 insertions, 32 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 55ae9ecf0..ba9d8e16f 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
@@ -22,7 +22,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import io.fd.honeycomb.v3po.translate.SubtreeManager;
-import io.fd.honeycomb.v3po.translate.read.ChildReader;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -32,7 +31,6 @@ import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.ChildOf;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.Identifiable;
 import org.opendaylight.yangtools.yang.binding.Identifier;
@@ -75,24 +73,6 @@ public final class RWUtils {
         return Iterables.get(pathArguments, i + 1);
     }
 
-    public static <T> List<ChildReader<? extends ChildOf<T>>> emptyChildReaderList() {
-        return Collections.emptyList();
-    }
-
-    public static <T> List<ChildReader<? extends Augmentation<T>>> emptyAugReaderList() {
-        return Collections.emptyList();
-    }
-
-    public static <T> List<ChildReader<? extends Augmentation<T>>> singletonAugReaderList(
-        ChildReader<? extends Augmentation<T>> item) {
-        return Collections.<ChildReader<? extends Augmentation<T>>>singletonList(item);
-    }
-
-    public static <T> List<ChildReader<? extends ChildOf<T>>> singletonChildReaderList(
-        ChildReader<? extends ChildOf<T>> item) {
-        return Collections.<ChildReader<? extends ChildOf<T>>>singletonList(item);
-    }
-
     /**
      * Replace last item in ID with a provided IdentifiableItem of the same type
      */
@@ -170,25 +150,16 @@ public final class RWUtils {
         }
     };
 
-    @SuppressWarnings("unchecked")
-    public static <D extends DataObject> InstanceIdentifier<D> appendTypeToId(
-        final InstanceIdentifier<? extends DataObject> parentId, final InstanceIdentifier<D> type) {
-        Preconditions.checkArgument(!parentId.contains(type),
-            "Unexpected InstanceIdentifier %s, already contains %s", parentId, type);
-        final InstanceIdentifier.PathArgument t = Iterables.getOnlyElement(type.getPathArguments());
-        return (InstanceIdentifier<D>) InstanceIdentifier.create(Iterables.concat(
-            parentId.getPathArguments(), Collections.singleton(t)));
-    }
-
     /**
      * Transform a keyed instance identifier into a wildcarded one.
      */
-    public static InstanceIdentifier<?> makeIidWildcarded(final InstanceIdentifier<?> id) {
+    @SuppressWarnings("unchecked")
+    public static <D extends DataObject> InstanceIdentifier<D> makeIidWildcarded(final InstanceIdentifier<D> id) {
         final List<InstanceIdentifier.PathArgument> transformedPathArguments =
                 StreamSupport.stream(id.getPathArguments().spliterator(), false)
                         .map(RWUtils::cleanPathArgumentFromKeys)
                         .collect(Collectors.toList());
-        return InstanceIdentifier.create(transformedPathArguments);
+        return (InstanceIdentifier<D>) InstanceIdentifier.create(transformedPathArguments);
     }
 
     private static InstanceIdentifier.PathArgument cleanPathArgumentFromKeys(final InstanceIdentifier.PathArgument pathArgument) {