summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2023-07-20Merge "Refactor ncmp request handlers (fix async issue)"Sourabh Sourabh9-245/+371
2023-07-20Merge "Apostrophe handling in CpsPathParser"Toine Siebelink15-34/+143
2023-07-20Refactor ncmp request handlers (fix async issue)ToineSiebelink9-245/+371
- simplified request handlers (sub)classes (no more need for default interface) - fix issue with async execution of data operation requests (wasn't really async) - removed redundant (unreachable) check in production code - Improved code coverage (branches) ncmp request handlers added UNIT test - removed MVC test scenarios now covered by appropriate unit level tests - applied Spock Polling Condition for verifying async call Issue-ID: CPS-475 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: Ibe601c709de65080fa8898f2419fdbd92c5ba27d
2023-07-20Merge "Persisting a list element to a parent list (ep2)"Luke Gleeson8-4/+150
2023-07-20Apostrophe handling in CpsPathParserdanielhanrahan15-34/+143
Apostrophe is not currently handled correctly, and having apostrophe in the xpath will lead to various errors. For example, normalizing this xpath works: /path[@name="I'm quoted"] -> /path[@name='I\'m quoted'] However the resulting xpath will throw a PathParsingException if parsed! (Thus path normalization is not idempotent.) - Use '' for escaping apostrophe in single quoted leaf value, to comply with XPath standard (and use "" for escaping in "). - Use Liquibase to make existing data comply with new rules. - Leaf values in data leaves are now unescaped, e.g. "I'm quoted" - Quoting is now consistent for leaf/text/contains conditions. Issue-ID: CPS-1769 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: Iafc287f738254d7f99706c6bc548091c0ecd5aa0
2023-07-20Merge "Allow duplicate leaf names in Cps Path leaf condition"Toine Siebelink9-238/+201
2023-07-19Prepare for next CPS-NCMP releaseegernug25-26/+53
Issue-ID: CPS-1791 Signed-off-by: egernug <gerard.nugent@est.tech> Change-Id: Ide0fcdfa41656e25395ac8478da1bb489fd8663e
2023-07-19Container yaml for releaseegernug1-0/+8
Issue-ID: CPS-1793 Signed-off-by: egernug <gerard.nugent@est.tech> Change-Id: If7ac05d814da42b12c66704afcb153f4af72f3e5
2023-07-18Maven stage yamlegernug1-0/+4
Issue-ID: CPS-1793 Signed-off-by: egernug <gerard.nugent@est.tech> Change-Id: Ie553550137038e4086f049beca76506df48e2a21
2023-07-18Update release notes for release 3.3.4egernug1-0/+1
Issue-ID: CPS-1792 Signed-off-by: egernug <gerard.nugent@est.tech> Change-Id: I3f278d3e89dbc1a757f603ac312686d83612eec8
2023-07-18Persisting a list element to a parent list (ep2)Rudrangi Anupriya8-4/+150
Post List Element does not allow for create List Element, only appends onto existing node as children -Add a check in saveListElements to see if the parent xpath is a root path ("/").If root node store list element as top node. Else add passed list element to parent xpath node. -Add test for scenario for above -Add test scenario Saving list element data fragment under Root node -Add Integration Tests Add and Delete top-level list (element) data nodes with root node -Update bookstore model with TopLevelList datanode Issue-ID: CPS-1586 Change-Id: Iaa7f59fbeebb03703626132c6d5c2afde0e7ab4b Signed-off-by: Rudrangi Anupriya <ra00745022@techmahindra.com>
2023-07-17Allow duplicate leaf names in Cps Path leaf conditiondanielhanrahan9-238/+201
Presently, a query using the same leaf name twice will fail: //books[@price > 10 and @price < 20] It is caused by storing data leaves in a Map. This is fixed by storing data leaves in a List<DataLeaf>. Issue-ID: CPS-1779 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: Ie6990ea5e622cf37e986b720a0a07fb69ce4f03b
2023-07-17Improved code coverage for CpsDataServiceImplToineSiebelink3-46/+38
- Added (extended) test to cover missed scenarios - Removed unnecesarry null check from Production code - Improved error messages in production code - Removed duplicate test - Cleaned up existign test somewhat (labels and aligment) Issue-ID: CPS-475 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I9761ad6d4777a6bcfee4cbe1b876dd39fa218fc8
2023-07-14Merge "Improved code coverage for NetworkCmProxyDataServiceImpl"Luke Gleeson3-41/+37
2023-07-14Merge "Upgrade to Java 17"Sourabh Sourabh4-6/+13
2023-07-13Improved code coverage for NetworkCmProxyDataServiceImplToineSiebelink3-41/+37
- Production code had catch block that is no longer needed - Cleaned up some test somewhat (close to the new tests) Issue-ID: CPS-475 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: Iaa409e752a496bf088a58ccd422fe3d850442b59
2023-07-13[CSIT] Testing DataOperations Request with positive Scenarioraviteja.karumuri5-2/+96
# Sending CMHandle with ready state to the NCMP then it forwarded to DMI to complete the read operation once done with success it produces a message to the client topic' Issue-ID: CPS-1560 Signed-off-by: raviteja.karumuri <raviteja.karumuri@est.tech> Change-Id: I0af68fdf97bf0a5063361ae08475dee38dbe7b8e
2023-07-13Introduced a dmi rest demo csit stubsourabh_sourabh23-50/+694
- Introduced a new response code 0 for data operational success response. - Created a new dmi plugin rest stub for demo and performance testing. - Removed dmi plugin stub of wiremocked. - Updated parent pom to add newely created demo stub. - updated docker compose to add neww demo stub with profile for CSIT, demo and performance testing. - Removed target id list from unsupported operation/datastore from REST response. Issue-ID: CPS-1560 Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech> Change-Id: Ie8198366df820e7d4b8b6e8a85ff9cdb0fce7435 Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
2023-07-13Fix handling of special characters in prefix namesdanielhanrahan4-18/+20
This fixes issues with special characters like square brackets - Make PrefixResolver use CpsPathParser instead of regex - Make DataMapUtils use CpsPathParser instead of String parsing Issue-ID: CPS-1758 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: I6dd66eee398a46a69c0229059195f5096ab6fdec
2023-07-13Merge "Improved code coverage for record filter strategies"Sourabh Sourabh1-0/+41
2023-07-13Upgrade to Java 17egernug4-6/+13
Upgrade CPS component to Java 17 Issue-ID:CPS-1767 Signed-off-by: egernug <gerard.nugent@est.tech> Change-Id: Ide1e75205851e025371b4822ee161f71f04a6af1
2023-07-12Improved code coverage for record filter strategiesToineSiebelink1-0/+41
(the semi-integration test dont cover all scenarios) Issue-ID: CPS-475 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I717946cddec315a1e69ca8d104b07f91691c1b63
2023-07-12Improved code coverage for Data Sync WatchdogToineSiebelink1-22/+32
- also cleaned up existing test (c&p errors in descriptions) Issue-ID: CPS-475 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I20ed98faf0e05e2eb3b2aeaa92bed7dc73cbb358
2023-07-12Improved code coverage (branches) for sync watchdogToineSiebelink2-13/+50
- had to refactor prod. code slightly to make it testable - added a batch size check although the task is a simple iteration there is overhead in creating a paralel task Issue-ID: CPS-475 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I0db7ba3a15f4edc469a5af1ddc6fd76922b16809
2023-07-11Combine alreadyDefinedException classesdanielhanrahan12-108/+64
Issue-ID: CPS-1774 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: I52ff9074a9f8188e8635a811b0d2713a97cb4b10
2023-07-10NCMP fails to start if /subscription-registry already existsdanielhanrahan2-2/+4
cpsDataService only throws AlreadyDefinedException, not AlreadyDefinedExceptionBatch. This causes NcmpStartupException to be thrown during startup, if /subscription-registry exists. Issue-ID: CPS-1783 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: I5667d891f855ef47ca2475891f9216be102932ed
2023-07-10Handle special characters in CpsPath queries (CPS-1760 #2)danielhanrahan5-49/+48
This fixes issues with special characters for CPS-500, CPS-1756, CPS-1758, and CPS-1760. It also improves query performance. - use SQL LIKE instead of regex in Cps Path queries Issue-ID: CPS-1763 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: I5c179882bfba71d3b009c60059e9073f46227e7d
2023-07-10Merge "Subscription Creation: NCMP to DMI CloudEvent transformation"Priyank Maheshwari14-144/+473
2023-07-10Merge "Escape SQL LIKE wildcards in queries (CPS-1760 #1)"Toine Siebelink5-5/+86
2023-07-07Subscription Creation: NCMP to DMI CloudEvent transformationhalil.cakal14-144/+473
- Add mapper to convert client event into ncmp event - Add sample json object of ncmp version - Change subscription event consumer to consume CloudEvents - Change subscription event forwarder to publish CloudEvents - Change test producer config to support CloudEvents - Change sample subscription event json to comply with new schema - Add more test for missing branches - Change packages of the mappers into relevant directory Issue-ID: CPS-1737 Change-Id: I8c9e6e7bf713a8fb530a0586dfb2bce796a462f5 Signed-off-by: halil.cakal <halil.cakal@est.tech>
2023-07-07Merge "NCMP to client schema for Subscription"Luke Gleeson3-0/+69
2023-07-07Fix doc issuelukegleeson1-4/+4
Issue-ID: CPS-475 Signed-off-by: lukegleeson <luke.gleeson@est.tech> Change-Id: Id1f15d148dca7801ecfabd447e9f87d56414a2b4
2023-07-06Escape SQL LIKE wildcards in queries (CPS-1760 #1)danielhanrahan5-5/+86
If '%' and '_' are used in the contains-condition of a CpsPath query, incorrect results will be returned. For example: /bookstore/categories[contains(@code, "%")] Special characters in the contains-condition value must be escaped. Issue-ID: CPS-1762 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: I2fdd5a26433d510cd7d6af5b734a6779b537d63d
2023-07-06NCMP to client schema for Subscriptionmpriyank3-0/+69
- added schema to comply with the agreed upon changes and it include capability to have statusCode and statusMessage as well. - Renamed existing schemas just for consistency Issue-ID: CPS-1739 Change-Id: I6bb1d13bf5c84ca812c5cf37062a168845d6be1d Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2023-07-03Merge "Modify dmi plugin stub mapping of data operation"Toine Siebelink3-53/+9
2023-07-03Kafka (De)serializtion test case for legacy consumerraviteja.karumuri1-4/+23
# Added test case to verify the legacy consumer able to forward the event to client topic Signed-off-by: raviteja.karumuri <raviteja.karumuri@est.tech> Change-Id: I9c88023028eaa2453e5578b5afb4951a41bf4999
2023-07-03Modify dmi plugin stub mapping of data operationsourabh_sourabh3-53/+9
- Modifiying exising dmi stub behaviour to mock onap-dmi plugin to send response HTTP 501. Issue-ID: CPS-1723 Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech> Change-Id: I5dad5004ce69b29752821afdbb87839befa97cf5
2023-06-30Merge "Kafka (De-)Serialization Test"Sourabh Sourabh3-17/+127
2023-06-30Prepare for next CPS-NCMP releasempriyank22-22/+49
- updated the docs. - Bumped the version to 3.3.4-SNAPSHOT for the next release. Issue-ID: CPS-1773 Change-Id: Ibe9a694baadb33d284913868452b143c14d105cc Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2023-06-30Container yaml for releasempriyank1-0/+8
- Release process Issue-ID: CPS-1772 Change-Id: Ia3ce440f9a58d59ec9e44717c0c749d546c725b6 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2023-06-29Maven stage yamlmpriyank1-0/+4
Issue-ID: CPS-1772 Change-Id: I06bf1a018e891339d16bd8c2c8f935ef3b44ea84 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2023-06-29Kafka (De-)Serialization TestToineSiebelink3-17/+127
- added test that proof (de-)serialization of DataOperation CloudEvent - extracted new baseclass for kafka consumer tests Issue-ID: CPS-1746 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I3b04dc0ed8cd1f1f48206cbcf0fd739532ba423c
2023-06-29Openapi file and RTD updatempriyank4-2796/+3074
- Step-1 and 2 of the release process Issue-ID: CPS-1771 Change-Id: I2c5f2f04fdf6344c788aa47a82090b2b37d1505f Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2023-06-29Merge "Clearing code smells"Toine Siebelink1-3/+6
2023-06-29Merge "NCMP to DMI subscription event schema compliant with Cloud Events"Priyank Maheshwari3-10/+132
2023-06-29Clearing code smellsToineSiebelink1-3/+6
- added/updated @deprecated javadoc in EventPublisher Issue-ID: CPS-475 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: Ic0fa3efbc7dc580368bed6782db683b3c7a4d918
2023-06-29Merge "Updating the Kafka listener compliance to could events and legacy"Toine Siebelink10-92/+136
2023-06-29Updating the Kafka listener compliance to could events and legacyraviteja.karumuri10-92/+136
# Added filter property to the legay(DMIAsync) Consumer # Added containerFactory property to the CloudEvent(DataOperation) consumer to use 'cloudEventDeserializtion' Issue-ID: CPS-1746 Signed-off-by: raviteja.karumuri <raviteja.karumuri@est.tech> Change-Id: I73315b816eb6446b7e163fd8779bc35fd6cbef63
2023-06-29NCMP : NCMP : Handle non responding DMI-Pluginsourabh_sourabh4-21/+90
- Added new response code for non-responding dmi and non-success. - Captured any exception after sending request to dmi service and then create a cloud event with error code and publish it to client topic. - Minor modificarion into resource data operation util class. Issue-ID: CPS-1558 Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech> Change-Id: I39d409fb42856b816bf9833c2a23f7fa250a1e62 Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
2023-06-29Merge "Normalize parent xpath when building datanodes in CpsDataService"Toine Siebelink2-78/+86