Merge "Add schema to persist notification subscription information"

4 files changed, 2 insertions, 191 deletions

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/AbstractModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/AbstractModelLoader.java
deleted file mode 100644
index ad5e431944..0000000000
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/AbstractModelLoader.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- *  ============LICENSE_START=======================================================
- *  Copyright (C) 2023-2024 Nordix Foundation
- *  ================================================================================
- *  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.
- *
- *  SPDX-License-Identifier: Apache-2.0
- *  ============LICENSE_END=========================================================
- */
-
-package org.onap.cps.ncmp.init;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.Map;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.onap.cps.api.CpsAnchorService;
-import org.onap.cps.api.CpsDataService;
-import org.onap.cps.api.CpsDataspaceService;
-import org.onap.cps.api.CpsModuleService;
-import org.onap.cps.api.exceptions.AlreadyDefinedException;
-import org.onap.cps.api.parameters.CascadeDeleteAllowed;
-import org.onap.cps.ncmp.exceptions.NcmpStartUpException;
-import org.onap.cps.utils.JsonObjectMapper;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.context.event.ApplicationStartedEvent;
-
-@Slf4j
-@RequiredArgsConstructor
-abstract class AbstractModelLoader implements ModelLoader {
-
-    private final CpsDataspaceService cpsDataspaceService;
-    private final CpsModuleService cpsModuleService;
-    private final CpsAnchorService cpsAnchorService;
-    protected final CpsDataService cpsDataService;
-
-    private static final int EXIT_CODE_ON_ERROR = 1;
-
-    private final JsonObjectMapper jsonObjectMapper = new JsonObjectMapper(new ObjectMapper());
-
-    @Value("${ncmp.model-loader.maximum-attempt-count:20}")
-    int maximumAttemptCount;
-
-    @Value("${ncmp.timers.model-loader.retry-time-ms:1000}")
-    long retryTimeMs;
-
-    @Override
-    public void onApplicationEvent(@NonNull final ApplicationStartedEvent applicationStartedEvent) {
-        try {
-            onboardOrUpgradeModel();
-        } catch (final NcmpStartUpException ncmpStartUpException) {
-            log.error("Onboarding model for NCMP failed: {} ", ncmpStartUpException.getMessage());
-            SpringApplication.exit(applicationStartedEvent.getApplicationContext(), () -> EXIT_CODE_ON_ERROR);
-        }
-    }
-
-    void createSchemaSet(final String dataspaceName, final String schemaSetName, final String... resourceNames) {
-        try {
-            final Map<String, String> yangResourcesContentMap = createYangResourcesToContentMap(resourceNames);
-            cpsModuleService.createSchemaSet(dataspaceName, schemaSetName, yangResourcesContentMap);
-        } catch (final AlreadyDefinedException alreadyDefinedException) {
-            log.warn("Creating new schema set failed as schema set already exists");
-        } catch (final Exception exception) {
-            log.error("Creating schema set failed: {} ", exception.getMessage());
-            throw new NcmpStartUpException("Creating schema set failed", exception.getMessage());
-        }
-    }
-
-    void createDataspace(final String dataspaceName) {
-        try {
-            cpsDataspaceService.createDataspace(dataspaceName);
-        } catch (final AlreadyDefinedException alreadyDefinedException) {
-            log.debug("Dataspace already exists");
-        } catch (final Exception exception) {
-            log.error("Creating dataspace failed: {} ", exception.getMessage());
-            throw new NcmpStartUpException("Creating dataspace failed", exception.getMessage());
-        }
-    }
-
-    void deleteUnusedSchemaSets(final String dataspaceName, final String... schemaSetNames) {
-        for (final String schemaSetName : schemaSetNames) {
-            try {
-                cpsModuleService.deleteSchemaSet(
-                    dataspaceName, schemaSetName, CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED);
-            } catch (final Exception exception) {
-                log.warn("Deleting schema set failed: {} ", exception.getMessage());
-            }
-        }
-    }
-
-    void createAnchor(final String dataspaceName, final String schemaSetName, final String anchorName) {
-        try {
-            cpsAnchorService.createAnchor(dataspaceName, schemaSetName, anchorName);
-        } catch (final AlreadyDefinedException alreadyDefinedException) {
-            log.warn("Creating new anchor failed as anchor already exists");
-        } catch (final Exception exception) {
-            log.error("Creating anchor failed: {} ", exception.getMessage());
-            throw new NcmpStartUpException("Creating anchor failed", exception.getMessage());
-        }
-    }
-
-    void createTopLevelDataNode(final String dataspaceName, final String anchorName, final String dataNodeName) {
-        final String nodeData = jsonObjectMapper.asJsonString(Map.of(dataNodeName, Map.of()));
-        try {
-            cpsDataService.saveData(dataspaceName, anchorName, nodeData, OffsetDateTime.now());
-        } catch (final AlreadyDefinedException exception) {
-            log.warn("Creating new data node '{}' failed as data node already exists", dataNodeName);
-        } catch (final Exception exception) {
-            log.error("Creating data node failed: {}", exception.getMessage());
-            throw new NcmpStartUpException("Creating data node failed", exception.getMessage());
-        }
-    }
-
-    void updateAnchorSchemaSet(final String dataspaceName, final String anchorName, final String schemaSetName) {
-        try {
-            cpsAnchorService.updateAnchorSchemaSet(dataspaceName, anchorName, schemaSetName);
-        } catch (final Exception exception) {
-            log.error("Updating schema set failed: {}", exception.getMessage());
-            throw new NcmpStartUpException("Updating schema set failed", exception.getMessage());
-        }
-    }
-
-    Map<String, String> createYangResourcesToContentMap(final String... resourceNames) {
-        final Map<String, String> yangResourcesToContentMap = new HashMap<>();
-        for (final String resourceName: resourceNames) {
-            yangResourcesToContentMap.put(resourceName, getFileContentAsString("models/" + resourceName));
-        }
-        return yangResourcesToContentMap;
-    }
-
-    private String getFileContentAsString(final String fileName) {
-        try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(fileName)) {
-            return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-        } catch (final Exception exception) {
-            final String message = String.format("Onboarding failed as unable to read file: %s", fileName);
-            log.debug(message);
-            throw new NcmpStartUpException(message, exception.getMessage());
-        }
-    }
-
-}
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java
index d1145fd24a..d5238ae06b 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java
@@ -30,6 +30,7 @@ import org.onap.cps.api.CpsDataService;
 import org.onap.cps.api.CpsDataspaceService;
 import org.onap.cps.api.CpsModuleService;
 import org.onap.cps.api.exceptions.AlreadyDefinedException;
+import org.onap.cps.init.AbstractModelLoader;
 import org.onap.cps.ncmp.api.data.models.DatastoreType;
 import org.onap.cps.ncmp.exceptions.NcmpStartUpException;
 import org.springframework.stereotype.Service;
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/InventoryModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/InventoryModelLoader.java
index 76d12f290c..58a5f553af 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/InventoryModelLoader.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/InventoryModelLoader.java
@@ -29,6 +29,7 @@ import org.onap.cps.api.CpsAnchorService;
 import org.onap.cps.api.CpsDataService;
 import org.onap.cps.api.CpsDataspaceService;
 import org.onap.cps.api.CpsModuleService;
+import org.onap.cps.init.AbstractModelLoader;
 import org.springframework.stereotype.Service;
 
 @Slf4j
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/ModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/ModelLoader.java
deleted file mode 100644
index 9832ba3f9e..0000000000
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/ModelLoader.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  ============LICENSE_START=======================================================
- *  Copyright (C) 2023-2024 Nordix Foundation
- *  ================================================================================
- *  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.
- *
- *  SPDX-License-Identifier: Apache-2.0
- *  ============LICENSE_END=========================================================
- */
-
-package org.onap.cps.ncmp.init;
-
-import lombok.NonNull;
-import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.context.ApplicationListener;
-
-public interface ModelLoader extends ApplicationListener<ApplicationStartedEvent> {
-
-    @Override
-    void onApplicationEvent(@NonNull ApplicationStartedEvent applicationStartedEvent);
-
-    void onboardOrUpgradeModel();
-
-}