From 98666a011d7538ac9742a8351856f76fbe7d8e69 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Mon, 9 Jan 2017 08:23:45 +0100
Subject: HONEYCOMB-331: unify initialization handling

Due to incorrect instance of check, InitSubtreeReader was never created
in CompositeReaderRegistryBuilder.getSubtreeHandler().

As a consequence, initializers registered by subtreeAdd*, were not invoked.

The patch:
- fixes mentioned check,
- makes readers implement InitReader instead of directly
  implementing Initializer
- includes missing unit tests for GenericReaders.

Change-Id: I93be59fafddb60dce00191958b5c8c62e7c2d289
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 .../honeycomb/translate/impl/read/registry/InitSubtreeReader.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/InitSubtreeReader.java')

diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/InitSubtreeReader.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/InitSubtreeReader.java
index 809cdb214..e7cef8107 100644
--- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/InitSubtreeReader.java
+++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/InitSubtreeReader.java
@@ -21,7 +21,6 @@ import io.fd.honeycomb.translate.read.InitListReader;
 import io.fd.honeycomb.translate.read.InitReader;
 import io.fd.honeycomb.translate.read.ListReader;
 import io.fd.honeycomb.translate.read.ReadContext;
-import io.fd.honeycomb.translate.read.Reader;
 import java.util.Set;
 import javax.annotation.Nonnull;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -48,11 +47,11 @@ class InitSubtreeReader<O extends DataObject, B extends Builder<O>>
     /**
      * Wrap a Reader as an initializing subtree Reader.
      */
-    static <D extends DataObject, B extends Builder<D>> Reader<D, B> createForReader(@Nonnull final Set<InstanceIdentifier<?>> handledChildren,
-                                                                                     @Nonnull final Reader<D, B> reader) {
+    static <D extends DataObject, B extends Builder<D>> InitReader<D, B> createForReader(@Nonnull final Set<InstanceIdentifier<?>> handledChildren,
+                                                                                     @Nonnull final InitReader<D, B> reader) {
         return (reader instanceof ListReader)
                 ? new InitSubtreeListReader<>((InitListReader) reader, handledChildren)
-                : new InitSubtreeReader<>(((InitReader<D, B>) reader), handledChildren);
+                : new InitSubtreeReader<>(reader, handledChildren);
     }
 
     private static class InitSubtreeListReader<D extends DataObject & Identifiable<K>, B extends Builder<D>, K extends Identifier<D>>
-- 
cgit 1.2.3-korg