summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-09-26Revert jackson-mapper-asl dependency changes3.0.0-ONAP1.3.0Michael Reece4-22/+0
Downgrading to version 1.4.5 caused compatability issues with other dependencies requiring 1.9.2, so previous changes have been reverted and exemption saught for known security vunerability for this version Issue-ID: AAI-1677 Change-Id: I86eee45ce0256f56b0a970135a465846b749c686 Signed-off-by: Michael Reece <michaere@amdocs.com>
2018-09-25Add jackson-mapper-asl dependency version 1.4.5Michael Reece1-0/+6
Previously removed as a NexusIQ security vunerability, but required and reinstated to its clean version Issue-ID: AAI-1673 Change-Id: I1ce64819c880293bfb4bac218395c2d612fb7d06 Signed-off-by: Michael Reece <michaere@amdocs.com>
2018-09-19Exclude dom4j dep causing security vunerabilityMichael Reece4-1/+14
Also update event-client dependency to 1.3.0 and reinstate event-client-kafka dependency Issue-ID: AAI-1614 Change-Id: Ia2e84c0b05c927afe2387c34113ebbdb5f0dd85f Signed-off-by: Michael Reece <michaere@amdocs.com>
2018-09-19Fix NexusIQ security vunerabilitiesMichael Reece4-7/+12
Additional fixes to exclude dom4j and commons-httpclient dependencies Issue-ID: AAI-1614 Change-Id: Ic9b450140899069f66c30f320cba3b853c1013db Signed-off-by: Michael Reece <michaere@amdocs.com>
2018-09-17Fix for NexusIQ security vunerabilitiesMichael Reece6-8/+41
Update and exclude dependencies causing security vunerabilities Issue-ID: AAI-1614 Change-Id: I301c270f739e1fa97cb63794f5519bceb086f747 Signed-off-by: Michael Reece <michaere@amdocs.com>
2018-09-11Merge "Upgrade to Spring Boot 1.5.15"James Forsyth1-1/+1
2018-09-11Upgrade to Spring Boot 1.5.15Michael Arrastia1-1/+1
Change-Id: I0af75fb0f4896cd0f78a5d1f174828f80bb82a9d Issue-ID: AAI-1507 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-09-10Correct spelling mistakeIoannis Sotiropoulos2-2/+2
The word received is spelled incorrectly. Change-Id: Ib3f2ad7df98766b5d6bd242edacc9db60277694f Issue-ID: AAI-1584 Signed-off-by: Ioannis Sotiropoulos <Ioannis.Sotiropoulos@amdocs.com>
2018-08-24Merge "Create champ key index on startup"Steven Blimkie1-0/+10
2018-08-23Create champ key index on startupDaniel Silverthorn1-0/+10
Change-Id: Ia664d61783606785dcc307845ad2c0b3ce17bbee Issue-ID: AAI-1539 Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
2018-08-23Update application class to handle httpsMichael Reece2-1/+24
Provide a secure connection to the event client for async flow Issue-ID: AAI-1527 Change-Id: Iddbf87f78c3712688dff54fa796df72fee950ac5 Signed-off-by: Michael Reece <michaere@amdocs.com>
2018-08-16Update to stop exception for null transaction idMichael Reece1-1/+1
Fixed issue on endpoint objects/relationships/ to prevent exception being thrown when transaction id passed to GET request is null Issue-ID: AAI-1439 Change-Id: Ib2a77063391612851149174a8bcfe356135d06ce Signed-off-by: Michael Reece <michaere@amdocs.com>
2018-08-14Specifying a logging config for champShwetank Dave2-0/+1
Adding a logging.config property to the start.sh file so champ uses an external logging config instead of one bundled in. Issue-ID: AAI-1476 Change-Id: I1cb6003447a50a46682e9b0584a80880da376045 Signed-off-by: Shwetank Dave <shwetank.dave@amdocs.com>
2018-08-13Fixing the achtype variable nameArul.Nambi1-1/+1
Issue-ID: AAI-1449 Change-Id: I45bda483cef7aaf45be2f5941bf5b3f4401b8135 Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
2018-08-13Fixing the docker jenkins jobArul.Nambi2-8/+1
Issue-ID: AAI-1449 Change-Id: I11e3636d0999d27935d09ef1ca2ba6270dcd7f20 Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
2018-08-06Merge "Ensure transaction id utilised for endpoint"Tian Lee1-1/+10
2018-08-06Ensure transaction id utilised for endpointmichaere1-1/+10
Transaction id is now handled for the end point objects/relationships/ in champ to ensure that edges are retrieved within the context of the transaction Issue-ID: AAI-1439 Change-Id: I5c9e4c3cf99b4e8316701cba41670a17faea381f Signed-off-by: michaere <michaere@amdocs.com>
2018-08-02Merge "Fix potential null pointers"James Forsyth2-39/+38
2018-07-30Fix potential null pointersBogumil Zebek2-39/+38
Change-Id: I309010480012cc66ac8d44d6be65f5897174ec3f Issue-ID: AAI-1430 Signed-off-by: bogumil_zebek <bogumil.zebek@nokia.com>
2018-07-30Fix sonar violationBogumil Zebek1-2/+2
- "condition always evaluate to true" Change-Id: I9e1b7a47d0bff1d8cf7067f1a57aa22232fbd0ea Issue-ID: AAI-1429 Signed-off-by: bogumil_zebek <bogumil.zebek@nokia.com>
2018-07-26Merge "Fix equals and hashCode methods"Steven Blimkie10-9/+244
2018-07-25Merge "Fix sonar violation"Venkata Harish Kajur3-160/+153
2018-07-13Fix equals and hashCode methodsBogumil Zebek10-9/+244
Change-Id: I3e3ebcd1ba29bc20a41c138ec071f137ccd6cf18 Issue-ID: AAI-1375 Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com>
2018-07-11Merge "Fix handling of InterruptedException in AAI-Champ"Tian Lee4-3/+12
2018-07-11Fix sonar violationBogumil Zebek3-160/+153
Fix potential places where NullPointerException could be thrown. Change-Id: I84c3dc7b5c1a1f39dcf7d432adac8c507fbc5e3b Issue-ID: AAI-1369 Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com>
2018-07-10Merge "change order in class for java convention"James Forsyth1-75/+69
2018-07-09Fix handling of InterruptedException in AAI-ChampWiktor Garbarek4-3/+12
Added thread interrupts Change-Id: Ic5b7eef71354efd02736e88a1e6716aa84169898 Issue-ID: AAI-1367 Signed-off-by: Wiktor Garbarek <wiktor.garbarek@nokia.com>
2018-07-05Fix asynchronous patch requestsRavi Geda3-5/+67
Async flow uses gson to de-serialize the event to a ChampObject which is causing inconsistencies for timestamp property values. Fix is to use jackson which the sync flow also uses. Change-Id: Ic766d34a8c04b9d076d7cadb53cb9dcb180186b6 Issue-ID: AAI-1363 Signed-off-by: Ravi Geda <GRaviK@amdocs.com>
2018-06-29change order in class for java conventionJustyna Czestochowska1-75/+69
Change-Id: I45b681aae0bd09909a5ae1bb6f546ae32d1a8821 Issue-ID: AAI-1346 Signed-off-by: jczestochowska <justyna.czestochowska@nokia.com>
2018-06-26Merge "Refactor of NoOpTinkerPopTransaction"Tian Lee1-6/+3
2018-06-26Refactor of NoOpTinkerPopTransactionWiktor Garbarek1-6/+3
Removed unused logger; added method annotation Change-Id: Ie1bc4754042189cf231e08445c53f34e8efb06ad Issue-ID: AAI-1247 Signed-off-by: Wiktor Garbarek <wiktor.garbarek@nokia.com>
2018-06-26Merge "Refactor code smell AbstractValidatingChampGraph"Tian Lee1-61/+71
2018-06-25Fix serialization of the "key" propertyMichael Arrastia13-218/+364
The introduction of a payload envelope to the update notification event issued by champ-core caused the incorrect serialization of the "key" property as a JSON object instead of a String. This caused Spike to fail when parsing the notification event from Champ as it expects "key" to be a String. A previous fix attempt incorrectly addressed this problem. As the issue originated from the inconsistent use of both Jackson and Gson JSON libraries with the envelope using Gson but the contained objects using Jackson annotations. This fix primarily involves updates to champ-core to ensure that the envelope generation uses Jackson instead of Gson and respects the original Jackson serialization of the "key" property as a String. Change-Id: I2a12732c9ff3970c3db9de5f0039304e68cb3556 Issue-ID: AAI-1243 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-06-25Refactor code smell AbstractValidatingChampGraphJustyna Czestochowska1-61/+71
Change-Id: I6e76af608a326866de54acd8c5398a04267143ae Issue-ID: AAI-1237 Signed-off-by: jczestochowska <justyna.czestochowska@nokia.com>
2018-06-11Fix serialization of update notification payloadMichael Arrastia7-10/+169
Fix Gson serialization of ChampEventEnvelope: - serialize key as primitive. Currently output as object ({}) with a "value" property. This is due to Optional object declaration and misalignment between Gson serializer and Jackson annotations in ChampObject - serialize transactionId as transaction-id - serialize dbTransactionId as db-transaction-id Change-Id: I3a9824ad376ca8189ba31cc9442cb42bb06a9d70 Issue-ID: AAI-1218 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-06-08Add validation of request headersMichael Arrastia4-10/+255
Enforces presence of X-FromAppId and X-TransactionId headers in REST requests. Change-Id: I539e863049e4d5a985d9e952ee7dcbf3fd97f7b3 Issue-ID: AAI-1194 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-06-06Return ETag in response headerMichael Arrastia4-22/+554
This update generates a unique hash for the payload and returns it as an etag header. Change-Id: I471dc1e74e8096d4fdb4f4db7f22e08ef4842ace Issue-ID: AAI-1208 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-06-06Fix Fortify scan vulnerabilitiesMichael Arrastia4-43/+43
Change-Id: I9a402ca1bb1755cf5ff9fc04eba781ed7f2b4a1c Issue-ID: AAI-1193 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-06-05Update payload format for update notificationMichael Arrastia12-477/+688
The update notification event is now aligned with the format of the response event. Both response and update notification events issued by Champ now include top level header and body properties. Change-Id: I00f9971cdbab4944def66c25f5939d5cc4de71bd Issue-ID: AAI-1195 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-06-04Ignore reserved query paramsShwetank Dave1-2/+17
Change-Id: I3eadc1e238a6f73d2dee1b6ced9b1d6033ded85e Issue-ID: AAI-1203 Signed-off-by: Shwetank Dave <shwetank.dave@amdocs.com>
2018-05-24Make champ run as rootDaniel Silverthorn1-7/+0
Change-Id: I769540fd4982641e92fdcad87df91d532bbed565 Issue-ID: AAI-1175 Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
2018-05-23Merge "Dynamically determine image architecture"James Forsyth1-1/+1
2018-05-23Dynamically determine image architectureMohammed Naser1-1/+1
The image architecture is currently hardcoded, this patch removes that hardcoded value to allow for ARM64 builds to go through. Change-Id: I576949e2f09261007f79efc238cde249426c77e6 Issue-ID: CIMAN-154 Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
2018-05-23Pin jnr-unixsocket for Docker plugin to 0.13Mohammed Naser1-0/+7
The current verison of jnr-unixsocket is 0.12 from the Docker plugin however in order to be able the images for ARM64, it needs the newer version which has support for it. There is work upstream to switch the version to 0.18[0] however it seems that this is still pending, so we can pin it for now until that merges. [0]: https://github.com/spotify/docker-maven-plugin/pull/379 Change-Id: Ieb1b5c6e43d3dc1425b2ab63f2fd161e452e5a57 Issue-ID: CIMAN-154 Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
2018-05-23Merge "Remove broken not used code"James Forsyth1-501/+0
2018-05-23Upversion for CasablancaJimmy Forsyth9-11/+11
Issue-ID: AAI-1169 Change-Id: I640156e35b5de1b509fac5abaabeddd6917c00bb Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2018-05-22Upversion poms and version.properties to 1.2.3v1.2.3v1.2.22.0.0-ONAPbeijing2.0.0-ONAPMichael Arrastia9-9/+9
Change-Id: I2956bf79f9aaedfa3f3cd5fc7caf6f794e7f02a1 Issue-ID: AAI-1154 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-05-22Upversion to 1.2.2 for Beijing releaseMichael Arrastia9-9/+9
Change-Id: I3113bdda31f2a702e1a8f7a5446fefba1f843db6 Issue-ID: AAI-1153 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-05-18Organise pom structure into corrected hierarchyMichael Arrastia8-21/+32
All child modules are now properly grouped under each parent. This should allow the Jenkins update version plugin to update the version of all child modules and allow the staging deployment of the champ-service releasable artifact. Change-Id: I6ecae622654e736f65691d9fa4357d27e606c801 Issue-ID: AAI-1146 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-05-18Update champ-service pom to force stagingMichael Arrastia1-0/+15
This is an attempt to force the autorelease staging. Change-Id: I203c9e27fc41d4d4a61ba9a25a07479d50e162c9 Issue-ID: AAI-1146 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>