Do not use blueprint-maven-plugin in southbound

blueprint-maven-plugin is unmaintained upstream. Generated wiring is
quite simple and should be converted to OSGi DS. As a first step capture
autowire.xml content so we know what we are dealing with.

Change-Id: I95c567c0907ad580a3639bc2365b1087f377db3c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml
index 2b21cb9b274db987f30dbb0a6668c7c180ae4aca..bae9b02cb8e31ac23a734761cb5c31cebfde835c 100644 (file)
--- a/southbound/southbound-impl/pom.xml
+++ b/southbound/southbound-impl/pom.xml
@@ -101,11 +101,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>javax.inject</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.aries.blueprint</groupId>
-      <artifactId>blueprint-maven-plugin-annotation</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
@@ -145,13 +140,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </dependencies>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>blueprint-maven-plugin</artifactId>
-        <configuration>
-          <scanPaths>org.opendaylight.ovsdb.southbound</scanPaths>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbDiagStatusProvider.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbDiagStatusProvider.java
index 20df00fa2fc6253f086706c8e3606187a573aac7..feb6ae8684dd9ea3e8e523db72867dc43fc0c752 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbDiagStatusProvider.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbDiagStatusProvider.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.ovsdb.southbound;
 
-import org.apache.aries.blueprint.annotation.service.Service;
 import org.opendaylight.infrautils.diagstatus.DiagStatusService;
 import org.opendaylight.infrautils.diagstatus.ServiceDescriptor;
 import org.opendaylight.infrautils.diagstatus.ServiceState;
@@ -15,7 +14,6 @@ import org.opendaylight.infrautils.diagstatus.ServiceStatusProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Service(classes = ServiceStatusProvider.class)
 public class OvsdbDiagStatusProvider implements ServiceStatusProvider {
 
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbDiagStatusProvider.class);
@@ -30,7 +28,7 @@ public class OvsdbDiagStatusProvider implements ServiceStatusProvider {
     }
 
 
-    public void reportStatus(ServiceState serviceState, String description) {
+    public void reportStatus(final ServiceState serviceState, final String description) {
         LOG.debug("reporting status as {} for {}", serviceState, OVSDB_SERVICE_NAME);
         serviceDescriptor = new ServiceDescriptor(OVSDB_SERVICE_NAME, serviceState, description);
         diagStatusService.report(serviceDescriptor);

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
index 280761c5ee7765942b263a6ba49011445a00d46d..72fe7ad13defc4c79821bedb2aa9ef5a35484f73 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
@@ -19,7 +19,6 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.apache.aries.blueprint.annotation.service.Reference;
 import org.opendaylight.infrautils.diagstatus.DiagStatusService;
 import org.opendaylight.infrautils.diagstatus.ServiceState;
 import org.opendaylight.infrautils.ready.SystemReadyMonitor;
@@ -84,21 +83,20 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
     private OvsdbUpgradeStateListener ovsdbUpgradeStateListener;
 
     @Inject
-    public SouthboundProvider(@Reference final DataBroker dataBroker,
-                              @Reference final EntityOwnershipService entityOwnershipServiceDependency,
-                              @Reference final OvsdbConnection ovsdbConnection,
-                              @Reference final DOMSchemaService schemaService,
-                              @Reference final BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer,
-                              @Reference final SystemReadyMonitor systemReadyMonitor,
-                              @Reference final DiagStatusService diagStatusService,
-                              @Reference final UpgradeState upgradeState) {
+    public SouthboundProvider(final DataBroker dataBroker,
+                              final EntityOwnershipService entityOwnershipServiceDependency,
+                              final OvsdbConnection ovsdbConnection,
+                              final DOMSchemaService schemaService,
+                              final BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer,
+                              final SystemReadyMonitor systemReadyMonitor,
+                              final DiagStatusService diagStatusService,
+                              final UpgradeState upgradeState) {
         SouthboundProvider.db = dataBroker;
-        this.entityOwnershipService = entityOwnershipServiceDependency;
+        entityOwnershipService = entityOwnershipServiceDependency;
         registration = null;
         this.ovsdbConnection = ovsdbConnection;
-        this.ovsdbStatusProvider = new OvsdbDiagStatusProvider(diagStatusService);
-        this.instanceIdentifierCodec = new InstanceIdentifierCodec(schemaService,
-                bindingNormalizedNodeSerializer);
+        ovsdbStatusProvider = new OvsdbDiagStatusProvider(diagStatusService);
+        instanceIdentifierCodec = new InstanceIdentifierCodec(schemaService, bindingNormalizedNodeSerializer);
         this.systemReadyMonitor = systemReadyMonitor;
         this.upgradeState = upgradeState;
         LOG.info("SouthboundProvider ovsdbConnectionService Initialized");
@@ -111,7 +109,7 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
     public void init() {
         LOG.info("SouthboundProvider Session Initiated");
         ovsdbStatusProvider.reportStatus(ServiceState.STARTING, "OVSDB initialization in progress");
-        this.txInvoker = new TransactionInvokerImpl(db);
+        txInvoker = new TransactionInvokerImpl(db);
         cm = new OvsdbConnectionManager(db, txInvoker, entityOwnershipService, ovsdbConnection,
                 instanceIdentifierCodec, upgradeState);
         ovsdbDataTreeChangeListener = new OvsdbDataTreeChangeListener(db, cm, instanceIdentifierCodec);
@@ -119,7 +117,7 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
 
         //Register listener for entityOnwership changes
         providerOwnershipChangeListener =
-                new SouthboundPluginInstanceEntityOwnershipListener(this,this.entityOwnershipService);
+                new SouthboundPluginInstanceEntityOwnershipListener(this, entityOwnershipService);
 
         //register instance entity to get the ownership of the provider
         Entity instanceEntity = new Entity(ENTITY_TYPE, ENTITY_TYPE);
@@ -227,7 +225,7 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
         }
 
         public void close() {
-            this.listenerRegistration.close();
+            listenerRegistration.close();
         }
 
         @Override

diff --git a/southbound/southbound-impl/src/main/resources/OSGI-INF/blueprint/southbound.xml b/southbound/southbound-impl/src/main/resources/OSGI-INF/blueprint/southbound.xml
index d4b0b05bf089b36e7980524d633066eb415b716a..41a854eecd155edccd28627c18c4c2bdd72756c6 100644 (file)
--- a/southbound/southbound-impl/src/main/resources/OSGI-INF/blueprint/southbound.xml
+++ b/southbound/southbound-impl/src/main/resources/OSGI-INF/blueprint/southbound.xml
@@ -23,4 +23,24 @@
     <property name="bridgesReconciliationExclusionList" value="${bridge-reconciliation-exclusion-list}"/>
   </bean>
 
+  <reference id="diagStatusService" interface="org.opendaylight.infrautils.diagstatus.DiagStatusService"/>
+  <reference id="systemReadyMonitor" interface="org.opendaylight.infrautils.ready.SystemReadyMonitor"/>
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+  <reference id="bindingNormalizedNodeSerializer" interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer"/>
+  <reference id="domSchemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
+  <reference id="entityOwnershipService" interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
+  <reference id="ovsdbConnection" interface="org.opendaylight.ovsdb.lib.OvsdbConnection"/>
+  <reference id="upgradeState" interface="org.opendaylight.serviceutils.upgrade.UpgradeState"/>
+
+  <bean id="southboundProvider" class="org.opendaylight.ovsdb.southbound.SouthboundProvider" init-method="init" destroy-method="close">
+    <argument ref="dataBroker"/>
+    <argument ref="entityOwnershipService"/>
+    <argument ref="ovsdbConnection"/>
+    <argument ref="domSchemaService"/>
+    <argument ref="bindingNormalizedNodeSerializer"/>
+    <argument ref="systemReadyMonitor"/>
+    <argument ref="diagStatusService"/>
+    <argument ref="upgradeState"/>
+  </bean>
+
 </blueprint>