Add bean wrappers

Add bean wrappers for additional nodes in sli/adaptors

Change-Id: I728d8e92d0ce50919d221339d7d9ab703a22d12e
Issue-ID: CCSDK-2924
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/services/pom.xml b/services/pom.xml
index e828e81..329b7bf 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -105,11 +105,31 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>utils-provider</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-provider</artifactId>
             <version>${ccsdk.sli.core.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>mdsal-resource-provider</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
+            <artifactId>publisher.provider</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>netbox-client-provider</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sql-resource-provider</artifactId>

diff --git a/services/src/main/java/org/onap/ccsdk/apps/services/SvcLogicFactory.java b/services/src/main/java/org/onap/ccsdk/apps/services/SvcLogicFactory.java
index c2fa101..f7e3662 100644 (file)
--- a/services/src/main/java/org/onap/ccsdk/apps/services/SvcLogicFactory.java
+++ b/services/src/main/java/org/onap/ccsdk/apps/services/SvcLogicFactory.java
@@ -25,7 +25,19 @@ import java.io.IOException;
 import java.util.List;\r
 import java.util.Properties;\r
 \r
+import org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api.PublisherApi;\r
+import org.onap.ccsdk.sli.adaptors.messagerouter.publisher.provider.impl.PublisherApiImpl;\r
+import org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient;\r
+import org.onap.ccsdk.sli.adaptors.netbox.impl.NetboxClientImpl;\r
+import org.onap.ccsdk.sli.adaptors.netbox.impl.NetboxHttpClient;\r
+import org.onap.ccsdk.sli.adaptors.netbox.property.NetboxProperties;\r
+import org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource;\r
+import org.onap.ccsdk.sli.adaptors.resource.mdsal.MdsalResourcePropertiesProviderImpl;\r
+import org.onap.ccsdk.sli.adaptors.resource.mdsal.OperationalResource;\r
 import org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource;\r
+import org.onap.ccsdk.sli.core.dblib.DBLIBResourceProvider;\r
+import org.onap.ccsdk.sli.core.dblib.DBResourceManager;\r
+import org.onap.ccsdk.sli.core.dblib.DbLibService;\r
 import org.onap.ccsdk.sli.core.sli.ConfigurationException;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicLoader;\r
@@ -138,6 +150,8 @@ public class SvcLogicFactory {
     return new Slf4jRecorder();\r
   }\r
 \r
+  // Beans from sli/core\r
+\r
   @Bean\r
   public SliPluginUtils sliPluginUtil() {\r
     return new SliPluginUtils();\r
@@ -147,6 +161,36 @@ public class SvcLogicFactory {
   public SliStringUtils sliStringUtils() {\r
     return new SliStringUtils();\r
   }\r
+\r
+  // Beans from sli/adaptors\r
+  \r
+  @Bean\r
+  public ConfigResource configResource() {\r
+    return new ConfigResource(new MdsalResourcePropertiesProviderImpl());\r
+  }\r
+\r
+  @Bean\r
+  public OperationalResource operationalResource() {\r
+    return new OperationalResource(new MdsalResourcePropertiesProviderImpl());\r
+  }\r
+\r
+  @Bean \r
+  public PublisherApi publisherApi() {\r
+    return new PublisherApiImpl();\r
+  }\r
+  \r
+  \r
+  @Bean \r
+  public NetboxClient netboxClient() {\r
+    return new NetboxClientImpl();\r
+  }\r
+  \r
+  \r
+  @Bean\r
+  public SqlResource sqlResource() {\r
+    return new SqlResource();\r
+  }\r
+\r
   \r
   @Bean\r
   public RestapiCallNode restapiCallNode() {\r
@@ -158,10 +202,6 @@ public class SvcLogicFactory {
       return new PropertiesNode();\r
   }\r
 \r
-  @Bean\r
-  public SqlResource sqlResource() {\r
-    return new SqlResource();\r
-  }\r
   \r
 \r
 }\r