From 6a146258879e64344b5837dfa6dee566edba4dda Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 29 Aug 2019 11:16:02 -0400 Subject: Revert "Proposal to remove OSGi dependencies from the CCSDK project" This reverts commit 7b76725b56304435b01c5b97c3424da0605119ee. This must be reverted due to lack of jUnit test cases. Change-Id: I0a9116e3ed95553505cd7517f8f3aca53d0c9c5d Signed-off-by: Timoney, Dan (dt5972) --- asdcApi/lighty/pom.xml | 47 -------- .../northbound/asdcapi/lighty/AsdcApiModule.java | 61 ----------- asdcApi/pom.xml | 1 - ccsdk-northbound-lighty/pom.xml | 39 ------- .../lighty/CcsdkNorhboundLightyModule.java | 119 --------------------- dataChange/lighty/pom.xml | 47 -------- .../dataChange/lighty/DataChangeModule.java | 62 ----------- dataChange/pom.xml | 1 - dmaap-listener/pom.xml | 2 +- lcm/lighty/pom.xml | 47 -------- .../ccsdk/sli/northbound/lcm/lighty/LcmModule.java | 64 ----------- lcm/pom.xml | 1 - pom.xml | 1 - ueb-listener/pom.xml | 2 +- 14 files changed, 2 insertions(+), 492 deletions(-) delete mode 100755 asdcApi/lighty/pom.xml delete mode 100644 asdcApi/lighty/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/lighty/AsdcApiModule.java delete mode 100755 ccsdk-northbound-lighty/pom.xml delete mode 100644 ccsdk-northbound-lighty/src/main/java/org/onap/ccsdk/sli/northbound/lighty/CcsdkNorhboundLightyModule.java delete mode 100755 dataChange/lighty/pom.xml delete mode 100644 dataChange/lighty/src/main/java/org/onap/ccsdk/sli/northbound/dataChange/lighty/DataChangeModule.java delete mode 100755 lcm/lighty/pom.xml delete mode 100644 lcm/lighty/src/main/java/org/onap/ccsdk/sli/northbound/lcm/lighty/LcmModule.java diff --git a/asdcApi/lighty/pom.xml b/asdcApi/lighty/pom.xml deleted file mode 100755 index 5bfbf2bf..00000000 --- a/asdcApi/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.4.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - asdcApi-lighty - 0.6.1-SNAPSHOT - jar - - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} - http://maven.apache.org - - - UTF-8 - - - - - - org.onap.ccsdk.sli.core - ccsdk-lighty-dependency-versions - ${project.version} - pom - import - - - - - - - io.lighty.core - lighty-controller - - - org.onap.ccsdk.sli.northbound - asdcApi-provider - ${project.version} - - - diff --git a/asdcApi/lighty/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/lighty/AsdcApiModule.java b/asdcApi/lighty/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/lighty/AsdcApiModule.java deleted file mode 100644 index 2895e17e..00000000 --- a/asdcApi/lighty/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/lighty/AsdcApiModule.java +++ /dev/null @@ -1,61 +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.northbound.asdcapi.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService; -import org.onap.ccsdk.sli.northbound.asdcapi.AsdcApiProvider; -import org.onap.ccsdk.sli.northbound.asdcapi.AsdcApiSliClient; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the asdcApi-provicer artifact. - */ -public class AsdcApiModule extends AbstractLightyModule implements LightyModule { - - private final SvcLogicService svcLogicService; - private final DataBroker dataBroker; - private final NotificationPublishService publishService; - private final RpcProviderRegistry rpcRegistry; - private AsdcApiSliClient asdcApiClient; - private AsdcApiProvider asdcApiProvider; - - public AsdcApiModule(SvcLogicService svcLogicService, DataBroker dataBroker, - NotificationPublishService publishService, RpcProviderRegistry rpcRegistry) { - this.svcLogicService = svcLogicService; - this.dataBroker = dataBroker; - this.publishService = publishService; - this.rpcRegistry = rpcRegistry; - } - - @Override - protected boolean initProcedure() { - this.asdcApiClient = new AsdcApiSliClient(svcLogicService); - this.asdcApiProvider = new AsdcApiProvider(dataBroker, publishService, rpcRegistry, asdcApiClient); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - -} diff --git a/asdcApi/pom.xml b/asdcApi/pom.xml index e6e6af69..4f2b816f 100755 --- a/asdcApi/pom.xml +++ b/asdcApi/pom.xml @@ -25,7 +25,6 @@ features provider installer - lighty diff --git a/ccsdk-northbound-lighty/pom.xml b/ccsdk-northbound-lighty/pom.xml deleted file mode 100755 index dd3921dc..00000000 --- a/ccsdk-northbound-lighty/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.4.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - ccsdk-northbound-lighty - 0.6.1-SNAPSHOT - jar - - - - org.onap.ccsdk.sli.core - ccsdk-core-lighty - ${project.version} - - - org.onap.ccsdk.sli.northbound - asdcApi-lighty - ${project.version} - - - org.onap.ccsdk.sli.northbound - dataChange-lighty - ${project.version} - - - org.onap.ccsdk.sli.northbound - lcm-lighty - ${project.version} - - - diff --git a/ccsdk-northbound-lighty/src/main/java/org/onap/ccsdk/sli/northbound/lighty/CcsdkNorhboundLightyModule.java b/ccsdk-northbound-lighty/src/main/java/org/onap/ccsdk/sli/northbound/lighty/CcsdkNorhboundLightyModule.java deleted file mode 100644 index ce907bd9..00000000 --- a/ccsdk-northbound-lighty/src/main/java/org/onap/ccsdk/sli/northbound/lighty/CcsdkNorhboundLightyModule.java +++ /dev/null @@ -1,119 +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.northbound.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import org.onap.ccsdk.sli.core.lighty.common.CcsdkLightyUtils; -import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService; -import org.onap.ccsdk.sli.northbound.asdcapi.lighty.AsdcApiModule; -import org.onap.ccsdk.sli.northbound.dataChange.lighty.DataChangeModule; -import org.onap.ccsdk.sli.northbound.lcm.lighty.LcmModule; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -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-northbound 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 CcsdkNorhboundLightyModule extends AbstractLightyModule { - - private static final Logger LOG = LoggerFactory.getLogger(CcsdkNorhboundLightyModule.class); - - private final SvcLogicService svcLogicService; - private final DataBroker dataBroker; - private final NotificationPublishService publishService; - private final RpcProviderRegistry rpcProviderRegistry; - - private AsdcApiModule asdcApiModule; - private DataChangeModule dataChangeModule; - private LcmModule lcmModule; - - public CcsdkNorhboundLightyModule(SvcLogicService svcLogicService, DataBroker dataBroker, - NotificationPublishService publishService, RpcProviderRegistry rpcProviderRegistry) { - - this.svcLogicService = svcLogicService; - this.dataBroker = dataBroker; - this.publishService = publishService; - this.rpcProviderRegistry = rpcProviderRegistry; - } - - protected boolean initProcedure() { - LOG.debug("Initializing CCSDK Northbound Lighty module..."); - - this.asdcApiModule = new AsdcApiModule(svcLogicService, dataBroker, publishService, rpcProviderRegistry); - if (!CcsdkLightyUtils.startLightyModule(asdcApiModule)) { - LOG.error("Unable to start AsdcApiModule in CCSDK Northbound Lighty module!"); - return false; - } - - this.dataChangeModule = new DataChangeModule(svcLogicService, dataBroker, publishService, rpcProviderRegistry); - if (!CcsdkLightyUtils.startLightyModule(dataChangeModule)) { - LOG.error("Unable to start DataChangeModule in CCSDK Northbound Lighty module!"); - return false; - } - - this.lcmModule = new LcmModule(svcLogicService, dataBroker, publishService, rpcProviderRegistry); - if (!CcsdkLightyUtils.startLightyModule(lcmModule)) { - LOG.error("Unable to start LcmModule in CCSDK Northbound Lighty module!"); - return false; - } - - LOG.debug("CCSDK Northbound Lighty module was initialized successfully"); - return true; - } - - protected boolean stopProcedure() { - LOG.debug("Stopping CCSDK Northbound Lighty module..."); - - boolean stopSuccessful = true; - - if (!CcsdkLightyUtils.stopLightyModule(lcmModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(dataChangeModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(asdcApiModule)) { - stopSuccessful = false; - } - - if (stopSuccessful) { - LOG.debug("CCSDK Northbound Lighty module was stopped successfully"); - } else { - LOG.error("CCSDK Northbound Lighty module was not stopped successfully!"); - } - return stopSuccessful; - } - - public AsdcApiModule getAsdcApiModule() { - return asdcApiModule; - } - - public DataChangeModule getDataChangeModule() { - return dataChangeModule; - } - - public LcmModule getLcmModule() { - return lcmModule; - } -} diff --git a/dataChange/lighty/pom.xml b/dataChange/lighty/pom.xml deleted file mode 100755 index 28ff8ed8..00000000 --- a/dataChange/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.4.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - dataChange-lighty - 0.6.1-SNAPSHOT - jar - - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - http://maven.apache.org - - - UTF-8 - - - - - - org.onap.ccsdk.sli.core - ccsdk-lighty-dependency-versions - ${project.version} - pom - import - - - - - - - io.lighty.core - lighty-controller - - - org.onap.ccsdk.sli.northbound - dataChange-provider - ${project.version} - - - diff --git a/dataChange/lighty/src/main/java/org/onap/ccsdk/sli/northbound/dataChange/lighty/DataChangeModule.java b/dataChange/lighty/src/main/java/org/onap/ccsdk/sli/northbound/dataChange/lighty/DataChangeModule.java deleted file mode 100644 index 412d4665..00000000 --- a/dataChange/lighty/src/main/java/org/onap/ccsdk/sli/northbound/dataChange/lighty/DataChangeModule.java +++ /dev/null @@ -1,62 +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.northbound.dataChange.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService; -import org.onap.ccsdk.sli.northbound.DataChangeClient; -import org.onap.ccsdk.sli.northbound.DataChangeProvider; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the dataChange-provider artifact. - */ -public class DataChangeModule extends AbstractLightyModule implements LightyModule { - - private final SvcLogicService svcLogicService; - private final DataBroker dataBroker; - private final NotificationPublishService publishService; - private final RpcProviderRegistry rpcRegistry; - - private DataChangeClient dataChangeClient; - private DataChangeProvider dataChangeProvider; - - public DataChangeModule(SvcLogicService svcLogicService, DataBroker dataBroker, - NotificationPublishService publishService, RpcProviderRegistry rpcRegistry) { - this.svcLogicService = svcLogicService; - this.dataBroker = dataBroker; - this.publishService = publishService; - this.rpcRegistry = rpcRegistry; - } - - @Override - protected boolean initProcedure() { - this.dataChangeClient = new DataChangeClient(svcLogicService); - this.dataChangeProvider = new DataChangeProvider(dataBroker, publishService, rpcRegistry, dataChangeClient); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - -} diff --git a/dataChange/pom.xml b/dataChange/pom.xml index fed24d7b..18c9e379 100755 --- a/dataChange/pom.xml +++ b/dataChange/pom.xml @@ -21,7 +21,6 @@ features provider installer - lighty diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml index 2b3914a9..97853b22 100755 --- a/dmaap-listener/pom.xml +++ b/dmaap-listener/pom.xml @@ -24,7 +24,7 @@ ${maven.build.timestamp} ${project.version}-${build.number} - 0.6.0-SNAPSHOT + 0.6.1-SNAPSHOT ${project.version} diff --git a/lcm/lighty/pom.xml b/lcm/lighty/pom.xml deleted file mode 100755 index 53c88dd2..00000000 --- a/lcm/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.4.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - lcm-lighty - 0.6.1-SNAPSHOT - jar - - ccsdk-sli-northbound :: lcm :: ${project.artifactId} - http://maven.apache.org - - - UTF-8 - - - - - - org.onap.ccsdk.sli.core - ccsdk-lighty-dependency-versions - ${project.version} - pom - import - - - - - - - io.lighty.core - lighty-controller - - - org.onap.ccsdk.sli.northbound - lcm-provider - ${project.version} - - - diff --git a/lcm/lighty/src/main/java/org/onap/ccsdk/sli/northbound/lcm/lighty/LcmModule.java b/lcm/lighty/src/main/java/org/onap/ccsdk/sli/northbound/lcm/lighty/LcmModule.java deleted file mode 100644 index cbbf9fb2..00000000 --- a/lcm/lighty/src/main/java/org/onap/ccsdk/sli/northbound/lcm/lighty/LcmModule.java +++ /dev/null @@ -1,64 +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.northbound.lcm.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService; -import org.onap.ccsdk.sli.northbound.LcmProvider; -import org.onap.ccsdk.sli.northbound.LcmSliClient; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the lcm-provider artifact. - */ -public class LcmModule extends AbstractLightyModule implements LightyModule { - - private final SvcLogicService svcLogicService; - private final DataBroker dataBroker; - private final NotificationPublishService publishService; - private final RpcProviderRegistry rpcRegistry; - - private LcmSliClient lcmSliClient; - private LcmProvider lcmProvider; - - public LcmModule(final SvcLogicService svcLogicService, - final DataBroker dataBroker, - final NotificationPublishService publishService, - final RpcProviderRegistry rpcRegistry) { - this.svcLogicService = svcLogicService; - this.dataBroker = dataBroker; - this.publishService = publishService; - this.rpcRegistry = rpcRegistry; - } - - @Override - protected boolean initProcedure() { - this.lcmSliClient = new LcmSliClient(svcLogicService); - this.lcmProvider = new LcmProvider(dataBroker, publishService, rpcRegistry, lcmSliClient); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - -} diff --git a/lcm/pom.xml b/lcm/pom.xml index 3316f3ad..0eb61fe3 100755 --- a/lcm/pom.xml +++ b/lcm/pom.xml @@ -21,7 +21,6 @@ features provider installer - lighty diff --git a/pom.xml b/pom.xml index 9b3cc39c..be4c7923 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,6 @@ daexim-offsite-backup features artifacts - ccsdk-northbound-lighty ONAP diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml index f6a802f1..e6836428 100755 --- a/ueb-listener/pom.xml +++ b/ueb-listener/pom.xml @@ -22,7 +22,7 @@ yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} ${project.version}-${build.number} - 0.6.0-SNAPSHOT + 0.6.1-SNAPSHOT ${project.version} -- cgit 1.2.3-korg