Remove blueprint from pcep-base-parser

This is very simplistic component, convert it to an immediate OSGi
DS component.

JIRA: BGPCEP-935
Change-Id: I793716f7404f63b3fa129877b59ebaab219ad6ee
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/pcep/base-parser/pom.xml b/pcep/base-parser/pom.xml
index adf0f04cbfa01c7eb22e85c094e0c22f72a2ff9d..875d24f037f791718ca3a72384e6de51f49d4b61 100644 (file)
--- a/pcep/base-parser/pom.xml
+++ b/pcep/base-parser/pom.xml
@@ -69,6 +69,22 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.cmpn</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <scm>

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java
index 617d2e9538e6d5c6da260e3d02daa35eab7ef7a7..d5ab95aa4d196734001c5a24a7000246a7b4fe4c 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java
@@ -9,6 +9,8 @@ package org.opendaylight.protocol.pcep.parser;
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.opendaylight.protocol.pcep.parser.message.PCEPCloseMessageParser;
 import org.opendaylight.protocol.pcep.parser.message.PCEPErrorMessageParser;
 import org.opendaylight.protocol.pcep.parser.message.PCEPKeepAliveMessageParser;
@@ -90,6 +92,7 @@ import org.opendaylight.protocol.pcep.parser.tlv.ReqMissingTlvParser;
 import org.opendaylight.protocol.pcep.spi.EROSubobjectRegistry;
 import org.opendaylight.protocol.pcep.spi.LabelRegistry;
 import org.opendaylight.protocol.pcep.spi.ObjectRegistry;
+import org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator;
 import org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderContext;
 import org.opendaylight.protocol.pcep.spi.RROSubobjectRegistry;
 import org.opendaylight.protocol.pcep.spi.TlvRegistry;
@@ -148,8 +151,17 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.label.type.Type1LabelCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.label.type.WavebandSwitchingLabelCase;
 import org.opendaylight.yangtools.concepts.Registration;
+import org.osgi.service.component.annotations.Component;
 
+@Singleton
+@Component(immediate = true, service = PCEPExtensionProviderActivator.class,
+           property = "type=org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator")
 public final class BaseParserExtensionActivator extends AbstractPCEPExtensionProviderActivator {
+    @Inject
+    public BaseParserExtensionActivator() {
+        // Exposed for DI
+    }
+
     @Override
     protected List<Registration> startImpl(final PCEPExtensionProviderContext context) {
         final List<Registration> regs = new ArrayList<>();

diff --git a/pcep/base-parser/src/main/resources/OSGI-INF/blueprint/pcep-base-parser.xml b/pcep/base-parser/src/main/resources/OSGI-INF/blueprint/pcep-base-parser.xml
deleted file mode 100644 (file)
index cf6e48b..0000000
--- a/pcep/base-parser/src/main/resources/OSGI-INF/blueprint/pcep-base-parser.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2016 Brocade Communications 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
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
-
-  <bean id="baseParserActivator" class="org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator"/>
-
-  <service ref="baseParserActivator" interface="org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator"
-          odl:type="org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator"/>
-</blueprint>
\ No newline at end of file