diff options
Diffstat (limited to 'cps-service/src/main/java/org')
| -rw-r--r-- | cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java | 5 | ||||
| -rw-r--r-- | cps-service/src/main/java/org/onap/cps/utils/YangUtils.java | 4 |
2 files changed, 4 insertions, 5 deletions
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 3ec4764bd6..3ee6afb719 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 6df973dc42..edef5cbca5 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); |