From 4ca4e0d5b321d3f4f321b49df02498d66b547d11 Mon Sep 17 00:00:00 2001
From: Ryan Goulding <ryandgoulding@gmail.com>
Date: Wed, 6 Sep 2017 12:03:51 -0400
Subject: [PATCH] Fix SDNC service registration

Convert the BundleActivator to a POJO provider, and do the service registration
through blueprint instead.

Issue-Id: SDNC-54
Change-Id: Ia5618ef443967803b31da1ac9e020d1092c3ab8d
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
---
 filters/provider/pom.xml                           |  1 -
 .../ccsdk/sli/core/filters/FiltersService.java     |  4 +++
 .../{Activator.java => FiltersServiceImpl.java}    | 38 +++-------------------
 .../opendaylight/blueprint/filters-blueprint.xml   |  9 +++++
 4 files changed, 17 insertions(+), 35 deletions(-)
 create mode 100644 filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/FiltersService.java
 rename filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/{Activator.java => FiltersServiceImpl.java} (58%)
 create mode 100644 filters/provider/src/main/resources/org/opendaylight/blueprint/filters-blueprint.xml

diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index 9f59d3463..240966e8b 100755
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -73,7 +73,6 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>org.onap.ccsdk.sli.core.filters</Bundle-SymbolicName>
-						<Bundle-Activator>org.onap.ccsdk.sli.core.filters.Activator</Bundle-Activator>
 						<Export-Package>org.onap.ccsdk.sli.core.filters</Export-Package>
 						<DynamicImport-Package>org.onap.ccsdk.sli.core.filters</DynamicImport-Package>
 						<Import-Package>javax.servlet.*,java.io.*,org.osgi.framework.*,org.slf4j.*,org.apache.commons.codec.binary.*</Import-Package>
diff --git a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/FiltersService.java b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/FiltersService.java
new file mode 100644
index 000000000..9587e8d96
--- /dev/null
+++ b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/FiltersService.java
@@ -0,0 +1,4 @@
+package org.onap.ccsdk.sli.core.filters;
+
+public interface FiltersService {
+}
diff --git a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/Activator.java b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/FiltersServiceImpl.java
similarity index 58%
rename from filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/Activator.java
rename to filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/FiltersServiceImpl.java
index 6cac336a1..12370ca9a 100644
--- a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/Activator.java
+++ b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/FiltersServiceImpl.java
@@ -21,43 +21,13 @@
 
 package org.onap.ccsdk.sli.core.filters;
 
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+public class FiltersServiceImpl implements FiltersService {
+	private static final Logger LOG = LoggerFactory.getLogger(FiltersServiceImpl.class);
 
-public class Activator implements BundleActivator {
-
-	private ServiceRegistration registration = null;
-
-	private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
-
-	@Override
-	public void start(BundleContext ctx) throws Exception {
-
-
-		
-		Object impl = new String();
-		String regName = impl.getClass().getName();
-		
-		if (registration == null)
-		{
-			LOG.debug("Registering Filters service "+regName);
-			registration = ctx.registerService(regName, impl, null);
-		}
-
-	}
-
-	@Override
-	public void stop(BundleContext ctx) throws Exception {
-		
-		if (registration != null)
-		{
-			registration.unregister();
-			registration = null;
-		}
+	public FiltersServiceImpl() {
+		LOG.debug("Registering {}", FiltersServiceImpl.class.getName());
 	}
-
 }
diff --git a/filters/provider/src/main/resources/org/opendaylight/blueprint/filters-blueprint.xml b/filters/provider/src/main/resources/org/opendaylight/blueprint/filters-blueprint.xml
new file mode 100644
index 000000000..3bf8423e9
--- /dev/null
+++ b/filters/provider/src/main/resources/org/opendaylight/blueprint/filters-blueprint.xml
@@ -0,0 +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">
+
+    <bean id="filters" class="org.onap.ccsdk.sli.core.filters.FiltersServiceImpl" />
+    <service ref="filters" interface="org.onap.ccsdk.sli.core.filters.FiltersService" />
+
+</blueprint>
-- 
2.16.6