From ee1e0761d70281191400a8f85cc2e0c5156d2c3f Mon Sep 17 00:00:00 2001
From: Michael Vorburger <vorburger@redhat.com>
Date: Mon, 4 Jun 2018 16:18:49 +0200
Subject: [PATCH 1/1] move trace impl-blueprint.xml DI into
 TraceBindingBrokerWiring

JIRA: CONTROLLER-1831
Change-Id: I1621e94c43fd5ddef4f1697cf7b87422e7ce0e5b
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---
 .../md-sal/mdsal-trace/binding-impl/pom.xml   |  4 ++
 .../impl/TracingBindingBrokerWiring.java      | 41 +++++++++++++++++++
 .../opendaylight/blueprint/impl-blueprint.xml | 27 ++++++------
 3 files changed, 59 insertions(+), 13 deletions(-)
 create mode 100644 opendaylight/md-sal/mdsal-trace/binding-impl/src/main/java/org/opendaylight/controller/md/sal/trace/binding/impl/TracingBindingBrokerWiring.java

diff --git a/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml b/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml
index 1cfd7ea379..be8ce5c5b3 100644
--- a/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml
@@ -31,6 +31,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>${project.groupId}</groupId>
       <artifactId>mdsal-trace-dom-impl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-broker-impl</artifactId>
+    </dependency>
 
     <!-- Testing Dependencies -->
     <dependency>
diff --git a/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/java/org/opendaylight/controller/md/sal/trace/binding/impl/TracingBindingBrokerWiring.java b/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/java/org/opendaylight/controller/md/sal/trace/binding/impl/TracingBindingBrokerWiring.java
new file mode 100644
index 0000000000..0876ae0f44
--- /dev/null
+++ b/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/java/org/opendaylight/controller/md/sal/trace/binding/impl/TracingBindingBrokerWiring.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2018 Red Hat, 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.md.sal.trace.binding.impl;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.spi.AdapterFactory;
+import org.opendaylight.controller.md.sal.trace.api.TracingDOMDataBroker;
+
+/**
+ * Programmatic "wiring" for dependency injection.
+ *
+ * <p>See org.opendaylight.controller.md.sal.binding.impl.BindingBrokerWiring.
+ *
+ * @author Michael Vorburger.ch
+ */
+public class TracingBindingBrokerWiring {
+
+    private final DataBroker dataBroker;
+    private final DataBroker pingPongDataBroker;
+
+    public TracingBindingBrokerWiring(TracingDOMDataBroker tracingDOMDataBroker,
+            TracingDOMDataBroker tracingPingPongDOMDataBroker, AdapterFactory adapterFactory) {
+
+        dataBroker = adapterFactory.createDataBroker(tracingDOMDataBroker);
+        pingPongDataBroker = adapterFactory.createDataBroker(tracingPingPongDOMDataBroker);
+    }
+
+    public DataBroker getTracingDataBroker() {
+        return dataBroker;
+    }
+
+    public DataBroker getTracingPingPongDataBroker() {
+        return pingPongDataBroker;
+    }
+
+}
diff --git a/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 6f362132c6..30b8a99746 100644
--- a/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -12,28 +12,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
   odl:use-default-for-reference-types="true">
 
+  <reference id="adapterFactory" interface="org.opendaylight.controller.md.sal.binding.spi.AdapterFactory"/>
+
   <reference id="tracingDefaultDOMBroker"
       interface="org.opendaylight.controller.md.sal.trace.api.TracingDOMDataBroker"
       odl:type="default" />
 
-  <reference id="adapterFactory" interface="org.opendaylight.controller.md.sal.binding.spi.AdapterFactory"/>
-
-  <bean id="tracingBindingDataBroker" factory-ref="adapterFactory" factory-method="createDataBroker">
-    <argument ref="tracingDefaultDOMBroker"/>
-  </bean>
-
-  <service id="tracingBindingDataBrokerSvc" ref="tracingBindingDataBroker"
-            interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-            odl:type="default" ranking="10"/>
-
   <reference id="tracingPingPongDOMDataBroker"
       interface="org.opendaylight.controller.md.sal.trace.api.TracingDOMDataBroker"
       odl:type="pingpong"/>
 
-  <bean id="bindingTracingPingPongDataBroker" factory-ref="adapterFactory" factory-method="createDataBroker">
+  <bean id="wiring" class="org.opendaylight.controller.md.sal.trace.binding.impl.TracingBindingBrokerWiring">
+    <argument ref="tracingDefaultDOMBroker"/>
     <argument ref="tracingPingPongDOMDataBroker"/>
+    <argument ref="adapterFactory"/>
   </bean>
 
-  <service ref="bindingTracingPingPongDataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-                                                                                    odl:type="pingpong" ranking="10"/>
+  <bean id="tracingBindingDataBroker" factory-ref="wiring" factory-method="getTracingDataBroker" />
+  <service id="tracingBindingDataBrokerSvc" ref="tracingBindingDataBroker"
+           interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+           odl:type="default" ranking="10"/>
+
+  <bean id="bindingTracingPingPongDataBroker" factory-ref="wiring" factory-method="getTracingPingPongDataBroker" />
+  <service ref="bindingTracingPingPongDataBroker"
+           interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+           odl:type="pingpong" ranking="10"/>
 </blueprint>
-- 
2.36.6