diff options
author | 2023-03-30 12:21:58 +0100 | |
---|---|---|
committer | 2023-03-30 12:21:58 +0100 | |
commit | 7cc38f39982915238d8d34018decca5af95d5b98 (patch) | |
tree | 4a9442aea7211df036133f4f3c9d4fe5ed7d5498 /cps-ncmp-service/src/main | |
parent | 3c7f8e7f345bb6cd162f88079dee57a6d3ae42a5 (diff) |
[CPS] Improve code coverage for Class 'SubscriptionModelLoader'
Issue-ID: CPS-1584
Signed-off-by: raviteja.karumuri <raviteja.karumuri@est.tech>
Change-Id: Ief2b14cc90c24db50a95f1c62661b1918413408e
Diffstat (limited to 'cps-ncmp-service/src/main')
-rw-r--r-- | cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java index 705c9d266..231ba75b5 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java @@ -24,7 +24,6 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.time.OffsetDateTime; import java.util.Map; -import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.onap.cps.api.CpsAdminService; @@ -45,6 +44,8 @@ public class SubscriptionModelLoader implements ModelLoader { private final CpsAdminService cpsAdminService; private final CpsModuleService cpsModuleService; private final CpsDataService cpsDataService; + private static final String SUBSCRIPTION_MODEL_FILENAME = "subscription.yang"; + private static final String SUBSCRIPTION_MODEL_RESOURCE_PATH = "model/" + SUBSCRIPTION_MODEL_FILENAME; private static final String SUBSCRIPTION_DATASPACE_NAME = "NCMP-Admin"; private static final String SUBSCRIPTION_ANCHOR_NAME = "AVC-Subscriptions"; private static final String SUBSCRIPTION_SCHEMASET_NAME = "subscriptions"; @@ -59,10 +60,10 @@ public class SubscriptionModelLoader implements ModelLoader { * @param applicationReadyEvent the event to respond to */ @Override - public void onApplicationEvent(@NonNull final ApplicationReadyEvent applicationReadyEvent) { + public void onApplicationEvent(final ApplicationReadyEvent applicationReadyEvent) { try { if (subscriptionModelLoaderEnabled) { - onboardSubscriptionModel(); + onboardSubscriptionModel(createYangResourceToContentMap()); } else { log.info("Subscription Model Loader is disabled"); } @@ -75,21 +76,18 @@ public class SubscriptionModelLoader implements ModelLoader { /** * Method to onboard subscription model for NCMP. */ - private void onboardSubscriptionModel() { - final Map<String, String> yangResourceContentMap = createYangResourceToContentMap(); - if (!yangResourceContentMap.get("subscription.yang").isEmpty()) { - createSchemaSet(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_SCHEMASET_NAME, yangResourceContentMap); - createAnchor(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_SCHEMASET_NAME, SUBSCRIPTION_ANCHOR_NAME); - createTopLevelDataNode(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_ANCHOR_NAME, - SUBSCRIPTION_REGISTRY_DATANODE_NAME); - } + private void onboardSubscriptionModel(final Map<String, String> yangResourceContentMap) { + createSchemaSet(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_SCHEMASET_NAME, yangResourceContentMap); + createAnchor(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_SCHEMASET_NAME, SUBSCRIPTION_ANCHOR_NAME); + createTopLevelDataNode(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_ANCHOR_NAME, + SUBSCRIPTION_REGISTRY_DATANODE_NAME); } @Override public boolean createSchemaSet(final String dataspaceName, - final String schemaSetName, - final Map<String, String> yangResourceContentMap) { + final String schemaSetName, + final Map<String, String> yangResourceContentMap) { try { cpsModuleService.createSchemaSet(dataspaceName, schemaSetName, yangResourceContentMap); } catch (final AlreadyDefinedException exception) { @@ -129,24 +127,24 @@ public class SubscriptionModelLoader implements ModelLoader { try { cpsDataService.saveData(dataspaceName, anchorName, nodeData, OffsetDateTime.now()); } catch (final AlreadyDefinedException exception) { - log.info("Creating new data node {} failed as data node already exists", dataNodeName); + log.info("Creating new data node '{}' failed as data node already exists", dataNodeName); } catch (final Exception exception) { log.debug("Creating data node for subscription model failed: {}", exception.getMessage()); throw new NcmpStartUpException("Creating data node failed", exception.getMessage()); } } - private String getFileContentAsString() { - try (InputStream inputStream = getClass().getClassLoader() - .getResourceAsStream("model/subscription.yang")) { + 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) { - log.debug("Onboarding failed as unable to read file: {}", exception.getCause().toString()); - throw new NcmpStartUpException("Onboarding failed as unable to read file: {}", exception.getMessage()); + final String message = String.format("Onboarding failed as unable to read file: %s", fileName); + log.debug(message); + throw new NcmpStartUpException(message, exception.getMessage()); } } private Map<String, String> createYangResourceToContentMap() { - return Map.of("subscription.yang", getFileContentAsString()); + return Map.of(SUBSCRIPTION_MODEL_FILENAME, getFileContentAsString(SUBSCRIPTION_MODEL_RESOURCE_PATH)); } } |