From 23bd18865486d334647a4928104acce625795e18 Mon Sep 17 00:00:00 2001 From: sourabh_sourabh Date: Mon, 20 Dec 2021 23:28:49 +0530 Subject: [PATCH] Fix Sonar Qube Violations - Recurring task Issue-ID: CPS-475 Signed-off-by: sourabh_sourabh Change-Id: I5c10360ec42bc9737ed86140398ef954109275dd --- .../org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java | 6 ++++++ .../org/onap/cps/ncmp/api/impl/operations/DmiModelOperations.java | 4 ++-- .../java/org/onap/cps/spi/exceptions/DataspaceInUseException.java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java b/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java index 28bb28ce8..0ad30f19c 100755 --- a/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java +++ b/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java @@ -78,6 +78,7 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { * Create Node. * @deprecated This Method is no longer used as part of NCMP. */ + // All deprecated APIs methods will be address into https://jira.onap.org/browse/CPS-642 @Override @Deprecated(forRemoval = false) public ResponseEntity createNode(final String cmHandle, @Valid final Object jsonData, @@ -90,6 +91,7 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { * Add List-node Child Element. * @deprecated This Method is no longer used as part of NCMP. */ + // All deprecated APIs methods will be address into https://jira.onap.org/browse/CPS-642 @Override @Deprecated(forRemoval = false) public ResponseEntity addListNodeElements(@NotNull @Valid final String parentNodeXpath, @@ -102,6 +104,7 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { * Get Node By CM Handle and X-Path. * @deprecated This Method is no longer used as part of NCMP. */ + // All deprecated APIs methods will be address into https://jira.onap.org/browse/CPS-642 @Override @Deprecated(forRemoval = false) public ResponseEntity getNodeByCmHandleAndXpath(final String cmHandle, @Valid final String xpath, @@ -116,6 +119,7 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { * Query Data Nodes. * @deprecated This Method is no longer used as part of NCMP. */ + // All deprecated APIs methods will be address into https://jira.onap.org/browse/CPS-642 @Override @Deprecated(forRemoval = false) public ResponseEntity queryNodesByCmHandleAndCpsPath(final String cmHandle, @Valid final String cpsPath, @@ -131,6 +135,7 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { * Replace Node With Descendants. * @deprecated This Method is no longer used as part of NCMP. */ + // All deprecated APIs methods will be address into https://jira.onap.org/browse/CPS-642 @Override @Deprecated(forRemoval = false) public ResponseEntity replaceNode(final String cmHandle, @Valid final Object jsonData, @@ -143,6 +148,7 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { * Update Node Leaves. * @deprecated This Method is no longer used as part of NCMP. */ + // All deprecated APIs methods will be address into https://jira.onap.org/browse/CPS-642 @Override @Deprecated(forRemoval = false) public ResponseEntity updateNodeLeaves(final String cmHandle, @Valid final Object jsonData, diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiModelOperations.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiModelOperations.java index f74616ab3..20a3309d0 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiModelOperations.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiModelOperations.java @@ -136,11 +136,11 @@ public class DmiModelOperations extends DmiOperations { return asJsonObject; } - private List toModuleReferences(final Map dmiFetchModulesResponseAsMap) { + private List toModuleReferences(final Map dmiFetchModulesResponseAsMap) { final List moduleReferences = new ArrayList<>(); if (dmiFetchModulesResponseAsMap != null) { - final List moduleReferencesAsList = (List) dmiFetchModulesResponseAsMap.get("schemas"); + final List moduleReferencesAsList = (List) dmiFetchModulesResponseAsMap.get("schemas"); if (moduleReferencesAsList != null) { moduleReferencesAsList.forEach(moduleReferenceAsMap -> { final ModuleReference moduleReference = diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceInUseException.java b/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceInUseException.java index 7889301dd..14167315f 100644 --- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceInUseException.java +++ b/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceInUseException.java @@ -23,7 +23,7 @@ package org.onap.cps.spi.exceptions; * Runtime exception. * Thrown when given dataspace name is rejected to be deleted because it has anchor or schemasets associated. */ - +@SuppressWarnings("squid:S110") // Team agreed to accept 6 levels of inheritance for CPS Exceptions public class DataspaceInUseException extends DataInUseException { private static final long serialVersionUID = 4531370947720760347L; -- 2.16.6