From 28208ac2b1b9e068c51eee79cf1bfedc6a818195 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Tue, 12 Apr 2016 10:13:37 +0200
Subject: HONEYCOMB-9: Migrate Interface listener

Change-Id: Iffde1ee21b749a8c8efa96c243f7f8bb0811b4c7
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 .../InterfacesStateHoneycombReaderModule.java      | 46 +---------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

(limited to 'v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java')

diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java
index 5b79ff0d3..aa72a29af 100644
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java
+++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java
@@ -1,14 +1,11 @@
 package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
 
-import com.google.common.base.Optional;
 import io.fd.honeycomb.v3po.translate.impl.read.CompositeChildReader;
 import io.fd.honeycomb.v3po.translate.impl.read.CompositeListReader;
 import io.fd.honeycomb.v3po.translate.impl.read.CompositeRootReader;
 import io.fd.honeycomb.v3po.translate.read.ChildReader;
-import io.fd.honeycomb.v3po.translate.read.ReadContext;
-import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
-import io.fd.honeycomb.v3po.translate.read.Reader;
 import io.fd.honeycomb.v3po.translate.util.RWUtils;
+import io.fd.honeycomb.v3po.translate.util.read.CloseableReader;
 import io.fd.honeycomb.v3po.translate.util.read.ReflexiveRootReaderCustomizer;
 import io.fd.honeycomb.v3po.translate.v3po.interfacesstate.InterfaceCustomizer;
 import io.fd.honeycomb.v3po.translate.v3po.interfacesstate.VppInterfaceStateCustomizer;
@@ -17,14 +14,9 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
 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.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceStateAugmentation;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.openvpp.vppjapi.vppApi;
 
-import javax.annotation.Nonnull;
-
 public class InterfacesStateHoneycombReaderModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesStateHoneycombReaderModule {
     public InterfacesStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
@@ -53,44 +45,10 @@ public class InterfacesStateHoneycombReaderModule extends org.opendaylight.yang.
                         RWUtils.<Interface>singletonAugReaderList(vppInterfaceStateAugmentationChildReader),
                         new InterfaceCustomizer(vppApi));
 
-        return new CloseableReader(new CompositeRootReader<>(
+        return new CloseableReader<>(new CompositeRootReader<>(
                 InterfacesState.class,
                 RWUtils.singletonChildReaderList(interfaceReader),
                 RWUtils.<InterfacesState>emptyAugReaderList(),
                 new ReflexiveRootReaderCustomizer<>(InterfacesStateBuilder.class)));
     }
-
-
-    private static final class CloseableReader implements Reader<InterfacesState>, AutoCloseable {
-
-        private CompositeRootReader<InterfacesState, InterfacesStateBuilder> compositeRootReader;
-
-        public CloseableReader(
-                final CompositeRootReader<InterfacesState, InterfacesStateBuilder> compositeRootReader) {
-            this.compositeRootReader = compositeRootReader;
-        }
-
-        @Nonnull
-        @Override
-        public Optional<? extends DataObject> read(@Nonnull InstanceIdentifier<? extends DataObject> id,
-                                                   @Nonnull ReadContext ctx) throws ReadFailedException {
-            return compositeRootReader.read(id, ctx);
-        }
-
-        @Nonnull
-        @Override
-        public InstanceIdentifier<InterfacesState> getManagedDataObjectType() {
-            return compositeRootReader.getManagedDataObjectType();
-        }
-
-        @Override
-        public String toString() {
-            return compositeRootReader.toString();
-        }
-
-        @Override
-        public void close() throws Exception {
-            //NOOP
-        }
-    }
 }
-- 
cgit 1.2.3-korg