diff options
63 files changed, 268 insertions, 821 deletions
diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 7e395c9f..59e334ac 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sli-plugins-artifacts</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sli-plugins-artifacts</name> @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <dependencyManagement> diff --git a/ccsdk-plugins-lighty/pom.xml b/ccsdk-plugins-lighty/pom.xml deleted file mode 100755 index 5630f3bc..00000000 --- a/ccsdk-plugins-lighty/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?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>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>ccsdk-plugins-lighty</artifactId> - <version>0.6.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>ccsdk-core-lighty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>properties-node-lighty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>restapi-call-node-lighty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>restconf-client-lighty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sshapi-call-node-lighty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>template-node-lighty</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/ccsdk-plugins-lighty/src/main/java/org/onap/ccsdk/sli/plugins/lighty/CcsdkPluginsLightyModule.java b/ccsdk-plugins-lighty/src/main/java/org/onap/ccsdk/sli/plugins/lighty/CcsdkPluginsLightyModule.java deleted file mode 100644 index a6d662b8..00000000 --- a/ccsdk-plugins-lighty/src/main/java/org/onap/ccsdk/sli/plugins/lighty/CcsdkPluginsLightyModule.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * ============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.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import org.onap.ccsdk.sli.core.lighty.common.CcsdkLightyUtils; -import org.onap.ccsdk.sli.plugins.prop.lighty.PropertiesNodeModule; -import org.onap.ccsdk.sli.plugins.prop.lighty.RestApiCallNodeModule; -import org.onap.ccsdk.sli.plugins.restconf.lighty.RestconfClientModule; -import org.onap.ccsdk.sli.plugins.sshapicall.lighty.SshApiCallModule; -import org.onap.ccsdk.sli.plugins.template.lighty.TemplateNodeModule; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that groups all other LightyModules - * from the ccsdk-sli-plugins repository so they can be all treated as one component (for example started/stopped at once). - * For more information about the lighty.io visit the website https://lighty.io. - */ -public class CcsdkPluginsLightyModule extends AbstractLightyModule { - - private static final Logger LOG = LoggerFactory.getLogger(CcsdkPluginsLightyModule.class); - - private PropertiesNodeModule propertiesNodeModule; - private RestApiCallNodeModule restApiCallNodeModule; - private RestconfClientModule restconfClientModule; - private SshApiCallModule sshApiCallModule; - private TemplateNodeModule templateNodeModule; - - protected boolean initProcedure() { - LOG.debug("Initializing CCSDK Plugins Lighty module..."); - - this.propertiesNodeModule = new PropertiesNodeModule(); - if (!CcsdkLightyUtils.startLightyModule(propertiesNodeModule)) { - LOG.error("Unable to start PropertiesNodeModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.restApiCallNodeModule = new RestApiCallNodeModule(); - if (!CcsdkLightyUtils.startLightyModule(restApiCallNodeModule)) { - LOG.error("Unable to start RestApiCallNodeModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.restconfClientModule = new RestconfClientModule(restApiCallNodeModule.getPropertiesNode()); - if (!CcsdkLightyUtils.startLightyModule(restconfClientModule)) { - LOG.error("Unable to start RestconfClientModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.sshApiCallModule = new SshApiCallModule(); - if (!CcsdkLightyUtils.startLightyModule(sshApiCallModule)) { - LOG.error("Unable to start SshApiCallModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.templateNodeModule = new TemplateNodeModule(); - if (!CcsdkLightyUtils.startLightyModule(templateNodeModule)) { - LOG.error("Unable to start TemplateNodeModule in CCSDK Plugins Lighty module!"); - return false; - } - - LOG.debug("CCSDK Plugins Lighty module was initialized successfully"); - return true; - } - - protected boolean stopProcedure() { - LOG.debug("Stopping CCSDK Plugins Lighty module..."); - - boolean stopSuccessful = true; - - if (!CcsdkLightyUtils.stopLightyModule(templateNodeModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(sshApiCallModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(restconfClientModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(restApiCallNodeModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(propertiesNodeModule)) { - stopSuccessful = false; - } - - if (stopSuccessful) { - LOG.debug("CCSDK Plugins Lighty module was stopped successfully"); - } else { - LOG.error("CCSDK Plugins Lighty module was not stopped successfully!"); - } - return stopSuccessful; - } - - public PropertiesNodeModule getPropertiesNodeModule() { - return propertiesNodeModule; - } - - public RestApiCallNodeModule getRestApiCallNodeModule() { - return restApiCallNodeModule; - } - - public RestconfClientModule getRestconfClientModule() { - return restconfClientModule; - } - - public SshApiCallModule getSshApiCallModule() { - return sshApiCallModule; - } - - public TemplateNodeModule getTemplateNodeModule() { - return templateNodeModule; - } -} diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml index bbcfb757..1054f190 100644 --- a/features/ccsdk-sli-plugins-all/pom.xml +++ b/features/ccsdk-sli-plugins-all/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-sli-plugins-all</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name> diff --git a/features/features-sli-plugins/pom.xml b/features/features-sli-plugins/pom.xml index 1ace61b9..dff558c6 100644 --- a/features/features-sli-plugins/pom.xml +++ b/features/features-sli-plugins/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>features-sli-plugins</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 33474874..529588c5 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sliplugins-features-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name> diff --git a/features/pom.xml b/features/pom.xml index 6e349ca4..3780233e 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sliplugins-feature-aggregator</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: features</name> diff --git a/grToolkit/features/ccsdk-gr-toolkit/pom.xml b/grToolkit/features/ccsdk-gr-toolkit/pom.xml index 3266f660..88d931d3 100644 --- a/grToolkit/features/ccsdk-gr-toolkit/pom.xml +++ b/grToolkit/features/ccsdk-gr-toolkit/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-gr-toolkit</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> diff --git a/grToolkit/features/features-gr-toolkit/pom.xml b/grToolkit/features/features-gr-toolkit/pom.xml index 511ba38a..f22ed5d2 100755 --- a/grToolkit/features/features-gr-toolkit/pom.xml +++ b/grToolkit/features/features-gr-toolkit/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>features-gr-toolkit</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> diff --git a/grToolkit/features/pom.xml b/grToolkit/features/pom.xml index 34f706c8..37179a55 100755 --- a/grToolkit/features/pom.xml +++ b/grToolkit/features/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> <artifactId>gr-toolkit-features</artifactId> <groupId>org.onap.ccsdk.sli.plugins</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/grToolkit/installer/pom.xml b/grToolkit/installer/pom.xml index 8c7ec32b..4d097054 100755 --- a/grToolkit/installer/pom.xml +++ b/grToolkit/installer/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <properties> <application.name>ccsdk-gr-toolkit</application.name> diff --git a/grToolkit/model/pom.xml b/grToolkit/model/pom.xml index 8abf89a0..646564a9 100755 --- a/grToolkit/model/pom.xml +++ b/grToolkit/model/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit-model</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/grToolkit/pom.xml b/grToolkit/pom.xml index 916df442..b55df5cd 100755 --- a/grToolkit/pom.xml +++ b/grToolkit/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: gr-toolkit</name> diff --git a/grToolkit/provider/pom.xml b/grToolkit/provider/pom.xml index 0267f248..f8228c2b 100755 --- a/grToolkit/provider/pom.xml +++ b/grToolkit/provider/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <build> @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-sli-plugins</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins</name> @@ -29,7 +29,6 @@ <module>grToolkit</module> <module>features</module> <module>artifacts</module> - <module>ccsdk-plugins-lighty</module> </modules> <scm> diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/properties-node/features/ccsdk-properties-node/pom.xml index 4781ac38..b80d8f42 100644 --- a/properties-node/features/ccsdk-properties-node/pom.xml +++ b/properties-node/features/ccsdk-properties-node/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-properties-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/properties-node/features/features-properties-node/pom.xml b/properties-node/features/features-properties-node/pom.xml index 58944cce..485d2953 100644 --- a/properties-node/features/features-properties-node/pom.xml +++ b/properties-node/features/features-properties-node/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>features-properties-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/properties-node/features/pom.xml b/properties-node/features/pom.xml index bd93644d..83bc1da1 100755 --- a/properties-node/features/pom.xml +++ b/properties-node/features/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node-features</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml index 536e2047..3af5efc7 100755 --- a/properties-node/installer/pom.xml +++ b/properties-node/installer/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/properties-node/lighty/pom.xml b/properties-node/lighty/pom.xml deleted file mode 100755 index 4e0fdb30..00000000 --- a/properties-node/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?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.plugins</groupId> - <artifactId>properties-node-lighty</artifactId> - <version>0.6.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>ccsdk-sli-plugins :: properties-node :: ${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>properties-node-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/properties-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/PropertiesNodeModule.java b/properties-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/PropertiesNodeModule.java deleted file mode 100644 index 34538112..00000000 --- a/properties-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/PropertiesNodeModule.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * ============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.prop.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.prop.PropertiesNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the properties-node-provider artifact. - */ -public class PropertiesNodeModule extends AbstractLightyModule implements LightyModule { - - private PropertiesNode propertiesNode; - - @Override - protected boolean initProcedure() { - this.propertiesNode = new PropertiesNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public PropertiesNode getPropertiesNode() { - return this.propertiesNode; - } -} diff --git a/properties-node/pom.xml b/properties-node/pom.xml index 64036f7b..0e5d576d 100755 --- a/properties-node/pom.xml +++ b/properties-node/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: properties-node</name> @@ -21,6 +21,5 @@ <module>provider</module> <module>features</module> <module>installer</module> - <module>lighty</module> </modules> </project> diff --git a/properties-node/provider/pom.xml b/properties-node/provider/pom.xml index 8ca58c45..262c4968 100755 --- a/properties-node/provider/pom.xml +++ b/properties-node/provider/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml index 2697c4ea..6f3109e4 100644 --- a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml +++ b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-restapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/restapi-call-node/features/features-restapi-call-node/pom.xml b/restapi-call-node/features/features-restapi-call-node/pom.xml index 41a5d8a4..4350f75b 100644 --- a/restapi-call-node/features/features-restapi-call-node/pom.xml +++ b/restapi-call-node/features/features-restapi-call-node/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>features-restapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/restapi-call-node/features/pom.xml b/restapi-call-node/features/pom.xml index 981db516..a49633d5 100755 --- a/restapi-call-node/features/pom.xml +++ b/restapi-call-node/features/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restapi-call-node-features</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/restapi-call-node/installer/pom.xml b/restapi-call-node/installer/pom.xml index 8b2d60ba..697cfdcc 100755 --- a/restapi-call-node/installer/pom.xml +++ b/restapi-call-node/installer/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restapi-call-node-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/restapi-call-node/lighty/pom.xml b/restapi-call-node/lighty/pom.xml deleted file mode 100755 index 5faa654b..00000000 --- a/restapi-call-node/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?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.plugins</groupId> - <artifactId>restapi-call-node-lighty</artifactId> - <version>0.6.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>ccsdk-sli-plugins :: restapi-call-node :: ${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>restapi-call-node-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/restapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/RestApiCallNodeModule.java b/restapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/RestApiCallNodeModule.java deleted file mode 100644 index 01fa03e5..00000000 --- a/restapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/RestApiCallNodeModule.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * ============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.prop.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the restapi-call-node-provider artifact. - */ -public class RestApiCallNodeModule extends AbstractLightyModule implements LightyModule { - - private RestapiCallNode restapiCallNode; - - @Override - protected boolean initProcedure() { - this.restapiCallNode = new RestapiCallNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public RestapiCallNode getPropertiesNode() { - return this.restapiCallNode; - } - -} diff --git a/restapi-call-node/pom.xml b/restapi-call-node/pom.xml index 7fbce024..5bbd4d7b 100755 --- a/restapi-call-node/pom.xml +++ b/restapi-call-node/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restapi-call-node</name> @@ -20,6 +20,5 @@ <module>provider</module> <module>features</module> <module>installer</module> - <module>lighty</module> </modules> </project> diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml index 7a03a38c..a8d3cd88 100755 --- a/restapi-call-node/provider/pom.xml +++ b/restapi-call-node/provider/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restapi-call-node-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java index 66993aab..57408952 100644 --- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java +++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java @@ -8,9 +8,9 @@ * 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. @@ -21,6 +21,8 @@ package org.onap.ccsdk.sli.plugins.restapicall; +import java.util.List; +import java.util.Map; import javax.ws.rs.core.MultivaluedMap; public class HttpResponse { @@ -28,4 +30,5 @@ public class HttpResponse { public String message; public String body; public MultivaluedMap<String, String> headers; + public Map<String, List<String>> headers2; } diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java index 189ddde3..910baf52 100644 --- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java +++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java @@ -8,7 +8,7 @@ * 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 @@ -50,7 +50,15 @@ public final class JsonParser { checkNotNull(s, "Input should not be null."); try { - JSONObject json = new JSONObject(s); + JSONObject json = null; + //support top level list in json response + if (s.startsWith("[")) { + JSONArray jsonArr = new JSONArray(s); + json = jsonArr.getJSONObject(0); + } else { + json = new JSONObject(s); + } + Map<String, Object> wm = new HashMap<>(); Iterator<String> ii = json.keys(); while (ii.hasNext()) { diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java index 65684d93..8d5143be 100644 --- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java +++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java @@ -21,41 +21,44 @@ */ package org.onap.ccsdk.sli.plugins.restapicall; + public class RetryPolicy { private String[] hostnames; private Integer maximumRetries; - private int position; - private int retryCount; + public RetryPolicy(String[] hostnames, Integer maximumRetries) { - this.hostnames = hostnames; - this.maximumRetries = maximumRetries; - - this.position = 0; - - this.retryCount = 0; + this.hostnames = hostnames; + this.maximumRetries = maximumRetries; + this.position = 0; + this.retryCount = 0; + } + public Integer getMaximumRetries() { - return maximumRetries; + return maximumRetries; } + public int getRetryCount() { - return retryCount; + return retryCount; } + public Boolean shouldRetry() { - return retryCount < maximumRetries + 1; + return retryCount < maximumRetries + 1; } + public String getRetryMessage() { - return retryCount + " retry attempts were made out of " + maximumRetries + " maximum retry attempts."; + return retryCount + " retry attempts were made out of " + maximumRetries + " maximum retry attempts."; } public String getNextHostName() throws RetryException { - retryCount++; - position++; - - if (position > hostnames.length - 1) { - position = 0; - } - return hostnames[position]; + retryCount++; + position++; + if (position > hostnames.length - 1) { + position = 0; } -}
\ No newline at end of file + return hostnames[position]; + } + +} diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java index 4712b429..bc6afd84 100644 --- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java +++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java @@ -8,9 +8,9 @@ * 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. @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,38 +66,45 @@ public final class XmlJsonUtil { private static Object createStructure(Map<String, String> flatmap, String var) { if (flatmap.containsKey(var)) { - if (var.endsWith("_length") || var.endsWith("].key")) + if (var.endsWith("_length") || var.endsWith("].key")) { return null; + } return flatmap.get(var); } Map<String, Object> mm = new HashMap<>(); - for (String k : flatmap.keySet()) + for (String k : flatmap.keySet()) { if (k.startsWith(var + ".")) { int i1 = k.indexOf('.', var.length() + 1); int i2 = k.indexOf('[', var.length() + 1); int i3 = k.length(); - if (i1 > 0 && i1 < i3) + if (i1 > 0 && i1 < i3) { i3 = i1; - if (i2 > 0 && i2 < i3) + } + if (i2 > 0 && i2 < i3) { i3 = i2; + } String k1 = k.substring(var.length() + 1, i3); String var1 = k.substring(0, i3); if (!mm.containsKey(k1)) { Object str = createStructure(flatmap, var1); - if (str != null && (!(str instanceof String) || ((String) str).trim().length() > 0)) + if (str != null && (!(str instanceof String) || ((String) str).trim().length() > 0)) { mm.put(k1, str); + } } } - if (!mm.isEmpty()) + } + if (!mm.isEmpty()) { return mm; + } boolean arrayFound = false; - for (String k : flatmap.keySet()) + for (String k : flatmap.keySet()) { if (k.startsWith(var + "[")) { arrayFound = true; break; } + } if (arrayFound) { List<Object> ll = new ArrayList<>(); @@ -115,13 +121,15 @@ public final class XmlJsonUtil { for (int i = 0; i < length; i++) { Object v = createStructure(flatmap, var + '[' + i + ']'); - if (v == null) + if (v == null) { break; + } ll.add(v); } - if (!ll.isEmpty()) + if (!ll.isEmpty()) { return ll; + } } return null; @@ -129,16 +137,18 @@ public final class XmlJsonUtil { @SuppressWarnings("unchecked") private static String generateXml(Object o, int indent, boolean escape) { - if (o == null) + if (o == null) { return null; + } - if (o instanceof String) - return escape ? escapeXml((String) o) : (String) o;; + if (o instanceof String) { + return escape ? escapeXml((String) o) : (String) o; + }; if (o instanceof Map) { StringBuilder ss = new StringBuilder(); Map<String, Object> mm = (Map<String, Object>) o; - for (Map.Entry<String, Object> entry: mm.entrySet()) { + for (Map.Entry<String, Object> entry : mm.entrySet()) { Object v = entry.getValue(); String key = entry.getKey(); if (v instanceof String) { @@ -164,10 +174,13 @@ public final class XmlJsonUtil { return null; } - private static String generateJson(Object o, boolean escape, boolean quotes) { - if (o == null) + if (o == null) { return null; + } + if (o instanceof String && ((String) o).length() == 0) { + return null; + } StringBuilder ss = new StringBuilder(); generateJson(ss, o, 0, false, escape, quotes); @@ -178,8 +191,9 @@ public final class XmlJsonUtil { private static void generateJson(StringBuilder ss, Object o, int indent, boolean padFirst, boolean escape, boolean quotes) { if (o instanceof String) { String s = escape ? escapeJson((String) o) : (String) o; - if (padFirst) + if (padFirst) { ss.append(pad(indent)); + } if (quotes) { ss.append('"').append(s).append('"'); } else { @@ -191,14 +205,16 @@ public final class XmlJsonUtil { if (o instanceof Map) { Map<String, Object> mm = (Map<String, Object>) o; - if (padFirst) + if (padFirst) { ss.append(pad(indent)); + } ss.append("{\n"); boolean first = true; for (Map.Entry<String, Object> entry : mm.entrySet()) { - if (!first) + if (!first) { ss.append(",\n"); + } first = false; Object v = entry.getValue(); String key = entry.getKey(); @@ -215,14 +231,16 @@ public final class XmlJsonUtil { if (o instanceof List) { List<Object> ll = (List<Object>) o; - if (padFirst) + if (padFirst) { ss.append(pad(indent)); + } ss.append("[\n"); boolean first = true; for (Object o1 : ll) { - if (!first) + if (!first) { ss.append(",\n"); + } first = false; generateJson(ss, o1, indent + 1, true, escape, quotes); @@ -241,14 +259,16 @@ public final class XmlJsonUtil { int i11 = s.indexOf('}', k); int i12 = s.indexOf(']', k); int i1 = -1; - if (i11 < 0) + if (i11 < 0) { i1 = i12; - else if (i12 < 0) + } else if (i12 < 0) { i1 = i11; - else + } else { i1 = i11 < i12 ? i11 : i12; - if (i1 < 0) + } + if (i1 < 0) { break; + } int i2 = s.lastIndexOf(',', i1); if (i2 < 0) { @@ -282,15 +302,14 @@ public final class XmlJsonUtil { if (i11 < 0) { i1 = i12; curly = false; - } else if (i12 < 0) + } else if (i12 < 0) { i1 = i11; - else - if (i11 < i12) - i1 = i11; - else { - i1 = i12; - curly = false; - } + } else if (i11 < i12) { + i1 = i11; + } else { + i1 = i12; + curly = false; + } if (i1 >= 0) { int i2 = curly ? s.indexOf('}', i1) : s.indexOf(']', i1); @@ -298,25 +317,31 @@ public final class XmlJsonUtil { String value = s.substring(i1 + 1, i2); if (value.trim().length() == 0) { int i4 = s.lastIndexOf('\n', i1); - if (i4 < 0) + if (i4 < 0) { i4 = 0; + } int i5 = s.indexOf('\n', i2); - if (i5 < 0) + if (i5 < 0) { i5 = s.length(); + } + /*If template mandates empty construct to be present, those should not be removed.*/ - if ((template != null) && template.contains(s.substring(i4))) { + if (template != null && template.contains(s.substring(i4))) { k = i1 + 1; } else { s = s.substring(0, i4) + s.substring(i5); k = 0; } - } else + } else { k = i1 + 1; - } else + } + } else { break; - } else + } + } else { break; + } } return s; @@ -326,8 +351,9 @@ public final class XmlJsonUtil { int k = 0; while (k < s.length()) { int i1 = s.indexOf('<', k); - if (i1 < 0 || i1 == s.length() - 1) + if (i1 < 0 || i1 == s.length() - 1) { break; + } char c1 = s.charAt(i1 + 1); if (c1 == '?' || c1 == '!') { @@ -355,11 +381,13 @@ public final class XmlJsonUtil { } int i4 = s.lastIndexOf('\n', i1); - if (i4 < 0) + if (i4 < 0) { i4 = 0; + } int i5 = s.indexOf('\n', i3); - if (i5 < 0) + if (i5 < 0) { i5 = s.length(); + } s = s.substring(0, i4) + s.substring(i5); k = 0; @@ -385,8 +413,9 @@ public final class XmlJsonUtil { private static String pad(int n) { StringBuilder s = new StringBuilder(); - for (int i = 0; i < n; i++) + for (int i = 0; i < n; i++) { s.append(Character.toString('\t')); + } return s.toString(); } } diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java index cf6af66f..42e9e57a 100644 --- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java +++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java @@ -35,6 +35,7 @@ import java.util.Set; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import javax.xml.XMLConstants; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.slf4j.Logger; @@ -42,6 +43,7 @@ import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; +import org.xml.sax.XMLReader; public final class XmlParser { @@ -58,10 +60,15 @@ public final class XmlParser { Handler handler = new Handler(listNameList); try { - SAXParserFactory factory = SAXParserFactory.newInstance(); - SAXParser saxParser = factory.newSAXParser(); + SAXParserFactory spf = SAXParserFactory.newInstance(); + spf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); + spf.setFeature("http://xml.org/sax/features/external-general-entities", false); + spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false); + spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); InputStream in = new ByteArrayInputStream(s.getBytes()); + SAXParser saxParser = spf.newSAXParser(); saxParser.parse(in, handler); + } catch (ParserConfigurationException | IOException | SAXException | NumberFormatException e) { throw new SvcLogicException("Unable to convert XML to properties" + e.getLocalizedMessage(), e); } diff --git a/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java b/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java index 9812f2a1..ac6d3b78 100644 --- a/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java +++ b/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java @@ -152,6 +152,65 @@ public class TestXmlJsonUtil { log.info(ss); } + public void testRemoveEmptyStructJson1() { + String xmlin = "{\n" + + " \"policyName\" : \"default-domain.ECOM_Tenant_DND.ECOM_Tenant_DND_mtn6_HngwOamNetVto." + + "HNGWOAMNETVTO.OAM_landing-network-role_policy_05\",\n" + + " \"policyConfigType\": \"MicroService\",\n" + + " \"ecompName\": \"SDNC\",\n" + + " \"configBody\": \"{\\\"service\\\": \\\"NetworkPolicy\\\"," + + "\\\"location\\\": \\\"Search\\\",\\\"uuid\\\": \\\"Search\\\"," + + "\\\"policyName\\\": \\\"default-domain.ECOM_Tenant_DND.ECOM_Tenant_DND_mtn6_HngwOamNetVto." + + "HNGWOAMNETVTO.OAM_landing-network-role_policy_05\\\"," + + "\\\"description\\\": \\\"default-domain.ECOM_Tenant_DND.ECOM_Tenant_DND_mtn6_HngwOamNetVto." + + "HNGWOAMNETVTO.OAM_landing-network-role_policy_05\\\",\\\"configName\\\": \\\"Search\\\"," + + "\\\"templateVersion\\\": \\\"1607\\\",\\\"version\\\": \\\"1.3.0.1\\\"," + + "\\\"priority\\\": \\\"2\\\",\\\"policyScope\\\": \\\"SDNC\\\",\\\"riskType\\\": \\\"low\\\"," + + "\\\"riskLevel\\\": \\\"2\\\",\\\"guard\\\": \\\"True\\\",\\\"content\\\":{ " + + "\\\"network-policy\\\": { \\\"display_name\\\": \\\"default-domain.ECOM_Tenant_DND." + + "ECOM_Tenant_DND_mtn6_HngwOamNetVto.HNGWOAMNETVTO.OAM_landing-network-role_policy_05\\\", " + + "\\\"fq_name\\\": [ \\\"default-domain\\\", " + + "\\\"ECOM_Tenant_DND\\\", \\\"default-domain." + + "ECOM_Tenant_DND.ECOM_Tenant_DND_mtn6_HngwOamNetVto." + + "HNGWOAMNETVTO.OAM_landing-network-role_policy_05\\\" ], " + + "\\\"id_perms\\\": { \\\"user_visible\\\": true }, " + + "\\\"parent_type\\\": \\\"project\\\", \\\"network_policy_entries\\\": { " + + "\\\"policy_rule\\\": [ { " + + "\\\"action_list\\\": { \\\"apply_service\\\": [ " + + "\\\"testfqdn\\\" ], " + + "\\\"gateway_name\\\": null, \\\"qos_action\\\": null, " + + "\\\"log\\\": false , \\\"mirror_to\\\": null, " + + "\\\"simple_action\\\": null }, " + + "\\\"ethertype\\\": null, \\\"application\\\": [], " + + "\\\"direction\\\": \\\"<>\\\", \\\"dst_addresses\\\": [ " + + "{ \\\"network_policy\\\": null, " + + "\\\"security_group\\\": null, " + + "\\\"subnet\\\": null, \\\"virtual_network\\\": " + + "\\\"default-domain:ECOM_Tenant_DND:ECOM_Tenant_DND_int_HngwOamNetVto." + + "HNGWOAMNETVTO.OAM_net_10\\\" } ], " + + "\\\"dst_ports\\\": [ { " + + "\\\"end_port\\\": -1, \\\"start_port\\\": -1 " + + "} ], \\\"protocol\\\": \\\"any\\\", " + + "\\\"src_addresses\\\": [ { " + + "\\\"network_policy\\\": null, " + + "\\\"security_group\\\": null, " + + "\\\"subnet\\\": null, \\\"virtual_network\\\": " + + "\\\"default-domain:ECOM_Tenant_DND:ECOM_Tenant_DND_int_HngwOamNetVto." + + "HNGWOAMNETVTO.OAM_net_9\\\" } ], " + + "\\\"src_ports\\\": [ { " + + "\\\"end_port\\\": -1, " + + "\\\"start_port\\\": -1 } ] } " + + "] } }}}\"\n" + + "}"; + + String xmloutexpected = xmlin; + + String xmlout = XmlJsonUtil.removeEmptyStructJson(null, xmlin); + log.info(xmlout); + + Assert.assertEquals(xmloutexpected, xmlout); + } + @Test public void testRemoveEmptyStructXml() { String xmlin = "" + diff --git a/restapi-call-node/provider/src/test/resources/test-template.json b/restapi-call-node/provider/src/test/resources/test-template.json index 4adc6637..faefef31 100644 --- a/restapi-call-node/provider/src/test/resources/test-template.json +++ b/restapi-call-node/provider/src/test/resources/test-template.json @@ -51,6 +51,7 @@ "run-id": ${tmp.sdn-circuit-req-row[${1}].run-id}, "hostname": ${tmp.sdn-circuit-req-row[${1}].hostname}, "algo-request-reason": ${tmp.sdn-circuit-req-row[${1}].algo-request-reason} + "test-empty-value": ${tmp.sdn-circuit-req-row[${1}].test-empty-value} }, } ] diff --git a/restconf-client/features/ccsdk-restconf-client/pom.xml b/restconf-client/features/ccsdk-restconf-client/pom.xml index 8faa16a0..28f3fc50 100644 --- a/restconf-client/features/ccsdk-restconf-client/pom.xml +++ b/restconf-client/features/ccsdk-restconf-client/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-restconf-client</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <properties> diff --git a/restconf-client/features/features-restconf-client/pom.xml b/restconf-client/features/features-restconf-client/pom.xml index 790e5b12..49360057 100644 --- a/restconf-client/features/features-restconf-client/pom.xml +++ b/restconf-client/features/features-restconf-client/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>features-restconf-client</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name> diff --git a/restconf-client/features/pom.xml b/restconf-client/features/pom.xml index 4537098f..d3123f7e 100755 --- a/restconf-client/features/pom.xml +++ b/restconf-client/features/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restconf-client-features</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name> diff --git a/restconf-client/installer/pom.xml b/restconf-client/installer/pom.xml index 09d29004..7f80aa95 100755 --- a/restconf-client/installer/pom.xml +++ b/restconf-client/installer/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restconf-client-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name> diff --git a/restconf-client/lighty/pom.xml b/restconf-client/lighty/pom.xml deleted file mode 100755 index 7fdf6b8f..00000000 --- a/restconf-client/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?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.plugins</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 deleted file mode 100644 index bb0fc90d..00000000 --- a/restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * ============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 221987d8..2d1893f6 100755 --- a/restconf-client/pom.xml +++ b/restconf-client/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restconf-client</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restconf-client</name> @@ -20,6 +20,5 @@ <module>provider</module> <module>features</module> <module>installer</module> - <module>lighty</module> </modules> </project> diff --git a/restconf-client/provider/pom.xml b/restconf-client/provider/pom.xml index ab685bb8..953db693 100755 --- a/restconf-client/provider/pom.xml +++ b/restconf-client/provider/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restconf-client-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name> diff --git a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml b/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml index 44c5540f..c0539c4d 100644 --- a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml +++ b/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-sshapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/sshapi-call-node/features/features-sshapi-call-node/pom.xml b/sshapi-call-node/features/features-sshapi-call-node/pom.xml index 893b68a7..6b9827c5 100644 --- a/sshapi-call-node/features/features-sshapi-call-node/pom.xml +++ b/sshapi-call-node/features/features-sshapi-call-node/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>features-sshapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/sshapi-call-node/features/pom.xml b/sshapi-call-node/features/pom.xml index 6e31170a..7e367cea 100755 --- a/sshapi-call-node/features/pom.xml +++ b/sshapi-call-node/features/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sshapi-call-node-features</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/sshapi-call-node/installer/pom.xml b/sshapi-call-node/installer/pom.xml index 1b248a3d..475da0c7 100755 --- a/sshapi-call-node/installer/pom.xml +++ b/sshapi-call-node/installer/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sshapi-call-node-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/sshapi-call-node/lighty/pom.xml b/sshapi-call-node/lighty/pom.xml deleted file mode 100755 index ecc41142..00000000 --- a/sshapi-call-node/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?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.plugins</groupId> - <artifactId>sshapi-call-node-lighty</artifactId> - <version>0.6.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>ccsdk-sli-plugins :: sshapi-call-node :: ${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>sshapi-call-node-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/sshapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/lighty/SshApiCallModule.java b/sshapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/lighty/SshApiCallModule.java deleted file mode 100644 index d8f1932d..00000000 --- a/sshapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/lighty/SshApiCallModule.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * ============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.sshapicall.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.sshapicall.SshApiCallNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the sshapi-call-node-provider artifact. - */ -public class SshApiCallModule extends AbstractLightyModule implements LightyModule { - - private SshApiCallNode sshApiCallNode; - - @Override - protected boolean initProcedure() { - this.sshApiCallNode = new SshApiCallNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public SshApiCallNode getSshApiCallNode() { - return this.sshApiCallNode; - } -} diff --git a/sshapi-call-node/pom.xml b/sshapi-call-node/pom.xml index 4238e773..d46da197 100755 --- a/sshapi-call-node/pom.xml +++ b/sshapi-call-node/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sshapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node</name> @@ -20,6 +20,5 @@ <module>provider</module> <module>features</module> <module>installer</module> - <module>lighty</module> </modules> </project> diff --git a/sshapi-call-node/provider/pom.xml b/sshapi-call-node/provider/pom.xml index cd920a87..0ad9e2a7 100755 --- a/sshapi-call-node/provider/pom.xml +++ b/sshapi-call-node/provider/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sshapi-call-node-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/template-node/features/ccsdk-template-node/pom.xml b/template-node/features/ccsdk-template-node/pom.xml index 91658ae6..e3410698 100644 --- a/template-node/features/ccsdk-template-node/pom.xml +++ b/template-node/features/ccsdk-template-node/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-template-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name> diff --git a/template-node/features/features-template-node/pom.xml b/template-node/features/features-template-node/pom.xml index 105a0324..11e459d0 100644 --- a/template-node/features/features-template-node/pom.xml +++ b/template-node/features/features-template-node/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>features-template-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <dependencies> diff --git a/template-node/features/pom.xml b/template-node/features/pom.xml index 391a6ce1..40574a1f 100644 --- a/template-node/features/pom.xml +++ b/template-node/features/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>template-node-features</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/template-node/installer/pom.xml b/template-node/installer/pom.xml index 2a5891dd..7fbbeec7 100644 --- a/template-node/installer/pom.xml +++ b/template-node/installer/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>template-node-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name> diff --git a/template-node/lighty/pom.xml b/template-node/lighty/pom.xml deleted file mode 100755 index f9bc94d8..00000000 --- a/template-node/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?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.plugins</groupId> - <artifactId>template-node-lighty</artifactId> - <version>0.6.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>ccsdk-sli-plugins :: template-node :: ${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>template-node-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/template-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/template/lighty/TemplateNodeModule.java b/template-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/template/lighty/TemplateNodeModule.java deleted file mode 100644 index 1cd836bb..00000000 --- a/template-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/template/lighty/TemplateNodeModule.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * ============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.template.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.template.TemplateNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the template-node-provider artifact. - */ -public class TemplateNodeModule extends AbstractLightyModule implements LightyModule { - - private TemplateNode templateNode; - - @Override - protected boolean initProcedure() { - this.templateNode = new TemplateNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public TemplateNode getTemplateNode() { - return this.templateNode; - } -} diff --git a/template-node/pom.xml b/template-node/pom.xml index 4149f874..58a83c84 100644 --- a/template-node/pom.xml +++ b/template-node/pom.xml @@ -5,18 +5,17 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>template-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>provider</module> <module>features</module> <module>installer</module> - <module>lighty</module> </modules> </project> diff --git a/template-node/provider/pom.xml b/template-node/provider/pom.xml index f9cd3ef2..477a539f 100644 --- a/template-node/provider/pom.xml +++ b/template-node/provider/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>template-node-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name> diff --git a/version.properties b/version.properties index 3fc281cb..24c154ad 100644 --- a/version.properties +++ b/version.properties @@ -7,7 +7,7 @@ release_name=0 sprint_number=6 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} |