summaryrefslogtreecommitdiffstats
path: root/cps-ncmp-service
AgeCommit message (Collapse)AuthorFilesLines
2024-04-30Merge "CM Subscription: REfactor classes of producers and consumers"Priyank Maheshwari13-14/+157
2024-04-30Reverted web client changes as it breaking CPS functionality:sourabh_sourabh16-254/+97
1. Error handling not working 2. Unable to make dmi call as url appens extra "/" Commit 1: Replace RestTemplate with WebClient in synchronous DMI calls - added DmiWebClientConfiguration - use WebClient in DmiRestClient - fixed unit tests - ingnored failing NCMP related integration tests (related to WebClient, will be fixed in a future patch) - encode query params for DMI requests Commit 2: Module sync task failing with WebClient - added configurable buffer size Commit 3: Re-use ncmp.dmi.httpclient.maximumConnectionsTotal parameter (as documented in RTD) to control webclient connection poolsize Issue-ID:CPS-989, CPS-2195, CPS-2198 Change-Id: I6c71ab2801b222708404f51bd60f2b3031ebf32e Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
2024-04-29CM Subscription: REfactor classes of producers and consumersemaclee13-14/+157
Issue-ID: CPS-2196 Change-Id: I0b56f37a1b615b9615d6bd7005348733e1739a46 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
2024-04-29Re-use ncmp.dmi.httpclient.maximumConnectionsTotal parametersourabh_sourabh3-19/+25
(as documented in RTD) to control webclient connection poolsize Issue-ID: CPS-2198 Change-Id: Id441208c66433b2539adf83a0881c3c3c79d2b15 Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
2024-04-29Merge "Module sync task failing with WebClient"Daniel Hanrahan3-1/+9
2024-04-29Merge "CM SUBSCRIPTION: Remove accepted and rejected cache entries"Priyank Maheshwari5-23/+95
2024-04-26Module sync task failing with WebClientleventecsanyi3-1/+9
- added configurable buffer size Issue-ID: CPS-2195 Change-Id: I7cdb09856fd4d80134a91e54faa7e6600f3721dc Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
2024-04-26CM SUBSCRIPTION: Remove accepted and rejected cache entriesemaclee5-23/+95
Issue-ID: CPS-2185 Change-Id: I01ba8e4f6e0e42a31ad5234ad468ac4625c2b0f3 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
2024-04-25Replace RestTemplate with WebClient in synchronous DMI callsleventecsanyi16-99/+244
- added DmiWebClientConfiguration - use WebClient in DmiRestClient - fixed unit tests - ingnored failing NCMP related integration tests (related to WebClient, will be fixed in a future patch) - encode query params for DMI requests Issue-ID:CPS-989 Change-Id: I26434568f68266e95669a51c134978ddd197d802 Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
2024-04-24Merge "Reject create request with duplicated subscriptionId"Priyank Maheshwari7-17/+212
2024-04-24Reject create request with duplicated subscriptionIdemaclee7-17/+212
Issue-ID: CPS-2184 Change-Id: I1bddb02239e6a2d3f47aa731eb24a9f1f64e63b5 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech> Signed-off-by: seanbeirne <sean.beirne@est.tech>
2024-04-24NcmpCloudEventBuilder refactoringmpriyank3-16/+18
- Builder named as NcmpEvent and we have specialised method to build the NcmpEvent as cloud event now - Introduced source as the builder default property Issue-ID: CPS-2191 Change-Id: I51c571313091ce9a4d10f4e1af7423eee999cea8 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2024-04-23[BUG] Make failed async task report failure on Kafka topicdanielhanrahan2-11/+91
- In event of async task timeout, error code 102 (DMI_SERVICE_NOT_RESPONDING) is sent to client topic. - In event of unexpected error (such as database unavailable), error code 108 (UNKNOWN_ERROR) is sent to client topic. - The default timeouts have been adjusted so that the task timeout (60s) is longer than the HTTP and Database timeouts (30s), so that expected codes are returned. Issue-ID: CPS-2186 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: I84c3447a625e084c445ab2f5c01e2b32a0c971ac
2024-04-18Fix build issue with subscriptionemaclee2-3/+3
Issue-ID: CPS-2164 Change-Id: I49a18df0927b5beff62a12f9bc2a2e8e486537c9 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
2024-04-17Merge "Cm Subscription: Remove subscription method"Daniel Hanrahan3-45/+115
2024-04-17Cm Subscription: Remove subscription methodemaclee3-45/+115
- method to remove a subscription Id from leaflist - condition if subscription list is empty, remove subscription all together Issue-ID: CPS-2164 Change-Id: Id694f441f9675fa9a048e3b824e1f02fae73f87e Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
2024-04-12Merge "Handle Subscription Response from DMI"Priyank Maheshwari4-6/+126
2024-04-12Handle Subscription Response from DMIseanbeirne4-6/+126
Issue-ID: CPS-1972 Change-Id: Idb8ad14f06e365707404d099a4581282d4a0add9 Signed-off-by: seanbeirne <sean.beirne@est.tech>
2024-04-11Merge "Update depcrecated method in KafaConfig"Toine Siebelink2-7/+11
2024-04-11Update depcrecated method in KafaConfigToineSiebelink2-7/+11
Issue-ID: CPS-2179 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I882746a68f2d32f07fbcfeeac1f45b9dbbb8c62e
2024-04-10Define a java based datastructure for DataJob and interfacesourabh_sourabh9-4/+340
- Defined java interface to handle datajob - Defined all the modules needed to process data job request - data jon response module id also defined - dummy impl. of java interface Issue-ID: CPS-2155 Change-Id: I20c7b621aa4bd40fe7758cb19b8720fc7cf5164c Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
2024-04-10Document new NCMP Status Code: 112, message too largeToineSiebelink1-1/+2
- Updated RTD - Added new value to relevant Enum (although not used in our code) Issue-ID: CPS-2178 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I4ba8c1622921919ae253a292d96307439ef20e2a
2024-04-04Add moduleSetTag to the request towards dmi pluginleventecsanyi4-4/+7
- mapping module set tag to DmiRequest Issue-ID: CPS-2030 Change-Id: I487e48baf98919d3ff5e25d2428a065dd3a30335 Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
2024-03-29Bump CPS versionmpriyank1-1/+1
- bump cps to 3.4.8-SNAPSHOT - also updated the release notes Issue-ID: CPS-2168 Change-Id: Iee7f1e2febbf28b0d5a2855d3128d9eb8bb3c490 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2024-03-29Merge "Uplift Spring boot 3.2.4"Priyank Maheshwari7-17/+37
2024-03-29Uplift Spring boot 3.2.4emaclee7-17/+37
- uplifted spring boot from 3.1.2 to 3.2.4 - removed redundant dependencies - upgraded relevant dependencies - use of @Bean(some_name) is give a specific bean name - using @Bean(some_name) with @Qualifier so on the injection point to specify which bean to actually inject, this is used as we deal with multiple beans of the same type. Issue-ID: CPS-2101 Change-Id: I64d5bf567b9eb03fb39034a46528d0160b332715 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
2024-03-27Merge "Scheduled task for Subscription Response"Lee Anjella Macabuhay3-18/+182
2024-03-27Fix code smellemaclee1-9/+2
- change string to formatted Issue-ID: CPS-475 Change-Id: I59271c63f244c4d6684b145b1afe2356668e6fd8 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
2024-03-27Scheduled task for Subscription Responsempriyank3-18/+182
- Need to send the response back to the client in max 30 secs - Also have the capability to send the response right away - Testware added for the same - Also added code to cancel the scheduled task - Added state for cancelling the task Issue-ID: CPS-2140 Change-Id: I3ab321d8221cd8f697c26be46d2e63d89b360923 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2024-03-26Merge "Condense Liquibase steps"Toine Siebelink4-29/+19
2024-03-26Condense Liquibase stepsdavid.mcweeney4-29/+19
Change-Id: I1493f49bb93c359df3ff7d4f928f9a94fb8b2604 Signed-off-by: david.mcweeney <david.mcweeney@est.tech> Issue-ID: CPS-2061
2024-03-25Merge "Save new cm notification subscription"Priyank Maheshwari3-7/+122
2024-03-22Save new cm notification subscriptionemaclee3-7/+122
Issue-ID: CPS-2043 Change-Id: If1c066a7d1c1f7e1c154714fe06f2566b727634c Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
2024-03-19Merge "Fix SonarQube warnings"Priyank Maheshwari8-74/+82
2024-03-19Fix SonarQube warningsToineSiebelink8-74/+82
targetted: - Introduced CmResourceAddress (name agreed with Daniel and Priyank) - Extracted out private method in AltenateIdChecker to reduce complexity side effects: - use 'record' java feature as suggested by ItelliJ - had to uprade spotbugs version to avoid incorrect warning on 'record' equeals method - convention: added missing 'asserts' in affected testware - my preference: removed a lot of unnecessary linebreaks in affected testware - removed redunfant (variation) of a 'delegation' test Issue-ID: CPS-475 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: Ie0c9d5ebc33196ae14ed6c226843095a2a040d1d
2024-03-19Configure Hazelcast to have 1 backup to reduce memorydanielhanrahan2-8/+8
Currently Hazelcast is configured to have 3 synchronous backups and 3 asynchronous backups. These are separate, meaning there will be 7 copies in the cluster (1 original + 3 sync + 3 async backups). Even if only 1 instance of CPS/NCMP is running, it will have 7 copies in memory. Given that CPS/NCMP is typically only deployed using 1 or 2 instances, the settings are changed to 1 synchronous backup (same as Hazelcast's default configuration). This change has been tested and shown to reduce heap usage by around 100MB during 20K CM-handle registration. Issue-ID: CPS-2146 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: I4a5f6d83bc35e2c13cfb32002e38dc365da34c8e
2024-03-15Merge "[Bug] Removing inner TaskExecutor to call DMI"Sourabh Sourabh5-82/+21
2024-03-14[Bug] Removing inner TaskExecutor to call DMImpriyank5-82/+21
- Removing TaskExecutor from cps-ncmp-service package as anyways the call coming over from the cps-ncmp-rest layer is managed by a different thread executor(CpsNcmpTaskExecutor) - Provided 60secs timeout value. - Spawning new thread from a different executor might not be needed - Removing @Async from a non spring managed method as its of no use Issue-ID: CPS-2150 Change-Id: Ic99632983aff2c40df81421d782cf98ec600fc41 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2024-03-14Modify lcm events to include dataProducerIdentifier and moduleSetTag ↵JvD_Ericsson2-11/+15
(CPS-1964 3) Issue-ID: CPS-2114 Change-Id: I52ae18fe849801706491742818b316df9f8cb554 Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
2024-03-13Modify the get cmHandle api to return dataProducerIdentifier, moduleSetTag, ↵JvD_Ericsson1-0/+1
and alternateId (CPS-1964 2) Issue-ID: CPS-2113 Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech> Change-Id: I672e5c8408e77a5fa15d6fc2f41438aca705484c
2024-03-13Provide support for data producer identifier during registration (CPS-1964 1)JvD_Ericsson12-31/+129
- Added support for the dataProducerIdentifier to be added, and updated from blank to something once - The dataProducerIdentifier is persisted in the DB Issue-ID: CPS-2105 Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech> Change-Id: I1c230be8f9402154a761e8c2ba4d8a6331965b3c
2024-03-07Mapper to form CmNotificationSubscriptionNcmpOutEventmpriyank2-0/+151
- mapper to be used in the subsequent patches - test case to support the mapping of CmNotificationSubscriptionNcmpOutEvent Issue-ID: CPS-2147 Change-Id: I7f0be81941b774a27ddc343ed304a68c23796a60 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2024-03-06Merge "Error reporting when registering cm handle with alternate id 2 - ↵Toine Siebelink7-126/+147
update scenario"
2024-03-05Error reporting when registering cm handle with alternate id 2 - update scenariohalil.cakal7-126/+147
- added error collection to cmhandle update Issue-ID: CPS-2109 Change-Id: I751cad7c35ec53e914888760dd66eb52054da36e Signed-off-by: halil.cakal <halil.cakal@est.tech>
2024-02-29Bump CPS to 3.4.7-SNAPSHOTmpriyank1-1/+1
- bump cps to 3.4.7-snapshot - updated the relese notes Issue-ID: CPS-2135 Change-Id: Ib166ebae2e3de9a727b3d0d4d21832c8858f4108 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2024-02-29Add bearer token to NCMP async batch data passthrough (CPS-2126 #4)danielhanrahan5-14/+24
Async processing was not passing bearer token. Issue-ID: CPS-2128 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: I75da35cce555c49cca638b68f106a9daba79c24a
2024-02-29Add bearer token to NCMP passthrough operations (CPS-2126 #2)danielhanrahan9-43/+74
For NCMP resource data passthrough operations, accept an authorization header and propagate it to outgoing DMI request if it has a bearer token, otherwise use same behaviour as before Issue-ID: CPS-2128 Change-Id: Ib3bf401abce4221a8b706989fb6f07618aa33fe2 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
2024-02-28Revert Spring Boot Upliftmpriyank6-28/+3
- reverting back to spring 3.1.2 - manual changes to revert as other apps not fully ready for the delivery Issue-ID: CPS-2133 Change-Id: I670b67916fa4a5d4e5bced6548b7fcd5ee12e855 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2024-02-27Bump CPS to 3.4.6-SNAPSHOTmpriyank1-1/+1
- bumping CPS to 3.4.6-SNAPSHOT - updated the release notes Issue-ID: CPS-2124 Change-Id: Id28af9340da9c1ce118b2122e97b8717860c7932 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2024-02-26Populate cmSubscription cacheemaclee8-27/+293
- Create subscription cache handler - Add unit tests Issue-ID: CPS-2025 Change-Id: I54d505369a8429d6f6a87a2af0b169f9530622c3 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>