Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

For the JSON output of Get DataNode we need to alter the DataMapUtils class. The function toDataMap translates a datanode object to a JSON output. We only want this to occur on the top parent node and as such we can create a new method which is called before toDataMap:

...

public static Map<String, Object> toDataMapTopNodetoDataMapParentNode(final DataNode dataNode) {
final String nodeName = dataNode.getXpath().substring(dataNode.getXpath().lastIndexOf('/') + 1)
.replaceAll("\\[.*?\\]", "");
return ImmutableMap.<String, Object>builder().put(nodeName,
toDataMap(dataNode)
).build();
}

We only want the container name on the top highest parent level of the JSON output and as such have to distinguish between a top parent level node and non top parent level node. We create an outer map to wrap the inner map which creates the appropriate levels in the JSON output. 

...

Queries which use toDataMap:


Effected ComponentsEffected ClientsQuery/ServiceClassNotesResponse nowResponse AfterDecision
1CPS CoreCPS TBDMTGet Data Node (as above)DataRestController.javaThis change is given in the example above. The JSON output for Get Node will be updated.

{
   "bookstore-name":"Chapters",
   "categories":[ ... ]
}

{
   "bookstore":{
     "bookstore-name":"Chapters",
      "categories":[ ... ]
  }
}
Don't update version, check with tbdmt about impact of new JSON output for getNode/queryNode.
2CPS CoreCPS TemporalNotification ServiceCpsDataUpdatedEventFactory
,
.javaNotification Service response should be the same as CPS Core for consistency. CPS Temporal

cpsDataUpdatedEvent Object content.data.additionalProperties.toString():

[[bookstore-name:Chapters]]


cpsDataUpdatedEvent Object content.data.additionalProperties.toString():

[bookstore:[bookstore-name:Chapters]]

CPS Temporal only recording and not processing this data. Therefore change (response after) is OK
3CPS CoreCPS TBDMTQuery data nodesQueryRestController.java

Query DataNodes will produce a datanode within an array with the container ID

and then the relevant data:

http://localhost:8883/cps/api/v1/dataspaces/test/anchors/bookstore-anchor-test2/nodes/query?cps-path=/bookstore/categories[@code='01']

&include-descendants=truehttp://localhost:8883/cps/api/v1/dataspaces/test/anchors/bookstore-anchor-test2/nodes/query?cps-path=/bookstore/categories

&include-descendants=true

check

Do with node instead of list

[

     {

        "code": "01",
        "name": "SciFi",
        "books": [
            ...
        ]
    }
]

[

     "categories": {

        "code": "01",
        "name": "SciFi",
        "books": [
            ...
        ]
    }
]

Don't update version, check with tbdmt about impact of new JSON output for getNode/queryNode.
4CPS CoreNoneget Node by CMHandle and Xpath (NCMP)NetworkCmProxyController.javaThis method is deprecated and is no longer used as part of NCMP.

...




Backwards Incompatibility:


Keep versionNew versionNew endpoints
Action

Keep the current version of the interface and alert effected client TBDMT of the changes.

Release version 2 of the interface with changes while retaining v1 endpoints and output.Create new endpoints and deprecate the old endpoints sometime in the future. Keep the endpoints for get and query which we currently have and release new endpoints that have container context.
Preference/Impact

Current preferred option as long as TBDMT agree. 

Impacts TBDMT.

Would need its own spike to analyze the impact. CPS Temporal would need the context of if request is coming from v1 or v2 for notification service.A lot of duplicated code which will need to be depracated in the future. CPS Temporal would need the context of if request is coming from new or old endpoints.
New endpoint vs new version of interface