From 5bfe1eda85fefc944026d11604b50c84637799d3 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 5 Jun 2024 12:13:38 +0200
Subject: [PATCH] Do not use odl:type=default

We have a single source of DataBroker, hence we should not be specifying
the odl:type property -- it is going away anyway.

Change-Id: Ideccc19b82c4d80eafdd0800f9fb808ce5fed415
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../org/opendaylight/blueprint/address-tracker.xml          | 6 ++----
 .../resources/org/opendaylight/blueprint/arp-handler.xml    | 6 ++----
 .../resources/org/opendaylight/blueprint/host-tracker.xml   | 6 ++----
 .../resources/org/opendaylight/blueprint/l2switch-impl.xml  | 6 ++----
 .../resources/org/opendaylight/blueprint/loop-remover.xml   | 6 ++----
 .../resources/org/opendaylight/blueprint/packet-handler.xml | 4 +---
 6 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/addresstracker/implementation/src/main/resources/org/opendaylight/blueprint/address-tracker.xml b/addresstracker/implementation/src/main/resources/org/opendaylight/blueprint/address-tracker.xml
index c443f4fb..7fa3e2f3 100644
--- a/addresstracker/implementation/src/main/resources/org/opendaylight/blueprint/address-tracker.xml
+++ b/addresstracker/implementation/src/main/resources/org/opendaylight/blueprint/address-tracker.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker"
-    interface="org.opendaylight.mdsal.binding.api.DataBroker"
-    odl:type="default" />
+    interface="org.opendaylight.mdsal.binding.api.DataBroker" />
   <reference id="notificationProviderService"
     interface="org.opendaylight.mdsal.binding.api.NotificationService" />
 
diff --git a/arphandler/src/main/resources/org/opendaylight/blueprint/arp-handler.xml b/arphandler/src/main/resources/org/opendaylight/blueprint/arp-handler.xml
index e23c51d0..6217227b 100644
--- a/arphandler/src/main/resources/org/opendaylight/blueprint/arp-handler.xml
+++ b/arphandler/src/main/resources/org/opendaylight/blueprint/arp-handler.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker"
-    interface="org.opendaylight.mdsal.binding.api.DataBroker"
-    odl:type="default" />
+    interface="org.opendaylight.mdsal.binding.api.DataBroker" />
   <reference id="notificationProviderService"
     interface="org.opendaylight.mdsal.binding.api.NotificationService" />
 
diff --git a/hosttracker/implementation/src/main/resources/org/opendaylight/blueprint/host-tracker.xml b/hosttracker/implementation/src/main/resources/org/opendaylight/blueprint/host-tracker.xml
index 1226a915..a8249ff8 100644
--- a/hosttracker/implementation/src/main/resources/org/opendaylight/blueprint/host-tracker.xml
+++ b/hosttracker/implementation/src/main/resources/org/opendaylight/blueprint/host-tracker.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker"
-    interface="org.opendaylight.mdsal.binding.api.DataBroker"
-    odl:type="default" />
+    interface="org.opendaylight.mdsal.binding.api.DataBroker" />
 
   <odl:clustered-app-config id="hostTrackerConfig"
     binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.l2switch.host.tracker.config.rev140528.HostTrackerConfig">
diff --git a/l2switch-main/src/main/resources/org/opendaylight/blueprint/l2switch-impl.xml b/l2switch-main/src/main/resources/org/opendaylight/blueprint/l2switch-impl.xml
index ab16957f..c6291a42 100644
--- a/l2switch-main/src/main/resources/org/opendaylight/blueprint/l2switch-impl.xml
+++ b/l2switch-main/src/main/resources/org/opendaylight/blueprint/l2switch-impl.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker"
-    interface="org.opendaylight.mdsal.binding.api.DataBroker"
-    odl:type="default" />
+    interface="org.opendaylight.mdsal.binding.api.DataBroker" />
   <reference id="notificationPublishService"
     interface="org.opendaylight.mdsal.binding.api.NotificationService" />
 
diff --git a/loopremover/implementation/src/main/resources/org/opendaylight/blueprint/loop-remover.xml b/loopremover/implementation/src/main/resources/org/opendaylight/blueprint/loop-remover.xml
index 05805420..41d37dec 100644
--- a/loopremover/implementation/src/main/resources/org/opendaylight/blueprint/loop-remover.xml
+++ b/loopremover/implementation/src/main/resources/org/opendaylight/blueprint/loop-remover.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker"
-    interface="org.opendaylight.mdsal.binding.api.DataBroker"
-    odl:type="default" />
+    interface="org.opendaylight.mdsal.binding.api.DataBroker" />
 
   <odl:clustered-app-config id="loopRemoverConfig"
     binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.loop.remover.config.rev140528.LoopRemoverConfig">
diff --git a/packethandler/implementation/src/main/resources/org/opendaylight/blueprint/packet-handler.xml b/packethandler/implementation/src/main/resources/org/opendaylight/blueprint/packet-handler.xml
index 7be100cd..361cef08 100644
--- a/packethandler/implementation/src/main/resources/org/opendaylight/blueprint/packet-handler.xml
+++ b/packethandler/implementation/src/main/resources/org/opendaylight/blueprint/packet-handler.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-  odl:use-default-for-reference-types="true">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
   <reference id="notificationPublishService"
              interface="org.opendaylight.mdsal.binding.api.NotificationPublishService" />
-- 
2.36.6