aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-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>
2018-05-17Update champ-service pom to correct groupIdMichael Arrastia1-1/+1
This is a further attempt to fix the release-version-java-daily job. Change-Id: I0df7889eaf040baea5a2d8791fc9d5f2361b5690 Issue-ID: AAI-1146 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-05-17Update poms to upload champ-service jarMichael Arrastia2-18/+14
The intention is to additionally resolve the build of the release-version-java-daily job. Change-Id: I39af216e187245a845cc1f4921a02c21b4728884 Issue-ID: AAI-1146 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-05-16Upversion to 1.2.1-SNAPSHOTJimmy Forsyth1-1/+1
Issue-ID: AAI-1138 Change-Id: Ia5f8ce5b51f994b4418c673b5ee3bffe049c8446 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2018-05-15Remove duplicate dependencyJimmy Forsyth1-7/+2
Issue-ID: AAI-1141 Change-Id: I8d470492d4e55f82b70f82ee8d54ea4bde662c83 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2018-05-15Update version to 1.2.1-SNAPSHOTRavi Geda9-16/+16
Change-Id: I46cad4df0a03b5114c08efad2b04c2a19573a4b5 Issue-ID: AAI-1138 Signed-off-by: Ravi Geda <GRaviK@amdocs.com>
2018-05-09Remove broken not used codeBogumil Zebek1-501/+0
Change-Id: I3e34778705ffca18f9646f9cb888446995e743f7 Issue-ID: AAI-1129 Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com>
2018-05-04Address security vulnerabilities (fix 2)Michael Arrastia4-24/+40
Fixes previously missed dependencies: - jackson-databind: version 2.8.11.1 - httpclient: version 4.5.3 - jackson-mapper: version 1.9.2 Change-Id: Iae2013bf164a90e910ec1d2cd4ad1185a01bacad Issue-ID: AAI-1117 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-05-03Address security vulnerabilitiesMichael Arrastia8-150/+205
This includes version upgrades for: - logback-classic, logback-core - commons-collections - hadoop-common - hbase-client: settled on version 1.0.2 as container would not start with later versions - httpclient - netty, netty-all - zookeeper - jackson-core Also should resolve presence of flux-examples. Change-Id: Ifb55f5d6676a9971d1d9a46c695dc78eb1b99843 Issue-ID: AAI-1117 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-05-02Prevent deployment of champ-service.jarMichael Arrastia1-0/+8
The deployment of champ-service.jar is causing the merge job to fail. The champ service jar is required for docker only. Change-Id: Ia944aae5cf19857e2890be4251534f59bbedd027 Issue-ID: AAI-1119 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-05-02Update Dockerfile and remove redundant AJSC filesMichael Arrastia23-648/+1
Change-Id: Ibf166602929901d18d0ee24c8d5505e4489000fa Issue-ID: AAI-1114 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-05-01Replace AJSC with Spring Boot 1.5.12.RELEASEMichael Arrastia17-262/+605
Updates include: Remove AJSC references Use PropertiesLoader (loader.path) to allow loading external janus or titan deps Fix dependency conflicts between janus/titan deps and Spring Boot deps Use Jetty container Use Jersey registration of Champ REST interface Change-Id: Ic33b886b0b039cce0366c0f0910cc5a3fe5bfd9b Issue-ID: AAI-1041 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-04-19Upgrade to janus 0.2.0Daniel Silverthorn2-5/+5
Change-Id: I47de44fed3113817096127eb4e849ede259eaad8 Issue-ID: AAI-1082 Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
2018-04-10Correct INFO.yaml to pass YAML LintEric Debeau1-24/+24
Change-Id: Iae5012a4c1248002fb02af4caefee7f0834223fb Issue-ID: AAI-1022 Signed-off-by: Eric Debeau <eric.debeau@orange.com>
2018-04-10Fix jdk tools system dependency in champ-libMichael Arrastia1-1/+1
Update jdk tools systempath definition to use java.home property. Issue-ID: AAI-1017 Change-Id: Iec7ad7bb42908b9844df875f74c4d9a65244afe9 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-03-28Update to consume and publish events in new formatMichael Arrastia13-299/+689
The new format includes: - the graph request/response encapsulated in a body property - new event header with details such as timestamp, request-id, event-type Issue-ID: AAI-960 Change-Id: Ib84ddd54352ca95c3968d2d2936f6348951c2d2c Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-03-28Merge "Catch IllegalArgumentException for error message"Steven Blimkie3-2/+10
2018-03-28Catch IllegalArgumentException for error messageDaniel Silverthorn3-2/+10
Also had to upversion event client library Change-Id: I4dbbf8f35630d93cca9e5d8971e7fde8a65b0811 Issue-ID: AAI-945 Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
2018-03-23Update module poms to skip maven deployMichael Arrastia7-25/+45
The rationale for this change is that the only deployable artifact is the champ microservice as a docker component. The intention is to allow the failing Jenkins merge job to complete. Issue-ID: AAI-927 Change-Id: Ib73470697cd79d12b8d1d47df9afa930f4768d8f Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
2018-03-23Merge "Fix docker image name"Steven Blimkie1-1/+2
2018-03-23Fix docker image nameRavi Geda1-1/+2
Correct the docker image name Change-Id: Idb0ac585468e65f54db97517ed010a78b01d87b4 Issue-ID: AAI-933 Signed-off-by: Ravi Geda <gravik@amdocs.com>
2018-03-23Add maven deploy and nexus staging pluginsMichaelArrastia2-22/+47
Fix merge job which is failing with authorisation error. Issue-ID: AAI-927 Change-Id: Ibbf969de8d4d9d8238f8385a0c3d074887ef56dc Signed-off-by: MichaelArrastia <MArrasti@amdocs.com>
2018-03-22Support maven deploy and docker build targetsMichaelArrastia5-4/+61
This commit principally includes the following pom updates: 1. Add distributionManagement to fix jobs that run maven deploy. 2. Update way in which champ-service gets the graph-deps. This change specifically supports the docker build. Issue-ID: AAI-927 Change-Id: I5920de3c010b810a802f95ac82da89ea3989e7d9 Signed-off-by: MichaelArrastia <MArrasti@amdocs.com>
2018-03-19Update license date and textSanchez, Gabriel (gs882h)183-552/+544
Update license date and disable license plugi:n Issue-ID: AAI-862 Change-Id: Ic46fee4917bde48298acfc1d76eef9083986113e Signed-off-by: gabriel.sanchez <gabriel.sanchez@amdocs.com>
2018-03-13Tidy pom's following event-client version updatemichaere3-99/+0
Removed ability to override the version of the event-client Issue-ID: AAI-873 Change-Id: I49c76cca0ac6da49964df277467f57a463b65069 Signed-off-by: michaere <michaere@amdocs.com>
2018-03-12Fix name of entry in SonarGildas Lanilis1-1/+1
The name of the entry in Sonar was displayed as champ instaed of aai-champ Change-Id: I5a3edc59592fa13c4273274f52716e09157ee812 Issue-ID: CIMAN-65 Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>