diff options
author | Matej Perina <matej.perina@pantheon.tech> | 2019-04-03 09:11:35 +0200 |
---|---|---|
committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-08-26 11:49:17 -0400 |
commit | b1dd81ede363508f83c86ed497b8c0815045f8e5 (patch) | |
tree | 878ee0532da4d02d3505fc6cbe93b77fd43fb45e /sql-resource | |
parent | 602de7cdf89676891604130d64e8bc4cc88c05f6 (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: Ia9eed2f60c71b7fc2e93b738c857d290b28e9420
Signed-off-by: Matej Perina <matej.perina@pantheon.tech>
Signed-off-by: Samuel Kontris <samuel.kontris@pantheon.tech>
Diffstat (limited to 'sql-resource')
-rwxr-xr-x | sql-resource/lighty/pom.xml | 58 | ||||
-rw-r--r-- | sql-resource/lighty/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/lighty/SqlModule.java | 54 | ||||
-rwxr-xr-x | sql-resource/pom.xml | 1 |
3 files changed, 113 insertions, 0 deletions
diff --git a/sql-resource/lighty/pom.xml b/sql-resource/lighty/pom.xml new file mode 100755 index 00000000..1647e5db --- /dev/null +++ b/sql-resource/lighty/pom.xml @@ -0,0 +1,58 @@ +<?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.adaptors</groupId> + <artifactId>sql-resource-lighty</artifactId> + <version>0.6.0-SNAPSHOT</version> + <packaging>jar</packaging> + + <name>ccsdk-sli-adaptors :: sql-resource :: ${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.adaptors</groupId> + <artifactId>sql-resource-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>dblib-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-provider</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> diff --git a/sql-resource/lighty/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/lighty/SqlModule.java b/sql-resource/lighty/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/lighty/SqlModule.java new file mode 100644 index 00000000..fc760ba5 --- /dev/null +++ b/sql-resource/lighty/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/lighty/SqlModule.java @@ -0,0 +1,54 @@ +/* + * ============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.adaptors.resource.sql.lighty; + +import io.lighty.core.controller.api.AbstractLightyModule; +import org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource; +import org.onap.ccsdk.sli.adaptors.resource.sql.SqlResourcePropertiesProviderImpl; +import org.onap.ccsdk.sli.core.dblib.DbLibService; + +/** + * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from + * the sql-resource-provider artifact. + */ +public class SqlModule extends AbstractLightyModule { + + private final DbLibService dbService; + + private SqlResourcePropertiesProviderImpl sqlPropertiesProvider; + private SqlResource sqlResource; + + public SqlModule(DbLibService dbService) { + this.dbService = dbService; + } + + @Override + protected boolean initProcedure() { + this.sqlPropertiesProvider = new SqlResourcePropertiesProviderImpl(); + this.sqlResource = new SqlResource(sqlPropertiesProvider, dbService); + return true; + } + + @Override + protected boolean stopProcedure() { + return true; + } + + public SqlResource getSqlResource() { + return sqlResource; + } +} diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml index 645576e1..2a5c3497 100755 --- a/sql-resource/pom.xml +++ b/sql-resource/pom.xml @@ -21,6 +21,7 @@ <module>provider</module> <module>features</module> <module>installer</module> + <module>lighty</module> </modules> </project> |