aai/champ.git
6 years agoExclude dom4j dep causing security vunerability 75/67775/2
Michael Reece [Wed, 19 Sep 2018 15:33:16 +0000 (16:33 +0100)]
Exclude dom4j dep causing security vunerability

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>
6 years agoFix NexusIQ security vunerabilities 79/67679/1
Michael Reece [Wed, 19 Sep 2018 10:52:59 +0000 (11:52 +0100)]
Fix NexusIQ security vunerabilities

Additional fixes to exclude dom4j and commons-httpclient dependencies

Issue-ID: AAI-1614

Change-Id: Ic9b450140899069f66c30f320cba3b853c1013db
Signed-off-by: Michael Reece <michaere@amdocs.com>
6 years agoFix for NexusIQ security vunerabilities 83/67083/1
Michael Reece [Mon, 17 Sep 2018 19:06:37 +0000 (20:06 +0100)]
Fix for NexusIQ security vunerabilities

Update and exclude dependencies causing security vunerabilities

Issue-ID: AAI-1614

Change-Id: I301c270f739e1fa97cb63794f5519bceb086f747
Signed-off-by: Michael Reece <michaere@amdocs.com>
6 years agoMerge "Upgrade to Spring Boot 1.5.15"
James Forsyth [Tue, 11 Sep 2018 12:44:14 +0000 (12:44 +0000)]
Merge "Upgrade to Spring Boot 1.5.15"

6 years agoUpgrade to Spring Boot 1.5.15 83/65783/2
Michael Arrastia [Tue, 11 Sep 2018 09:59:05 +0000 (10:59 +0100)]
Upgrade to Spring Boot 1.5.15

Change-Id: I0af75fb0f4896cd0f78a5d1f174828f80bb82a9d
Issue-ID: AAI-1507
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
6 years agoCorrect spelling mistake 71/65571/1
Ioannis Sotiropoulos [Mon, 10 Sep 2018 15:42:14 +0000 (16:42 +0100)]
Correct spelling mistake

The word received is spelled incorrectly.

Change-Id: Ib3f2ad7df98766b5d6bd242edacc9db60277694f
Issue-ID: AAI-1584
Signed-off-by: Ioannis Sotiropoulos <Ioannis.Sotiropoulos@amdocs.com>
6 years agoMerge "Create champ key index on startup"
Steven Blimkie [Fri, 24 Aug 2018 12:55:12 +0000 (12:55 +0000)]
Merge "Create champ key index on startup"

6 years agoCreate champ key index on startup 75/62175/1
Daniel Silverthorn [Thu, 23 Aug 2018 17:52:54 +0000 (13:52 -0400)]
Create champ key index on startup

Change-Id: Ia664d61783606785dcc307845ad2c0b3ce17bbee
Issue-ID: AAI-1539
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
6 years agoUpdate application class to handle https 49/62149/1
Michael Reece [Thu, 23 Aug 2018 14:53:04 +0000 (15:53 +0100)]
Update application class to handle https

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>
6 years agoUpdate to stop exception for null transaction id 05/60905/1
Michael Reece [Thu, 16 Aug 2018 12:03:16 +0000 (13:03 +0100)]
Update to stop exception for null transaction id

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>
6 years agoSpecifying a logging config for champ 45/60545/1
Shwetank Dave [Tue, 14 Aug 2018 13:22:50 +0000 (09:22 -0400)]
Specifying a logging config for champ

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>
6 years agoFixing the achtype variable name 51/60351/1
Arul.Nambi [Mon, 13 Aug 2018 16:11:38 +0000 (12:11 -0400)]
Fixing the achtype variable name

Issue-ID: AAI-1449
Change-Id: I45bda483cef7aaf45be2f5941bf5b3f4401b8135
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
6 years agoFixing the docker jenkins job 25/60325/1
Arul.Nambi [Mon, 13 Aug 2018 14:43:06 +0000 (10:43 -0400)]
Fixing the docker jenkins job

Issue-ID: AAI-1449
Change-Id: I11e3636d0999d27935d09ef1ca2ba6270dcd7f20
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
6 years agoMerge "Ensure transaction id utilised for endpoint"
Tian Lee [Mon, 6 Aug 2018 15:40:42 +0000 (15:40 +0000)]
Merge "Ensure transaction id utilised for endpoint"

6 years agoEnsure transaction id utilised for endpoint 53/58453/3
michaere [Wed, 1 Aug 2018 16:20:16 +0000 (17:20 +0100)]
Ensure transaction id utilised for endpoint

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>
6 years agoMerge "Fix potential null pointers"
James Forsyth [Thu, 2 Aug 2018 18:27:46 +0000 (18:27 +0000)]
Merge "Fix potential null pointers"

6 years agoFix potential null pointers 11/58011/1
Bogumil Zebek [Mon, 30 Jul 2018 10:53:48 +0000 (12:53 +0200)]
Fix potential null pointers

Change-Id: I309010480012cc66ac8d44d6be65f5897174ec3f
Issue-ID: AAI-1430
Signed-off-by: bogumil_zebek <bogumil.zebek@nokia.com>
6 years agoFix sonar violation 05/58005/1
Bogumil Zebek [Mon, 30 Jul 2018 10:27:20 +0000 (12:27 +0200)]
Fix sonar violation

 - "condition always evaluate to true"

Change-Id: I9e1b7a47d0bff1d8cf7067f1a57aa22232fbd0ea
Issue-ID: AAI-1429
Signed-off-by: bogumil_zebek <bogumil.zebek@nokia.com>
6 years agoMerge "Fix equals and hashCode methods"
Steven Blimkie [Thu, 26 Jul 2018 12:45:34 +0000 (12:45 +0000)]
Merge "Fix equals and hashCode methods"

6 years agoMerge "Fix sonar violation"
Venkata Harish Kajur [Wed, 25 Jul 2018 16:50:58 +0000 (16:50 +0000)]
Merge "Fix sonar violation"

6 years agoFix equals and hashCode methods 83/56383/1
Bogumil Zebek [Fri, 13 Jul 2018 12:28:17 +0000 (14:28 +0200)]
Fix equals and hashCode methods

Change-Id: I3e3ebcd1ba29bc20a41c138ec071f137ccd6cf18
Issue-ID: AAI-1375
Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com>
6 years agoMerge "Fix handling of InterruptedException in AAI-Champ"
Tian Lee [Wed, 11 Jul 2018 12:59:43 +0000 (12:59 +0000)]
Merge "Fix handling of InterruptedException in AAI-Champ"

6 years agoFix sonar violation 75/56175/2
Bogumil Zebek [Wed, 11 Jul 2018 10:50:07 +0000 (12:50 +0200)]
Fix sonar violation

Fix potential places where NullPointerException could be thrown.

Change-Id: I84c3dc7b5c1a1f39dcf7d432adac8c507fbc5e3b
Issue-ID: AAI-1369
Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com>
6 years agoMerge "change order in class for java convention"
James Forsyth [Tue, 10 Jul 2018 13:26:03 +0000 (13:26 +0000)]
Merge "change order in class for java convention"

6 years agoFix handling of InterruptedException in AAI-Champ 21/56021/1
Wiktor Garbarek [Mon, 9 Jul 2018 13:18:19 +0000 (15:18 +0200)]
Fix handling of InterruptedException in AAI-Champ

Added thread interrupts

Change-Id: Ic5b7eef71354efd02736e88a1e6716aa84169898
Issue-ID: AAI-1367
Signed-off-by: Wiktor Garbarek <wiktor.garbarek@nokia.com>
6 years agoFix asynchronous patch requests 71/55871/1
Ravi Geda [Thu, 5 Jul 2018 10:11:55 +0000 (11:11 +0100)]
Fix asynchronous patch requests

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>
6 years agochange order in class for java convention 69/55569/1
Justyna Czestochowska [Fri, 29 Jun 2018 13:17:32 +0000 (15:17 +0200)]
change order in class for java convention

Change-Id: I45b681aae0bd09909a5ae1bb6f546ae32d1a8821
Issue-ID: AAI-1346
Signed-off-by: jczestochowska <justyna.czestochowska@nokia.com>
6 years agoMerge "Refactor of NoOpTinkerPopTransaction"
Tian Lee [Tue, 26 Jun 2018 14:40:56 +0000 (14:40 +0000)]
Merge "Refactor of NoOpTinkerPopTransaction"

6 years agoRefactor of NoOpTinkerPopTransaction 11/55411/1
Wiktor Garbarek [Tue, 26 Jun 2018 14:04:54 +0000 (16:04 +0200)]
Refactor of NoOpTinkerPopTransaction

Removed unused logger; added method annotation

Change-Id: Ie1bc4754042189cf231e08445c53f34e8efb06ad
Issue-ID: AAI-1247
Signed-off-by: Wiktor Garbarek <wiktor.garbarek@nokia.com>
6 years agoMerge "Refactor code smell AbstractValidatingChampGraph"
Tian Lee [Tue, 26 Jun 2018 08:57:56 +0000 (08:57 +0000)]
Merge "Refactor code smell AbstractValidatingChampGraph"

6 years agoFix serialization of the "key" property 31/55331/1
Michael Arrastia [Mon, 25 Jun 2018 14:55:54 +0000 (15:55 +0100)]
Fix serialization of the "key" property

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>
6 years agoRefactor code smell AbstractValidatingChampGraph 17/55317/1
Justyna Czestochowska [Mon, 25 Jun 2018 10:26:41 +0000 (12:26 +0200)]
Refactor code smell AbstractValidatingChampGraph

Change-Id: I6e76af608a326866de54acd8c5398a04267143ae
Issue-ID: AAI-1237
Signed-off-by: jczestochowska <justyna.czestochowska@nokia.com>
6 years agoFix serialization of update notification payload 69/51169/1
Michael Arrastia [Mon, 11 Jun 2018 21:02:33 +0000 (22:02 +0100)]
Fix serialization of update notification payload

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>
6 years agoAdd validation of request headers 33/51033/1
Michael Arrastia [Fri, 8 Jun 2018 09:40:54 +0000 (10:40 +0100)]
Add validation of request headers

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>
6 years agoReturn ETag in response header 83/50683/1
Michael Arrastia [Wed, 6 Jun 2018 13:55:59 +0000 (14:55 +0100)]
Return ETag in response header

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>
6 years agoFix Fortify scan vulnerabilities 77/50677/1
Michael Arrastia [Wed, 6 Jun 2018 12:27:52 +0000 (13:27 +0100)]
Fix Fortify scan vulnerabilities

Change-Id: I9a402ca1bb1755cf5ff9fc04eba781ed7f2b4a1c
Issue-ID: AAI-1193
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
6 years agoUpdate payload format for update notification 29/50329/1
Michael Arrastia [Tue, 5 Jun 2018 12:19:45 +0000 (13:19 +0100)]
Update payload format for update notification

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>
6 years agoIgnore reserved query params 89/50189/1
Shwetank Dave [Mon, 4 Jun 2018 18:42:53 +0000 (14:42 -0400)]
Ignore reserved query params

Change-Id: I3eadc1e238a6f73d2dee1b6ced9b1d6033ded85e
Issue-ID: AAI-1203
Signed-off-by: Shwetank Dave <shwetank.dave@amdocs.com>
6 years agoMake champ run as root 13/49013/1
Daniel Silverthorn [Thu, 24 May 2018 19:36:21 +0000 (15:36 -0400)]
Make champ run as root

Change-Id: I769540fd4982641e92fdcad87df91d532bbed565
Issue-ID: AAI-1175
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
6 years agoMerge "Dynamically determine image architecture"
James Forsyth [Wed, 23 May 2018 20:50:14 +0000 (20:50 +0000)]
Merge "Dynamically determine image architecture"

6 years agoDynamically determine image architecture 73/43173/2
Mohammed Naser [Mon, 16 Apr 2018 20:30:42 +0000 (13:30 -0700)]
Dynamically determine image architecture

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>
6 years agoPin jnr-unixsocket for Docker plugin to 0.13 71/43171/2
Mohammed Naser [Mon, 16 Apr 2018 20:30:08 +0000 (13:30 -0700)]
Pin jnr-unixsocket for Docker plugin to 0.13

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>
6 years agoMerge "Remove broken not used code"
James Forsyth [Wed, 23 May 2018 20:22:24 +0000 (20:22 +0000)]
Merge "Remove broken not used code"

6 years agoUpversion for Casablanca 55/48755/2
Jimmy Forsyth [Wed, 23 May 2018 17:31:30 +0000 (13:31 -0400)]
Upversion for Casablanca

Issue-ID: AAI-1169
Change-Id: I640156e35b5de1b509fac5abaabeddd6917c00bb
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
6 years agoUpversion poms and version.properties to 1.2.3 21/48521/1 2.0.0-ONAP beijing 2.0.0-ONAP v1.2.2 v1.2.3
Michael Arrastia [Tue, 22 May 2018 15:46:40 +0000 (16:46 +0100)]
Upversion poms and version.properties to 1.2.3

Change-Id: I2956bf79f9aaedfa3f3cd5fc7caf6f794e7f02a1
Issue-ID: AAI-1154
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
6 years agoUpversion to 1.2.2 for Beijing release 91/48491/1
Michael Arrastia [Tue, 22 May 2018 13:03:35 +0000 (14:03 +0100)]
Upversion to 1.2.2 for Beijing release

Change-Id: I3113bdda31f2a702e1a8f7a5446fefba1f843db6
Issue-ID: AAI-1153
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
6 years agoOrganise pom structure into corrected hierarchy 03/48203/1
Michael Arrastia [Fri, 18 May 2018 16:56:34 +0000 (17:56 +0100)]
Organise pom structure into corrected hierarchy

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>
6 years agoUpdate champ-service pom to force staging 67/48167/1
Michael Arrastia [Fri, 18 May 2018 12:26:48 +0000 (13:26 +0100)]
Update champ-service pom to force staging

This is an attempt to force the autorelease staging.

Change-Id: I203c9e27fc41d4d4a61ba9a25a07479d50e162c9
Issue-ID: AAI-1146
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
6 years agoUpdate champ-service pom to correct groupId 83/48083/1
Michael Arrastia [Thu, 17 May 2018 17:18:05 +0000 (18:18 +0100)]
Update champ-service pom to correct groupId

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>
6 years agoUpdate poms to upload champ-service jar 73/48073/1
Michael Arrastia [Thu, 17 May 2018 16:52:08 +0000 (17:52 +0100)]
Update poms to upload champ-service jar

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>
6 years agoUpversion to 1.2.1-SNAPSHOT 65/47965/1
Jimmy Forsyth [Thu, 17 May 2018 03:44:52 +0000 (23:44 -0400)]
Upversion to 1.2.1-SNAPSHOT

Issue-ID: AAI-1138
Change-Id: Ia5f8ce5b51f994b4418c673b5ee3bffe049c8446
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
6 years agoRemove duplicate dependency 17/47717/1
Jimmy Forsyth [Tue, 15 May 2018 20:53:07 +0000 (16:53 -0400)]
Remove duplicate dependency

Issue-ID: AAI-1141
Change-Id: I8d470492d4e55f82b70f82ee8d54ea4bde662c83
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
6 years agoUpdate version to 1.2.1-SNAPSHOT 75/47675/1
Ravi Geda [Tue, 15 May 2018 18:13:44 +0000 (19:13 +0100)]
Update version to 1.2.1-SNAPSHOT

Change-Id: I46cad4df0a03b5114c08efad2b04c2a19573a4b5
Issue-ID: AAI-1138
Signed-off-by: Ravi Geda <GRaviK@amdocs.com>
6 years agoRemove broken not used code 59/46759/1
Bogumil Zebek [Wed, 9 May 2018 08:39:59 +0000 (10:39 +0200)]
Remove broken not used code

Change-Id: I3e34778705ffca18f9646f9cb888446995e743f7
Issue-ID: AAI-1129
Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com>
6 years agoAddress security vulnerabilities (fix 2) 95/46195/1
Michael Arrastia [Fri, 4 May 2018 11:35:16 +0000 (12:35 +0100)]
Address security vulnerabilities (fix 2)

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>
6 years agoAddress security vulnerabilities 27/45927/1
Michael Arrastia [Thu, 3 May 2018 17:09:26 +0000 (18:09 +0100)]
Address security vulnerabilities

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>
6 years agoPrevent deployment of champ-service.jar 69/45669/1
Michael Arrastia [Wed, 2 May 2018 16:13:25 +0000 (17:13 +0100)]
Prevent deployment of champ-service.jar

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>
6 years agoUpdate Dockerfile and remove redundant AJSC files 21/45621/1
Michael Arrastia [Wed, 2 May 2018 09:37:09 +0000 (10:37 +0100)]
Update Dockerfile and remove redundant AJSC files

Change-Id: Ibf166602929901d18d0ee24c8d5505e4489000fa
Issue-ID: AAI-1114
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
6 years agoReplace AJSC with Spring Boot 1.5.12.RELEASE 39/45439/1
Michael Arrastia [Tue, 1 May 2018 13:55:56 +0000 (14:55 +0100)]
Replace AJSC with Spring Boot 1.5.12.RELEASE

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>
6 years agoUpgrade to janus 0.2.0 39/43739/1
Daniel Silverthorn [Thu, 19 Apr 2018 14:23:05 +0000 (10:23 -0400)]
Upgrade to janus 0.2.0

Change-Id: I47de44fed3113817096127eb4e849ede259eaad8
Issue-ID: AAI-1082
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
6 years agoCorrect INFO.yaml to pass YAML Lint 05/42005/1
Eric Debeau [Tue, 10 Apr 2018 19:52:29 +0000 (19:52 +0000)]
Correct INFO.yaml to pass YAML Lint

Change-Id: Iae5012a4c1248002fb02af4caefee7f0834223fb
Issue-ID: AAI-1022
Signed-off-by: Eric Debeau <eric.debeau@orange.com>
6 years agoFix jdk tools system dependency in champ-lib 19/41919/1
Michael Arrastia [Tue, 10 Apr 2018 12:36:51 +0000 (13:36 +0100)]
Fix jdk tools system dependency in champ-lib

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>
6 years agoUpdate to consume and publish events in new format 67/39767/1
Michael Arrastia [Wed, 28 Mar 2018 18:07:34 +0000 (19:07 +0100)]
Update to consume and publish events in new format

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>
6 years agoMerge "Catch IllegalArgumentException for error message"
Steven Blimkie [Wed, 28 Mar 2018 14:14:51 +0000 (14:14 +0000)]
Merge "Catch IllegalArgumentException for error message"

6 years agoCatch IllegalArgumentException for error message 27/38627/3
Daniel Silverthorn [Mon, 26 Mar 2018 17:58:14 +0000 (13:58 -0400)]
Catch IllegalArgumentException for error message

Also had to upversion event client library

Change-Id: I4dbbf8f35630d93cca9e5d8971e7fde8a65b0811
Issue-ID: AAI-945
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
6 years agoUpdate module poms to skip maven deploy 71/38171/1
Michael Arrastia [Fri, 23 Mar 2018 17:56:37 +0000 (17:56 +0000)]
Update module poms to skip maven deploy

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>
6 years agoMerge "Fix docker image name"
Steven Blimkie [Fri, 23 Mar 2018 13:13:10 +0000 (13:13 +0000)]
Merge "Fix docker image name"

6 years agoFix docker image name 61/38061/1
Ravi Geda [Fri, 23 Mar 2018 11:42:28 +0000 (11:42 +0000)]
Fix docker image name

Correct the docker image name

Change-Id: Idb0ac585468e65f54db97517ed010a78b01d87b4
Issue-ID: AAI-933
Signed-off-by: Ravi Geda <gravik@amdocs.com>
6 years agoAdd maven deploy and nexus staging plugins 43/38043/1
MichaelArrastia [Fri, 23 Mar 2018 10:28:15 +0000 (10:28 +0000)]
Add maven deploy and nexus staging plugins

Fix merge job which is failing with authorisation error.

Issue-ID: AAI-927

Change-Id: Ibbf969de8d4d9d8238f8385a0c3d074887ef56dc
Signed-off-by: MichaelArrastia <MArrasti@amdocs.com>
6 years agoSupport maven deploy and docker build targets 35/37835/1
MichaelArrastia [Thu, 22 Mar 2018 16:49:59 +0000 (16:49 +0000)]
Support maven deploy and docker build targets

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>
6 years agoUpdate license date and text 09/36709/3
Sanchez, Gabriel (gs882h) [Mon, 19 Mar 2018 12:33:16 +0000 (12:33 +0000)]
Update license date and text

Update license date and disable license plugi:n

Issue-ID: AAI-862

Change-Id: Ic46fee4917bde48298acfc1d76eef9083986113e
Signed-off-by: gabriel.sanchez <gabriel.sanchez@amdocs.com>
6 years agoTidy pom's following event-client version update 59/35459/1
michaere [Tue, 13 Mar 2018 11:17:03 +0000 (11:17 +0000)]
Tidy pom's following event-client version update

Removed ability to override the version of the event-client

Issue-ID: AAI-873

Change-Id: I49c76cca0ac6da49964df277467f57a463b65069
Signed-off-by: michaere <michaere@amdocs.com>
6 years agoFix name of entry in Sonar 89/35289/1
Gildas Lanilis [Mon, 12 Mar 2018 21:05:52 +0000 (14:05 -0700)]
Fix name of entry in Sonar

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>
6 years agoFix items missed in microservice restructure 73/34973/1
MichaelArrastia [Fri, 9 Mar 2018 17:09:00 +0000 (17:09 +0000)]
Fix items missed in microservice restructure

1. Updates the champ-service pom to explicitly add a dependency
on the apache httpclient.
2. Corrects the name of the top level champ pom

Issue-ID: AAI-813

Change-Id: I155ebc723861eea8e81e96ba84f182e80c7e42ed
Signed-off-by: MichaelArrastia <MArrasti@amdocs.com>
6 years agoAdd Spotify and License plugins 43/34943/1
MichaelArrastia [Fri, 9 Mar 2018 11:01:38 +0000 (11:01 +0000)]
Add Spotify and License plugins

The champ-service module pom requires additional plugins:
1. Spotify: to allow ONAP Jenkins docker job to complete
2. License: to generate license headers in Java files

Issue-ID: AAI-850

Change-Id: Ie5b82d36773c32cb1bba428c0effb8b04fbb7859
Signed-off-by: MichaelArrastia <MArrasti@amdocs.com>
6 years agoRemove DistributionManagement section from pom 15/34815/1
michaere [Thu, 8 Mar 2018 17:43:45 +0000 (17:43 +0000)]
Remove DistributionManagement section from pom

Updates to champ-lib pom also include the removal of scm tags, which were pointing to specific
repositories. This will be handled by the settings.xml and build job

Issue-ID: AAI-848

Change-Id: I3bca4cc05748388fb806b81474d26776bc1b677b
Signed-off-by: michaere <michaere@amdocs.com>
6 years agoPort champ-microservice project restructure 97/34097/5
michaere [Mon, 5 Mar 2018 16:33:32 +0000 (16:33 +0000)]
Port champ-microservice project restructure

Includes project restructure and introduction of a parent pom. The
original source folder and core functionality is now held within champ-lib, with champ-service
forming the ajsc microservice from which it injects champ-lib core
functionality.

Issue-ID: AAI-813

Change-Id: I2ce0c4a70e485665276e7955572de23969deb706
Signed-off-by: michaere <michaere@amdocs.com>
6 years agoEither log or rethrow this exception 41/33541/1
PrasadNaidu [Thu, 1 Mar 2018 06:52:52 +0000 (12:22 +0530)]
Either log or rethrow this exception

Either log or rethrow this exception
AbstractLoggingChampGraph.java:L444

Sonar Link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKDlaLbmlVXUW53&resolved=false
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: Ia7db723244de872b0aa7ec6c726e53012949edec
Issue-ID: AAI-825
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoEither log or rethrow this exception 09/33109/2
PrasadNaidu [Tue, 27 Feb 2018 07:38:43 +0000 (13:08 +0530)]
Either log or rethrow this exception

Either log or rethrow this exception
AbstractLoggingChampGraph.java:L441

Sonar Link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKDlaLbmlVXUW53&resolved=false
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: Ia1b329cd8541fb0fb3dcd29729a57ebf39004fb8
Issue-ID: AAI-811
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoMerge "Either log or rethrow this exception"
James Forsyth [Tue, 27 Feb 2018 15:08:38 +0000 (15:08 +0000)]
Merge "Either log or rethrow this exception"

6 years agoEither log or rethrow this exception 89/33089/1
PrasadNaidu [Tue, 27 Feb 2018 06:50:02 +0000 (12:20 +0530)]
Either log or rethrow this exception

Either log or rethrow this exception
AbstractLoggingChampGraph.java:L272

Sonar Link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKDlaLbmlVXUW53&resolved=false
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: Idda83f60ad5f568a513582c885fb6295a9682f8a
Issue-ID: AAI-810
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoAdd INFO.yaml file 81/32981/1
Jessica Wagantall [Tue, 27 Feb 2018 01:01:43 +0000 (17:01 -0800)]
Add INFO.yaml file

Add INFO.yaml to list:
- Project description
- Properties
- PTL information
- Meeting information
- Committer information

Change-Id: Ibda05bcba2706a8f70559b7913ea76b52d01df1e
Issue-ID: CIMAN-134
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
6 years agoReorder the modifiers 13/32213/4
PrasadNaidu [Thu, 22 Feb 2018 09:57:47 +0000 (15:27 +0530)]
Reorder the modifiers

Reorder the modifiers to comply with the Java Language Specification
AbstractLoggingChampGraph.java:L116

Sonar Link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKAlaLbmlVXUW5d
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: I27f7fcb6b67863ee38e4627f67051b2ad0584c9f
Issue-ID: AAI-784
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoReorder the modifiers 11/32211/3
PrasadNaidu [Thu, 22 Feb 2018 09:49:31 +0000 (15:19 +0530)]
Reorder the modifiers

Reorder the modifiers to comply with the Java Language Specification
AbstractLoggingChampGraph.java:L114

Sonar Link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKAlaLbmlVXUW5d
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: Ie69b744af3e3947a3f856695bf09b213e32a2adb
Issue-ID: AAI-783
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoReorder the modifiers 89/31689/3
PrasadNaidu [Thu, 22 Feb 2018 09:36:05 +0000 (15:06 +0530)]
Reorder the modifiers

Reorder the modifiers to comply with the Java Language Specification
AbstractLoggingChampGraph.java:L109

Sonar Link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKAlaLbmlVXUW5d
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: I29b98526132420f02de4eae25a4541b04497285f
Issue-ID: AAI-776
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoReorder the modifiers 21/32221/2
PrasadNaidu [Tue, 20 Feb 2018 09:52:17 +0000 (15:22 +0530)]
Reorder the modifiers

Reorder the modifiers to comply with the Java Language Specification
AbstractLoggingChampGraph.java:L115

Sonar link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKAlaLbmlVXUW5d
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: I1bd5d950d7fd4a682b0e55fd20ba89d002a8a28b
Issue-ID: AAI-786
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoMerge "Reorder the modifiers"
James Forsyth [Tue, 20 Feb 2018 20:27:15 +0000 (20:27 +0000)]
Merge "Reorder the modifiers"

6 years agoMerge "Reorder the modifiers"
James Forsyth [Tue, 20 Feb 2018 20:23:25 +0000 (20:23 +0000)]
Merge "Reorder the modifiers"

6 years agoMerge "Reorder the modifiers"
James Forsyth [Tue, 20 Feb 2018 20:22:20 +0000 (20:22 +0000)]
Merge "Reorder the modifiers"

6 years agoMerge "Add the @Override annotation"
James Forsyth [Tue, 20 Feb 2018 20:21:59 +0000 (20:21 +0000)]
Merge "Add the @Override annotation"

6 years agoMerge "Add the @Override annotation"
James Forsyth [Tue, 20 Feb 2018 20:21:31 +0000 (20:21 +0000)]
Merge "Add the @Override annotation"

6 years agoMerge "Add the @Override annotation"
James Forsyth [Tue, 20 Feb 2018 20:21:02 +0000 (20:21 +0000)]
Merge "Add the @Override annotation"

6 years agoMerge "Add the @Override annotation"
James Forsyth [Tue, 20 Feb 2018 20:19:59 +0000 (20:19 +0000)]
Merge "Add the @Override annotation"

6 years agoMerge "Add the @Override annotation"
James Forsyth [Tue, 20 Feb 2018 20:19:42 +0000 (20:19 +0000)]
Merge "Add the @Override annotation"

6 years agoReorder the modifiers 19/32219/1
PrasadNaidu [Tue, 20 Feb 2018 09:42:52 +0000 (15:12 +0530)]
Reorder the modifiers

Reorder the modifiers to comply with the Java Language Specification
AbstractLoggingChampGraph.java:L112

Sonar link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKAlaLbmlVXUW5d
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: Ifd9e5b595f8cf2d4a259cc6e96e4f0ee1b8ef208
Issue-ID: AAI-785
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoReorder the modifiers 07/32207/1
PrasadNaidu [Tue, 20 Feb 2018 07:08:27 +0000 (12:38 +0530)]
Reorder the modifiers

Reorder the modifiers to comply with the Java Language Specification
AbstractLoggingChampGraph.java:L108

Sonar link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKAlaLbmlVXUW5d
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: Id9b452fd59208629d35310df8a09faf8c7d987e3
Issue-ID: AAI-782
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoReorder the modifiers 81/31681/3
PrasadNaidu [Tue, 20 Feb 2018 06:39:43 +0000 (12:09 +0530)]
Reorder the modifiers

Reorder the modifiers to comply with the Java Language Specification
AbstractLoggingChampGraph.java:L103

Sonar Link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKAlaLbmlVXUW5d
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: I25f87ac57ca0cd9f5989820dfda368a165c661cb
Issue-ID: AAI-775
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoAdd the @Override annotation 61/31061/2
PrasadNaidu [Fri, 9 Feb 2018 10:48:13 +0000 (16:18 +0530)]
Add the @Override annotation

Add the @Override annotation above this method signature
AbstractLoggingChampGraph.java:L85

Sonar Link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKAlaLbmlVXUW5d
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: Ifd6f0fbffb797db4d9823fd5c3769e7a098f32cf
Issue-ID: AAI-754
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoAdd the @Override annotation 57/31057/2
PrasadNaidu [Fri, 9 Feb 2018 10:34:58 +0000 (16:04 +0530)]
Add the @Override annotation

Add the @Override annotation above this method signature
AbstractLoggingChampGraph.java:L82

Sonar link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKAlaLbmlVXUW5d
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.javaChange-Id: I75f7308ac13cb238176066a1311530259a1d2f94

Change-Id: Ib474d08bb509a82f247f03cd6b1f7837ac26eb45
Issue-ID: AAI-753
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
6 years agoAdd the @Override annotation 53/31053/2
PrasadNaidu [Fri, 9 Feb 2018 10:09:16 +0000 (15:39 +0530)]
Add the @Override annotation

Add the @Override annotation above this method signature
AbstractLoggingChampGraph.java:L81

Sonar Link : https://sonar.onap.org/project/issues?assignees=PrasadNaidu&id=org.onap.aai%3Achamp&open=AV7ygfKAlaLbmlVXUW5d
Location : src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java

Change-Id: I4e6808285c6353cc4a2af0687f5bafea3c3ff79a
Issue-ID: AAI-752
Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>