From 689521eb9d1b07e62bc7fe6278ddb6c905e8aa38 Mon Sep 17 00:00:00 2001 From: ToineSiebelink Date: Wed, 7 Apr 2021 16:04:37 +0100 Subject: [PATCH] Fix SonarQube violations - Used @SupressWarning where issue was casued by 3PP we have not control over - Remove TODO's which are now addt to backlog as new JIRA's; CPS-324 and CPS-325 Issue-ID: CPS-89 Signed-off-by: ToineSiebelink Change-Id: Ieb64fd6d3f09144f6dea965c0aee3aefa6ec253c --- .../main/java/org/onap/cps/rest/controller/DataRestController.java | 2 +- cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java | 5 +---- cps-service/src/main/java/org/onap/cps/utils/YangUtils.java | 4 +++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java index 8366f06b3..f466ebcef 100755 --- a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2020 Bell Canada. All rights reserved. * Modifications Copyright (C) 2021 Pantheon.tech + * Modifications (C) 2021 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,7 +57,6 @@ public class DataRestController implements CpsDataApi { public ResponseEntity getNodeByDataspaceAndAnchor(final String dataspaceName, final String anchorName, final String xpath, final Boolean includeDescendants) { if ("/".equals(xpath)) { - // TODO: extracting data by anchor only (root data node and below) return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } final FetchDescendantsOption fetchDescendantsOption = Boolean.TRUE.equals(includeDescendants) diff --git a/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java b/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java index 3ec4764bd..3ee6afb71 100644 --- a/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java +++ b/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2021 Pantheon.tech + * Modifications (C) 2021 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,10 +33,6 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.onap.cps.spi.model.DataNode; -/* - TODO: this utility class belongs to REST, however it expected to be used by both CPS Core and xNF Proxy; - placed in cps-service until shared module is done for REST services, then to be moved there - */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class DataMapUtils { diff --git a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java index 6df973dc4..edef5cbca 100644 --- a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java +++ b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation + * Copyright (C) 2020-2021 Nordix Foundation * Modifications Copyright (C) 2021 Bell Canada. All rights reserved. * Modifications Copyright (C) 2021 Pantheon.tech * ================================================================================ @@ -61,6 +61,7 @@ public class YangUtils { * @param schemaContext schema context describing associated data model * @return the NormalizedNode object */ + @SuppressWarnings("squid:S1452") // Generic type is returned by external librray, opendaylight.yangtools public static NormalizedNode parseJsonData(final String jsonData, final SchemaContext schemaContext) { return parseJsonData(jsonData, schemaContext, Optional.empty()); } @@ -73,6 +74,7 @@ public class YangUtils { * @param parentNodeXpath the xpath referencing the parent node current data fragment belong to * @return the NormalizedNode object */ + @SuppressWarnings("squid:S1452") // Generic type is returned by external librray, opendaylight.yangtools public static NormalizedNode parseJsonData(final String jsonData, final SchemaContext schemaContext, final String parentNodeXpath) { final DataSchemaNode parentSchemaNode = getDataSchemaNodeByXpath(parentNodeXpath, schemaContext); -- 2.16.6