Renamed controller.md.sal.binding.impl to mdsal.binding.dom.adapter 86/25886/2
authorTony Tkacik <ttkacik@cisco.com>
Mon, 24 Aug 2015 14:29:48 +0000 (16:29 +0200)
committerTony Tkacik <ttkacik@cisco.com>
Mon, 24 Aug 2015 16:04:59 +0000 (18:04 +0200)
Change-Id: Ie6ad34615f89c84b3ff0b7a5bfc51703eb758db9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
71 files changed:
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/SingletonHolder.java [deleted file]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBroker.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java with 99% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedTransaction.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractReadWriteTransaction.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractReadWriteTransaction.java with 93% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractWriteTransaction.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java with 99% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterBuilder.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java with 95% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterBuilder.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMAdapterBuilder.java with 90% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterLoader.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMAdapterLoader.java with 88% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataBrokerAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataBrokerAdapter.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeListenerAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataTreeChangeListenerAdapter.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeServiceAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataTreeChangeServiceAdapter.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointListenerAdapter.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationListenerAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationListenerAdapter.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationPublishServiceAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationPublishServiceAdapter.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationServiceAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationServiceAdapter.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMReadTransactionAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMReadTransactionAdapter.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMReadWriteTransactionAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMReadWriteTransactionAdapter.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcAdapterRegistration.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcAdapterRegistration.java with 94% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcImplementationAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcImplementationAdapter.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcProviderServiceAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcProviderServiceAdapter.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcServiceAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcServiceAdapter.java with 95% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMTransactionChainAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java with 99% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMWriteTransactionAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDataTreeChangeListenerRegistration.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataTreeChangeListenerRegistration.java with 94% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingMountPointAdapter.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingRpcAdapterRegistration.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingRpcAdapterRegistration.java with 94% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingStructuralType.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java with 99% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ContextReferenceExtractor.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ContextReferenceExtractor.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/DirectGetterRouteContextExtractor.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/DirectGetterRouteContextExtractor.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/FutureSchema.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/FutureSchema.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/GetValueRouteContextExtractor.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/GetValueRouteContextExtractor.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDOMRpcResultFuture.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDOMRpcResultFuture.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataObjectModification.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDataObjectModification.java with 99% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataTreeModification.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDataTreeModification.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNode.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazySerializedContainerNode.java with 98% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedDOMNotification.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazySerializedDOMNotification.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java [moved from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/RpcServiceAdapter.java with 99% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarListener.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarUpdate.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/CompositeListener.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FlowDelete.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooListener.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooService.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooUpdate.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/Grouping.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/InheritedContextInput.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/ReferencableObject.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/ReferencableObjectKey.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/SimpleInput.java [deleted file]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ContextExtractorTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/ContextExtractorTest.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataBrokerTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataBrokerTest.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataChangeListenerTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataChangeListenerTest.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractNotificationBrokerTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractNotificationBrokerTest.java with 93% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractSchemaAwareTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractSchemaAwareTest.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AssertCollections.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/test/AssertCollections.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/BindingDOMDataBrokerAdapterTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BindingDOMDataBrokerAdapterTest.java with 93% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/BindingNormalizedCodecTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BindingNormalizedCodecTest.java with 94% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1125RegressionTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1125RegressionTest.java with 94% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1333DataChangeListenerTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java with 95% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug1418AugmentationTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1418AugmentationTest.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataBrokerTestCustomizer.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java with 91% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/DataTreeChangeListenerTest.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/ForwardedNotificationAdapterTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ForwardedNotificationAdapterTest.java with 97% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/ListInsertionDataChangeListenerTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ListInsertionDataChangeListenerTest.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/WriteTransactionTest.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/WriteTransactionTest.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingBrokerTestFactory.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java with 96% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingTestContext.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java with 93% similarity]
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/MockSchemaService.java [moved from binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/util/MockSchemaService.java with 97% similarity]

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/SingletonHolder.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/SingletonHolder.java
deleted file mode 100644 (file)
index 6bcd74d..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.codegen.impl;
-
-import com.google.common.util.concurrent.ForwardingBlockingQueue;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import javassist.ClassPool;
-import org.apache.commons.lang3.StringUtils;
-import org.opendaylight.yangtools.sal.binding.generator.util.JavassistUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SingletonHolder {
-    private static final Logger logger = LoggerFactory.getLogger(SingletonHolder.class);
-
-    public static final ClassPool CLASS_POOL = ClassPool.getDefault();
-    public static final JavassistUtils JAVASSIST = JavassistUtils.forClassPool(CLASS_POOL);
-
-    public static final int CORE_NOTIFICATION_THREADS = 4;
-    public static final int MAX_NOTIFICATION_THREADS = 32;
-    // block caller thread after MAX_NOTIFICATION_THREADS + MAX_NOTIFICATION_QUEUE_SIZE pending notifications
-    public static final int MAX_NOTIFICATION_QUEUE_SIZE = 1000;
-    public static final int NOTIFICATION_THREAD_LIFE = 15;
-    private static final String NOTIFICATION_QUEUE_SIZE_PROPERTY = "mdsal.notificationqueue.size";
-
-    private static ListeningExecutorService NOTIFICATION_EXECUTOR = null;
-    private static ListeningExecutorService COMMIT_EXECUTOR = null;
-    private static ListeningExecutorService CHANGE_EVENT_EXECUTOR = null;
-
-    /**
-     * @deprecated This method is only used from configuration modules and thus callers of it
-     *             should use service injection to make the executor configurable.
-     */
-    @Deprecated
-    public static synchronized ListeningExecutorService getDefaultNotificationExecutor() {
-
-        if (NOTIFICATION_EXECUTOR == null) {
-            int queueSize = MAX_NOTIFICATION_QUEUE_SIZE;
-            final String queueValue = System.getProperty(NOTIFICATION_QUEUE_SIZE_PROPERTY);
-            if (StringUtils.isNotBlank(queueValue)) {
-                try {
-                    queueSize = Integer.parseInt(queueValue);
-                    logger.trace("Queue size was set to {}", queueSize);
-                } catch (final NumberFormatException e) {
-                    logger.warn("Cannot parse {} as set by {}, using default {}", queueValue,
-                            NOTIFICATION_QUEUE_SIZE_PROPERTY, queueSize);
-                }
-            }
-
-            // Overriding the queue:
-            // ThreadPoolExecutor would not create new threads if the queue is not full, thus adding
-            // occurs in RejectedExecutionHandler.
-            // This impl saturates threadpool first, then queue. When both are full caller will get blocked.
-            final BlockingQueue<Runnable> delegate = new LinkedBlockingQueue<>(queueSize);
-            final BlockingQueue<Runnable> queue = new ForwardingBlockingQueue<Runnable>() {
-                @Override
-                protected BlockingQueue<Runnable> delegate() {
-                    return delegate;
-                }
-
-                @Override
-                public boolean offer(final Runnable r) {
-                    // ThreadPoolExecutor will spawn a new thread after core size is reached only
-                    // if the queue.offer returns false.
-                    return false;
-                }
-            };
-
-            final ThreadFactory factory = new ThreadFactoryBuilder()
-            .setDaemon(true)
-            .setNameFormat("md-sal-binding-notification-%d")
-            .build();
-
-            final ThreadPoolExecutor executor = new ThreadPoolExecutor(CORE_NOTIFICATION_THREADS, MAX_NOTIFICATION_THREADS,
-                    NOTIFICATION_THREAD_LIFE, TimeUnit.SECONDS, queue, factory,
-                    new RejectedExecutionHandler() {
-                // if the max threads are met, then it will raise a rejectedExecution. We then push to the queue.
-                @Override
-                public void rejectedExecution(final Runnable r, final ThreadPoolExecutor executor) {
-                    try {
-                        executor.getQueue().put(r);
-                    } catch (final InterruptedException e) {
-                        throw new RejectedExecutionException("Interrupted while waiting on the queue", e);
-                    }
-                }
-            });
-
-            NOTIFICATION_EXECUTOR = MoreExecutors.listeningDecorator(executor);
-        }
-
-        return NOTIFICATION_EXECUTOR;
-    }
-
-    /**
-     * @deprecated This method is only used from configuration modules and thus callers of it
-     *             should use service injection to make the executor configurable.
-     */
-    @Deprecated
-    public static synchronized ListeningExecutorService getDefaultCommitExecutor() {
-        if (COMMIT_EXECUTOR == null) {
-            final ThreadFactory factory = new ThreadFactoryBuilder().setDaemon(true).setNameFormat("md-sal-binding-commit-%d").build();
-            /*
-             * FIXME: this used to be newCacheThreadPool(), but MD-SAL does not have transaction
-             *        ordering guarantees, which means that using a concurrent threadpool results
-             *        in application data being committed in random order, potentially resulting
-             *        in inconsistent data being present. Once proper primitives are introduced,
-             *        concurrency can be reintroduced.
-             */
-            final ExecutorService executor = Executors.newSingleThreadExecutor(factory);
-            COMMIT_EXECUTOR = MoreExecutors.listeningDecorator(executor);
-        }
-
-        return COMMIT_EXECUTOR;
-    }
-
-    public static ExecutorService getDefaultChangeEventExecutor() {
-        if (CHANGE_EVENT_EXECUTOR == null) {
-            final ThreadFactory factory = new ThreadFactoryBuilder().setDaemon(true).setNameFormat("md-sal-binding-change-%d").build();
-            /*
-             * FIXME: this used to be newCacheThreadPool(), but MD-SAL does not have transaction
-             *        ordering guarantees, which means that using a concurrent threadpool results
-             *        in application data being committed in random order, potentially resulting
-             *        in inconsistent data being present. Once proper primitives are introduced,
-             *        concurrency can be reintroduced.
-             */
-            final ExecutorService executor = Executors.newSingleThreadExecutor(factory);
-            CHANGE_EVENT_EXECUTOR  = MoreExecutors.listeningDecorator(executor);
-        }
-
-        return CHANGE_EVENT_EXECUTOR;
-    }
-}
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
 import org.slf4j.Logger;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.spi;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 
 import com.google.common.base.Preconditions;
similarity index 95%
rename from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java
rename to binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java
index 7919a8fba4e7f825c4f486a3a8254e2d24a6b6da..385770a1cb18819e5fc3f445493fced846845c10 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.spi;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Optional;
 import com.google.common.cache.CacheLoader;
@@ -5,12 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ClassToInstanceMap;
 import org.opendaylight.controller.md.sal.binding.api.BindingService;
-import org.opendaylight.controller.md.sal.binding.spi.AdapterBuilder;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 
 abstract class BindingDOMAdapterBuilder<T extends BindingService> extends AdapterBuilder<T, DOMService> {
@@ -5,8 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
@@ -14,9 +15,6 @@ import org.opendaylight.controller.md.sal.binding.api.BindingService;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMAdapterBuilder.Factory;
-import org.opendaylight.controller.md.sal.binding.spi.AdapterBuilder;
-import org.opendaylight.controller.md.sal.binding.spi.AdapterLoader;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
 
@@ -5,9 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
+
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
@@ -19,7 +21,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMAdapterBuilder.Factory;
 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.DOMDataTreeChangeService;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Preconditions;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Optional;
 import org.opendaylight.controller.md.sal.binding.api.MountPointService.MountPointListener;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Optional;
 import com.google.common.cache.CacheBuilder;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.reflect.TypeToken;
@@ -5,7 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
+
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
 
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableSet;
@@ -13,7 +15,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMAdapterBuilder.Factory;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
@@ -5,13 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
+
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
 
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMAdapterBuilder.Factory;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationRegistration;
 import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Preconditions;
 import com.google.common.cache.Cache;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.collect.ImmutableSet;
 import java.lang.reflect.Method;
@@ -5,7 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
+
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
 
 import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
@@ -14,7 +16,6 @@ import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMAdapterBuilder.Factory;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.CheckedFuture;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Preconditions;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Optional;
 import com.google.common.cache.CacheBuilder;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationRegistration;
 import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Optional;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
similarity index 98%
rename from binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/controller/md/sal/binding/impl/FutureSchema.java
rename to binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/FutureSchema.java
index 2898ba7e37ca9729e0f0c113f8e6d34da3f9a188..7719bb0bab7e465777ca1db94701953ad8aa07d1 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Throwables;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
 import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer;
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarListener.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarListener.java
deleted file mode 100644 (file)
index 6c13372..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-import org.opendaylight.yangtools.yang.binding.NotificationListener;
-
-public interface BarListener extends NotificationListener {
-
-    void onBarUpdate(BarUpdate notification);
-
-    void onFlowDelete(FlowDelete notification);
-
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarUpdate.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarUpdate.java
deleted file mode 100644 (file)
index 45f0313..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-import org.opendaylight.yangtools.yang.binding.Notification;
-
-public interface BarUpdate extends Grouping,Notification {
-
-
-
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/CompositeListener.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/CompositeListener.java
deleted file mode 100644 (file)
index d9f752f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-public interface CompositeListener extends FooListener,BarListener {
-
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FlowDelete.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FlowDelete.java
deleted file mode 100644 (file)
index 4a28aaa..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-import org.opendaylight.yangtools.yang.binding.Notification;
-
-public interface FlowDelete extends Notification{
-
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooListener.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooListener.java
deleted file mode 100644 (file)
index cb8020e..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-import org.opendaylight.yangtools.yang.binding.NotificationListener;
-
-public interface FooListener extends NotificationListener {
-
-    void onFooUpdate(FooUpdate notification);
-
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooService.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooService.java
deleted file mode 100644 (file)
index 2bd2119..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-import java.util.concurrent.Future;
-
-import org.opendaylight.yangtools.yang.binding.RpcService;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-
-public interface FooService extends RpcService {
-
-    Future<RpcResult<Void>> foo();
-
-    Future<RpcResult<Void>> simple(SimpleInput obj);
-
-    Future<RpcResult<Void>> inheritedContext(InheritedContextInput obj);
-
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooUpdate.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooUpdate.java
deleted file mode 100644 (file)
index faf4576..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-import org.opendaylight.yangtools.yang.binding.Notification;
-
-public interface FooUpdate extends Notification {
-
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/Grouping.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/Grouping.java
deleted file mode 100644 (file)
index 5864845..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-import org.opendaylight.yangtools.yang.binding.BaseIdentity;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.annotations.RoutingContext;
-
-public interface Grouping {
-
-    @RoutingContext(BaseIdentity.class)
-    InstanceIdentifier<?> getInheritedIdentifier();
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/InheritedContextInput.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/InheritedContextInput.java
deleted file mode 100644 (file)
index 90375a0..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-public interface InheritedContextInput extends Grouping {
-
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/ReferencableObject.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/ReferencableObject.java
deleted file mode 100644 (file)
index fa56507..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-import org.opendaylight.yangtools.yang.binding.ChildOf;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.DataRoot;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-
-public interface ReferencableObject extends DataObject,
-    Identifiable<ReferencableObjectKey>,ChildOf<DataRoot>{
-
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/ReferencableObjectKey.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/ReferencableObjectKey.java
deleted file mode 100644 (file)
index 68d7f6c..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-import org.opendaylight.yangtools.yang.binding.Identifier;
-
-public class ReferencableObjectKey implements Identifier<ReferencableObject> {
-    private static final long serialVersionUID = 1L;
-    final Integer value;
-
-    public ReferencableObjectKey(Integer _value) {
-        this.value = _value;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((value == null) ? 0 : value.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        ReferencableObjectKey other = (ReferencableObjectKey) obj;
-        if (value == null) {
-            if (other.value != null)
-                return false;
-        } else if (!value.equals(other.value))
-            return false;
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "ReferencableObjectKey [value=" + value + "]";
-    }
-
-
-}
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/SimpleInput.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/mock/SimpleInput.java
deleted file mode 100644 (file)
index 0a38c90..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.binding.test.mock;
-
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.BaseIdentity;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.annotations.RoutingContext;
-
-public interface SimpleInput extends DataObject,Augmentable<SimpleInput> {
-
-    @RoutingContext(BaseIdentity.class)
-    InstanceIdentifier<?> getIdentifier();
-}
@@ -5,11 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl;
+package org.opendaylight.mdsal.binding.dom.adapter;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
+import org.opendaylight.mdsal.binding.dom.adapter.ContextReferenceExtractor;
+
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.RockTheHouseInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.RockTheHouseInputBuilder;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -5,11 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
+
+import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
 
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
 import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import org.junit.Before;
 import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext;
@@ -6,7 +6,10 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.md.sal.binding.impl.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
+
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMDataBrokerAdapter;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -15,8 +18,6 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataChangeListener;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -6,14 +6,12 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.md.sal.binding.impl.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import static org.junit.Assert.assertTrue;
-
+import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
 import javassist.ClassPool;
 import org.junit.Test;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
-import org.opendaylight.controller.md.sal.binding.test.AbstractSchemaAwareTest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeLeafOnlyAugment;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
@@ -6,17 +6,15 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.md.sal.binding.impl.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
-import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertContains;
-import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertEmpty;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_FOO_KEY;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.path;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList;
-
+import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertContains;
+import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertEmpty;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.binding.test.AbstractDataChangeListenerTest;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -5,11 +5,8 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
-import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertContains;
-import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertEmpty;
-import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertNotContains;
 import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.CONFIGURATION;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_FOO_KEY;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.USES_ONE_KEY;
@@ -18,10 +15,11 @@ import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUti
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.path;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.top;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList;
-
+import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertContains;
+import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertEmpty;
+import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertNotContains;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.binding.test.AbstractDataChangeListenerTest;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -6,20 +6,18 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.md.sal.binding.impl.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import static org.junit.Assert.assertTrue;
-import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertContains;
-import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertEmpty;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_FOO_KEY;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.complexUsesAugment;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.leafOnlyUsesAugment;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.top;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList;
-
+import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertContains;
+import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertEmpty;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.binding.test.AbstractDataChangeListenerTest;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -5,8 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
+import org.opendaylight.mdsal.binding.dom.adapter.test.util.MockSchemaService;
+
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMDataBrokerAdapter;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationPublishServiceAdapter;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationServiceAdapter;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -14,16 +20,11 @@ import javassist.ClassPool;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter;
 import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
-import org.opendaylight.controller.sal.binding.test.util.MockSchemaService;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.controller.sal.core.spi.data.DOMStore;
 import org.opendaylight.yangtools.binding.data.codec.gen.impl.DataObjectSerializerGenerator;
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.md.sal.binding.impl.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -18,7 +18,7 @@ import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUti
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.path;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.top;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList;
-
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMDataBrokerAdapter;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.SettableFuture;
@@ -32,8 +32,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter;
-import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
@@ -5,12 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import java.util.ArrayList;
@@ -22,7 +21,6 @@ import java.util.concurrent.TimeoutException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.md.sal.binding.test.AbstractNotificationBrokerTest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.OpendaylightMdsalBindingTestListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.TwoLevelListChanged;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.TwoLevelListChangedBuilder;
@@ -5,22 +5,20 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 import static org.junit.Assert.assertFalse;
-import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertContains;
-import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertEmpty;
-import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertNotContains;
 import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.CONFIGURATION;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_BAR_KEY;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_FOO_KEY;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.top;
 import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList;
-
+import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertContains;
+import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertEmpty;
+import static org.opendaylight.mdsal.binding.dom.adapter.test.AssertCollections.assertNotContains;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.binding.test.AbstractDataChangeListenerTest;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
@@ -5,16 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.md.sal.binding.impl.test;
+package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import static org.junit.Assert.assertTrue;
-
 import com.google.common.base.Optional;
 import java.util.concurrent.ExecutionException;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.sal.binding.test.util;
+package org.opendaylight.mdsal.binding.dom.adapter.test.util;
 
 import java.util.concurrent.ExecutorService;
 
@@ -5,10 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.sal.binding.test.util;
+package org.opendaylight.mdsal.binding.dom.adapter.test.util;
 
 import static com.google.common.base.Preconditions.checkState;
 
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMDataBrokerAdapter;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMMountPointServiceAdapter;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationPublishServiceAdapter;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationServiceAdapter;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMRpcProviderServiceAdapter;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMRpcServiceAdapter;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
+
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
@@ -22,13 +30,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.MountPointService;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMMountPointServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcProviderServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.sal.binding.test.util;
+package org.opendaylight.mdsal.binding.dom.adapter.test.util;
 
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;