1 files changed, 1 insertions, 71 deletions
diff --git a/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/DataBrokerModule.java b/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/DataBrokerModule.java
index 24e34c0a9..8aa3d64d9 100644
--- a/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/DataBrokerModule.java
+++ b/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/DataBrokerModule.java
@@ -1,19 +1,6 @@
 package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210;
 
 import io.fd.honeycomb.v3po.data.impl.DataBroker;
-import java.util.Map;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBrokerExtension;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataChangeListener;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,63 +29,6 @@ public class DataBrokerModule extends
     @Override
     public java.lang.AutoCloseable createInstance() {
         LOG.debug("DataBrokerModule.createInstance()");
-        return new CloseableDataBroker(
-                new DataBroker(getOperationalDataTreeDependency(), getConfigDataTreeDependency()));
-    }
-
-    private static final class CloseableDataBroker implements AutoCloseable, DOMDataBroker {
-
-        private final DataBroker delegate;
-
-        CloseableDataBroker(final DataBroker delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void close() throws Exception {
-            LOG.debug("CloseableDataBroker.close()");
-            // NOP
-        }
-
-        @Override
-        public DOMDataReadOnlyTransaction newReadOnlyTransaction() {
-            LOG.trace("CloseableDataBroker.newReadOnlyTransaction()");
-            return delegate.newReadOnlyTransaction();
-        }
-
-        @Override
-        public DOMDataReadWriteTransaction newReadWriteTransaction() {
-            LOG.trace("CloseableDataBroker.newReadWriteTransaction()");
-            return delegate.newReadWriteTransaction();
-        }
-
-        @Override
-        public DOMDataWriteTransaction newWriteOnlyTransaction() {
-            LOG.trace("CloseableDataBroker.newWriteOnlyTransaction()");
-            return delegate.newWriteOnlyTransaction();
-        }
-
-        @Override
-        public ListenerRegistration<DOMDataChangeListener> registerDataChangeListener(final LogicalDatastoreType store,
-                                                                                      final YangInstanceIdentifier path,
-                                                                                      final DOMDataChangeListener listener,
-                                                                                      final DataChangeScope triggeringScope) {
-            LOG.trace("CloseableDataBroker.createTransactionChain store={}, path={}, listener={}, triggeringScope={}",
-                    store, path, listener, triggeringScope);
-            return delegate.registerDataChangeListener(store, path, listener, triggeringScope);
-        }
-
-        @Override
-        public DOMTransactionChain createTransactionChain(final TransactionChainListener listener) {
-            LOG.trace("CloseableDataBroker.createTransactionChain listener={}", listener);
-            return delegate.createTransactionChain(listener);
-        }
-
-        @Nonnull
-        @Override
-        public Map<Class<? extends DOMDataBrokerExtension>, DOMDataBrokerExtension> getSupportedExtensions() {
-            LOG.trace("CloseableDataBroker.getSupportedExtensions()");
-            return delegate.getSupportedExtensions();
-        }
+        return DataBroker.create(getConfigDataTreeDependency(), getOperationalDataTreeDependency());
     }
 }