/*
* ============LICENSE_START=======================================================
* Copyright (C) 2021 Pantheon.tech
- * Modifications (C) 2021 Nordix Foundation
+ * Modifications (C) 2021-2022 Nordix Foundation
+ * Modifications Copyright (C) 2022 Bell Canada
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class DataMapUtils {
+ /**
+ * Converts DataNode structure into a map including the root node identifier for a JSON response.
+ *
+ * @param dataNode data node object
+ * @return a map representing same data with the root node identifier
+ */
+ public static Map<String, Object> toDataMapWithIdentifier(final DataNode dataNode) {
+ return ImmutableMap.<String, Object>builder()
+ .put(getNodeIdentifierWithPrefix(dataNode.getXpath(), dataNode.getModuleNamePrefix()), toDataMap(dataNode))
+ .build();
+ }
+
/**
* Converts DataNode structure into a map for a JSON response.
*
* @param dataNode data node object
* @return a map representing same data
*/
-
public static Map<String, Object> toDataMap(final DataNode dataNode) {
return ImmutableMap.<String, Object>builder()
.putAll(dataNode.getLeaves())
));
}
- private static String getNodeIdentifier(final String xpath) {
- final int fromIndex = xpath.lastIndexOf("/") + 1;
- final int toIndex = xpath.indexOf("[", fromIndex);
- return toIndex > 0 ? xpath.substring(fromIndex, toIndex) : xpath.substring(fromIndex);
+ private static String getNodeIdentifier(String xpath) {
+ if (xpath.endsWith("]")) {
+ xpath = xpath.substring(0, xpath.lastIndexOf('['));
+ }
+ final int fromIndex = xpath.lastIndexOf('/') + 1;
+ return xpath.substring(fromIndex);
+ }
+
+ private static String getNodeIdentifierWithPrefix(final String xpath, final String moduleNamePrefix) {
+ if (moduleNamePrefix != null) {
+ return moduleNamePrefix + ":" + getNodeIdentifier(xpath);
+ }
+ return getNodeIdentifier(xpath);
}
private static boolean isContainerNode(final String xpath) {