aboutsummaryrefslogtreecommitdiffstats
path: root/restconf-client
diff options
context:
space:
mode:
authorMatej Perina <matej.perina@pantheon.tech>2019-04-04 09:27:16 +0200
committerDan Timoney <dtimoney@att.com>2019-08-26 15:29:55 +0000
commit7a37199ebccccd03bbea9b37df09ef610f89bb01 (patch)
tree23b754ea561ac0ceb08ed61e04b956b33ff2a379 /restconf-client
parentc08a8a7b8ce929195bff089f7743b5f31d609849 (diff)
Proposal to remove OSGi dependencies from the CCSDK project
Dependencies on the OSGi frameworks and libraries are removed by integrating the CCSDK project with the lighty.io. It's a toolkit that allows to use ODL services (in this case core services and the Restconf) without the dependency on the Karaf framework and the Blueprint DI. In this change are created the lighty.io modules which initialize and expose same services as the Blueprint DI in the blueprint.xml files. More info about the lighty.io - https://lighty.io Change-Id: I3e549e19374ccf04bc430b515e1df7d8d61d8ea7 Signed-off-by: Matej Perina <matej.perina@pantheon.tech> Signed-off-by: Samuel Kontris <samuel.kontris@pantheon.tech>
Diffstat (limited to 'restconf-client')
-rwxr-xr-xrestconf-client/lighty/pom.xml47
-rw-r--r--restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java59
-rwxr-xr-xrestconf-client/pom.xml1
3 files changed, 107 insertions, 0 deletions
diff --git a/restconf-client/lighty/pom.xml b/restconf-client/lighty/pom.xml
new file mode 100755
index 00000000..86e8af30
--- /dev/null
+++ b/restconf-client/lighty/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.onap.ccsdk.sli.northbound</groupId>
+ <artifactId>restconf-client-lighty</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
+ <url>http://maven.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>ccsdk-lighty-dependency-versions</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>io.lighty.core</groupId>
+ <artifactId>lighty-controller</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.plugins</groupId>
+ <artifactId>restconf-client-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java b/restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java
new file mode 100644
index 00000000..bb0fc90d
--- /dev/null
+++ b/restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java
@@ -0,0 +1,59 @@
+/*
+ * ============LICENSE_START==========================================
+ * Copyright (c) 2019 PANTHEON.tech s.r.o.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ *
+ */
+package org.onap.ccsdk.sli.plugins.restconf.lighty;
+
+import io.lighty.core.controller.api.AbstractLightyModule;
+import io.lighty.core.controller.api.LightyModule;
+import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode;
+import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode;
+import org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode;
+
+/**
+ * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from
+ * the restconf-client-provider artifact.
+ */
+public class RestconfClientModule extends AbstractLightyModule implements LightyModule {
+
+ private final RestapiCallNode restapiCallNode;
+
+ private RestconfApiCallNode restconfApiCallNode;
+ private RestconfDiscoveryNode restconfDiscoveryNode;
+
+ public RestconfClientModule(final RestapiCallNode restapiCallNode) {
+ this.restapiCallNode = restapiCallNode;
+ }
+
+ @Override
+ protected boolean initProcedure() {
+ this.restconfApiCallNode = new RestconfApiCallNode(restapiCallNode);
+ this.restconfDiscoveryNode = new RestconfDiscoveryNode(restconfApiCallNode);
+ return true;
+ }
+
+ @Override
+ protected boolean stopProcedure() {
+ return true;
+ }
+
+ public RestconfApiCallNode getRestconfApiCallNode() {
+ return this.restconfApiCallNode;
+ }
+
+ public RestconfDiscoveryNode getRestconfDiscoveryNode() {
+ return this.restconfDiscoveryNode;
+ }
+}
diff --git a/restconf-client/pom.xml b/restconf-client/pom.xml
index e8b0123c..221987d8 100755
--- a/restconf-client/pom.xml
+++ b/restconf-client/pom.xml
@@ -20,5 +20,6 @@
<module>provider</module>
<module>features</module>
<module>installer</module>
+ <module>lighty</module>
</modules>
</project>