aai/model-loader.git
4 years agoUpversion for global jjb transition 90/90190/2
Jimmy Forsyth [Wed, 19 Jun 2019 20:39:59 +0000 (16:39 -0400)]
Upversion for global jjb transition

Issue-ID: AAI-2494
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: Id9199420a979d177bd4920010ac8e6959dd4d4c8

4 years agoUpversion for Dublin release 11/86911/1 dublin 4.0.0-ONAP
Jimmy Forsyth [Fri, 3 May 2019 15:42:56 +0000 (11:42 -0400)]
Upversion for Dublin release

Issue-ID: AAI-2403
Change-Id: Iae02824bf6d904d08e9909534fa473464708f66c
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
5 years agoMerge "Provide the ability to set the truststore properties during model-loader startup" 1.4.0
Tian Lee [Wed, 10 Apr 2019 13:40:08 +0000 (13:40 +0000)]
Merge "Provide the ability to set the truststore properties during model-loader startup"

5 years agoProvide the ability to set the truststore properties during model-loader startup 76/84876/1
Polavarapu, Chaitanya (cp8128) [Wed, 10 Apr 2019 12:42:08 +0000 (08:42 -0400)]
Provide the ability to set the truststore properties during model-loader startup

Issue-ID: AAI-2339
Change-Id: Icb6b35a6bf5bccfd1771a670a0626fe5b0b0cc12
Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
5 years agoUpgrade to springboot 1.5.20.RELEASE 22/84722/1
Jimmy Forsyth [Tue, 9 Apr 2019 16:38:53 +0000 (12:38 -0400)]
Upgrade to springboot 1.5.20.RELEASE

Issue-ID: AAI-2349
Change-Id: Ic5cacde0863619d6cc1d4e93de9fddf7e72f50b6
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
5 years agoUpversion Spring-Boot to 1.5.19.RELEASE 91/82691/1
Lee, Tian (tl5884) [Tue, 19 Mar 2019 16:27:17 +0000 (16:27 +0000)]
Upversion Spring-Boot to 1.5.19.RELEASE

Change-Id: I39c4aa7de0f24bb56caeb32bb5c997fcee951ba5
Issue-ID: AAI-2257
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
5 years agoRefactor GizmoTranslator.translate() 08/82608/1
mark.j.leonard [Mon, 18 Mar 2019 18:31:05 +0000 (18:31 +0000)]
Refactor GizmoTranslator.translate()

Address Sonar violation for the translate() method throwing multiple types
of checked Exception. Add a JUnit test case for this.

Change-Id: If3c18460895f8193c7b759da4537aad0a2cbf485
Issue-ID: AAI-2264
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoFix Sonar bugs in Dublin code 28/82428/1
mark.j.leonard [Fri, 15 Mar 2019 14:23:37 +0000 (14:23 +0000)]
Fix Sonar bugs in Dublin code

Address issues arising from AAI-2089 and AAI-1957.
Fix 9 bugs relating to null pointer exceptions.
Reduce the calculated complexity of the GizmoTranslator method
generateModelElementId() by reimplementing using Streams.

Change-Id: Ic7983db1e9364d79ff79deb09552028501bbbf2c
Issue-ID: AAI-2264
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoHandle unexpected HTTP return codes 53/82253/1
ed852m [Thu, 14 Mar 2019 11:18:48 +0000 (11:18 +0000)]
Handle unexpected HTTP return codes

Issue-ID: AAI-2263

Change-Id: I2510b7a2630918ffe17efbbf813c3e43b0b44d34
Signed-off-by: ed852m <ed.dening@amdocs.com>
5 years agoAdd missing INFO.yaml blocks 51/79551/1
Jessica Wagantall [Sat, 2 Mar 2019 02:45:34 +0000 (18:45 -0800)]
Add missing INFO.yaml blocks

Add missing information so that the new verify
job passes.

Change-Id: I77f116d7bf1f8e1aec397d05f9c2a1e29b59c2da
Issue-ID: CIMAN-134
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
5 years agoAdd metrics logging for Babel requests 43/78943/1
mark.j.leonard [Thu, 21 Feb 2019 16:04:11 +0000 (16:04 +0000)]
Add metrics logging for Babel requests

Change-Id: I67492a90b0faac1c60be118be4e25237bd3a780d
Issue-ID: AAI-2183
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoAllow parsing of properties taken from environment 61/76361/1
Popescu, Serban [Fri, 25 Jan 2019 17:14:16 +0000 (12:14 -0500)]
Allow parsing of properties taken from environment

Property variables starting with ENV: will be retrieved as environment
variables

Change-Id: I191920078c8aa78dee2327adcca39a0d1e1a89df
Issue-ID: AAI-2089
Signed-off-by: Serban Popescu <serban.popescu@amdocs.com>
5 years agoAdded echo service to model-loader 66/75566/1
Stela Stoykova [Wed, 9 Jan 2019 15:37:13 +0000 (10:37 -0500)]
Added echo service to model-loader

Issue-ID: AAI-2060

Change-Id: I19e16b7447f5ef8b7533449b18895c2bc98188d2
Signed-off-by: Stela Stoykova <Stela.Stoykova@amdocs.com>
5 years agoMerge "Exclude tomcat from web starter"
Venkata Harish Kajur [Mon, 7 Jan 2019 18:32:34 +0000 (18:32 +0000)]
Merge "Exclude tomcat from web starter"

5 years agoFix bug in gixmo interface 75/75075/1
Shwetank Dave [Mon, 24 Dec 2018 17:32:42 +0000 (12:32 -0500)]
Fix bug in gixmo interface

Change-Id: I75a6d3fdde11359aa834113c97f9b35a8744e902
Issue-ID: AAI-1957
Signed-off-by: Shwetank Dave <shwetank.dave@amdocs.com>
5 years agoExclude tomcat from web starter 24/75024/4
jimmy [Thu, 20 Dec 2018 20:18:47 +0000 (15:18 -0500)]
Exclude tomcat from web starter

Issue-ID: AAI-2035
Change-Id: I19e326fefcfb60fff707dfb807fa91938efa3710
Signed-off-by: jimmy <jf2512@att.com>
5 years agoUpdate to springboot 1.5.18 48/74748/1
jimmy [Mon, 17 Dec 2018 18:51:13 +0000 (13:51 -0500)]
Update to springboot 1.5.18

Issue-ID: AAI-2011
Change-Id: Ied244abbd7cd1dadd8af9a95fbfc9389d9c644ea
Signed-off-by: jimmy <jf2512@att.com>
5 years agoHandle non-obfuscated config 23/74523/1
Daniel Silverthorn [Tue, 11 Dec 2018 18:07:50 +0000 (13:07 -0500)]
Handle non-obfuscated config

Change-Id: I5c57fcc16a93881af5cdf33947967e0d7ef2dd33
Issue-ID: AAI-1997
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
5 years agoFix Sonar code smells 06/73706/1
mark.j.leonard [Tue, 27 Nov 2018 17:44:59 +0000 (17:44 +0000)]
Fix Sonar code smells

Reformat to ONAP Java standards.
Rename GizmoTranslatorTest.java to Test*.java to match the existing
naming conventions. Remove duplicated test scaffolding from this file.

Change-Id: Ie8d5f7ea113d3d60d6222f66cd6740df7f9afca0
Issue-ID: AAI-1957
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoConfigurable option to load models via Gizmo 78/73578/2
sblimkie [Mon, 26 Nov 2018 21:56:06 +0000 (16:56 -0500)]
Configurable option to load models via Gizmo

Change-Id: I792e1a0db166ccab84f42a2d1beb92d7a630165b
Issue-ID: AAI-1957
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
5 years agoUpversion Spring Boot to 1.15.17 86/72286/1
Lee, Tian (tl5884) [Fri, 9 Nov 2018 10:48:40 +0000 (10:48 +0000)]
Upversion Spring Boot to 1.15.17

To fix NexusIQ vulnerabilities

Change-Id: If9e117cfea96e6520fba44d55bee05c7b5764661
Issue-ID: AAI-1891
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
5 years agoUpversion to 1.4.0 59/71959/1
Lee, Tian (tl5884) [Tue, 6 Nov 2018 15:36:40 +0000 (15:36 +0000)]
Upversion to 1.4.0

Change-Id: I08c91e439a3fab27b52830ada216d57eed356dd9
Issue-ID: AAI-1852
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
5 years agoUpversion to 1.3.1 78/70178/1
Lee, Tian (tl5884) [Wed, 10 Oct 2018 16:04:14 +0000 (17:04 +0100)]
Upversion to 1.3.1

Change-Id: I5e9615f6a3a5adf41fe63fdc024616500980880c
Issue-ID: AAI-1733
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
5 years agoUpversion commons-compress for NexusIQ 07/67707/1 1.3.0
Lee, Tian (tl5884) [Wed, 19 Sep 2018 12:53:23 +0000 (13:53 +0100)]
Upversion commons-compress for NexusIQ

Change-Id: I3e591713c4cffabce2f0e31d5eb6793ed639d028
Issue-ID: AAI-1641
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
5 years agoRemove unused system properties from unit tests 27/67227/1
Lee, Tian (tl5884) [Tue, 18 Sep 2018 09:02:25 +0000 (10:02 +0100)]
Remove unused system properties from unit tests

Change-Id: I5d56bf794c69381d03dda277afe4e110791b660a
Issue-ID: AAI-1606
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
5 years ago[Model Loader] Use Spring Boot 1.5.15 83/66083/1
mark.j.leonard [Wed, 12 Sep 2018 11:19:42 +0000 (12:19 +0100)]
[Model Loader] Use Spring Boot 1.5.15

Upgrade from 1.5.14 to avoid known vulnerabilities.

Change-Id: I0921d66b5e7f1ab973a8361ac04afd4679434a6c
Issue-ID: AAI-1506
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoClean Sonar Project Name 45/65045/1
Gildas Lanilis [Thu, 6 Sep 2018 18:21:12 +0000 (11:21 -0700)]
Clean Sonar Project Name

add <name>aai-model-loader</name>

Change-Id: I67a4afb13397e697026cbff05f5a5173ad2af184
Issue-ID: CIMAN-202
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
5 years agoUse managed guava version 87/62487/2
Gary Wu [Fri, 24 Aug 2018 22:15:28 +0000 (15:15 -0700)]
Use managed guava version

Use centrally managed guava version specified in
oparent.  Includes upgrade to oparent 1.2.0.

This change was submitted by script and may include
additional whitespace or formatting changes.

Change-Id: I0883658bd90c6a794a686cc06a6fa2c0d400f0e4
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
5 years agoExplicitly initialise the EventCallback class 69/61069/1
mark.j.leonard [Fri, 17 Aug 2018 09:51:00 +0000 (10:51 +0100)]
Explicitly initialise the EventCallback class

Remove the @Autowired annotation on the Babel Service Client and pass
this as a parameter so that Spring will inject the value.
This ensures that the EventCallback is not initialised with a null
value.

Issue-ID: AAI-1501
Change-Id: Ic1a66bf61afec4f707162acf323b83a8a48e8f28
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoFixing the docker jenkins job 37/60337/1
Arul.Nambi [Mon, 13 Aug 2018 15:18:09 +0000 (11:18 -0400)]
Fixing the docker jenkins job

Issue-ID: AAI-1449
Change-Id: I8eaa5ebe703b38fe8a2f30a6d3ff5ff527595810
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
5 years agoFix NexusIq security issue in Casablanca 41/55941/1
Gilding, Joyce (jg640n) [Fri, 6 Jul 2018 08:28:25 +0000 (09:28 +0100)]
Fix NexusIq security issue in Casablanca

Update Apache commons-compress to version 1.17

Change-Id: I1a8eac171b9c107c780e0aa5147ee58ca93c028f
Issue-ID: AAI-1290
Signed-off-by: Gilding, Joyce (jg640n) <Joyce.Gilding@amdocs.com>
5 years agoFix NexusIQ Security vulnerability in Casablanca 13/55713/1
Gilding, Joyce (jg640n) [Tue, 3 Jul 2018 15:46:05 +0000 (16:46 +0100)]
Fix NexusIQ Security vulnerability in Casablanca

Upgrade spring-boot-dependencies

Change-Id: I9744fc676b59e021000a44593cc11f885f910b0f
Issue-ID: AAI-1290
Signed-off-by: Gilding, Joyce (jg640n) <Joyce.Gilding@amdocs.com>
5 years agoAdd support for loading VNF Catalog XML files 55/50955/1
mark.j.leonard [Thu, 7 Jun 2018 15:45:38 +0000 (16:45 +0100)]
Add support for loading VNF Catalog XML files

Issue-ID: AAI-1214
Change-Id: I5d0eb3456916e6f3e5ba3a9b4e828feaff0cde4e
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoRefactor for Sonar smells and code coverage 97/50697/1
mark.j.leonard [Wed, 6 Jun 2018 13:47:42 +0000 (14:47 +0100)]
Refactor for Sonar smells and code coverage

Various code formatting and style fixes (to address Sonar code smells).

Introduce a BabelServiceClientException to replace the use of the base
Exception class.

Make both the BabelServiceClient class and its Factory class use an
interface, to allow for Spring injection (using annotations) and for
simplified mocking.

Refactor the Notification Publishing by making this the responsibility
of the main Service classes and not the deployment manager.

Issue-ID: AAI-1207
Change-Id: I6bf8a504fa7b98e9158c9976fd1d88c6c54027c1
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoRemove deprecated AJSC configuration 55/50655/1
mark.j.leonard [Wed, 6 Jun 2018 11:17:41 +0000 (12:17 +0100)]
Remove deprecated AJSC configuration

Issue-ID: AAI-1206
Change-Id: Iffad6eb946bb8c63cf69bd2193d7518e733ea406
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoPin jnr-unixsocket for Docker plugin to 0.13 83/43183/2
Mohammed Naser [Mon, 16 Apr 2018 20:40:08 +0000 (13:40 -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: Id863e5fccd4e89f7113b58f8c6b5be760a8797b7
Issue-ID: CIMAN-154
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
5 years agoUpversion for Casablanca 61/48761/1
Jimmy Forsyth [Wed, 23 May 2018 17:58:17 +0000 (13:58 -0400)]
Upversion for Casablanca

Issue-ID: AAI-1169
Change-Id: Ideb567fb672738e0951110e77e6fc53a9a1e4613
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
5 years agoBump to version 1.2.1 in the master branch 73/48573/1 2.0.0-ONAP beijing 2.0.0-ONAP v1.2.1
Jimmy Forsyth [Tue, 22 May 2018 20:48:11 +0000 (16:48 -0400)]
Bump to version 1.2.1 in the master branch

Issue-ID: AAI-1155
Change-Id: I66c58cd069561583ce237c0293091e75304a0610
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
5 years agoFix issue with VNFImage rollback 77/48077/1
Lee, Tian (tl5884) [Thu, 17 May 2018 17:05:42 +0000 (18:05 +0100)]
Fix issue with VNFImage rollback

Fix issue where VNFImage data UUID is being overwritten, causing rollback
failures.

Change-Id: I66fd9125f7806c74d80ede6d2f0d4c04d0756cc0
Issue-ID: AAI-1148
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
5 years agoImport Spring Boot Logging base resource 67/45467/1 v1.2.0
mark.j.leonard [Tue, 1 May 2018 16:16:13 +0000 (17:16 +0100)]
Import Spring Boot Logging base resource

Issue-ID: AAI-1110
Change-Id: Iab0ba2130e1131c938e0c9dbc7ba33cef8db75de
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoUpgrade logback version to 1.2.3 13/45413/1
mark.j.leonard [Tue, 1 May 2018 10:57:53 +0000 (11:57 +0100)]
Upgrade logback version to 1.2.3

Issue-ID: AAI-1107
Change-Id: I24260227dc9a695e8cf91f3fdf033353a4462bca
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoChange Babel dependency by removing SNAPSHOT 11/45411/1
mark.j.leonard [Tue, 1 May 2018 09:59:43 +0000 (10:59 +0100)]
Change Babel dependency by removing SNAPSHOT

Issue-ID: AAI-1053
Change-Id: Iaaee8ff11de401f3c0dfbd0524963ee26b409856
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
5 years agoConvert project from AJSC to Spring Boot 21/44921/1
mark.j.leonard [Thu, 26 Apr 2018 15:53:12 +0000 (16:53 +0100)]
Convert project from AJSC to Spring Boot

Remove all AJSC configuration and dependencies. Update the pom.xml to
use oparent and to depend on Spring Boot. Refactor the main class to
introduce a minimal set of Spring annotations.
Note that the license text was corrected in this change.

Issue-ID: AAI-1039
Change-Id: I16385db3216ec39bfd2881f2278e340ec3795199
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
6 years agoRemove dependency on org.powermock (PowerMockito) 93/43493/1
mark.j.leonard [Wed, 18 Apr 2018 10:17:11 +0000 (11:17 +0100)]
Remove dependency on org.powermock (PowerMockito)

Replace use of PowerMockito packages with the standard Mockito.
Create a BabelServiceClient Factory class to simplify mocking.
Remove duplicated "no mock" test classes that were not in fact free of
mocking. Add a dummy sample CSAR file for testing of artifact downloads.

Change-Id: Ib86f560e514e1efab0e2f732e494a032d555c7c3
Issue-ID: AAI-1049
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
6 years agoCorrect INFO.yaml to pass YAML Lint 31/42031/1
Eric Debeau [Tue, 10 Apr 2018 20:20:59 +0000 (20:20 +0000)]
Correct INFO.yaml to pass YAML Lint

Change-Id: Id08e7b976bcecc760f1d9029d3706fa96915e6ce
Issue-ID: AAI-1022
Signed-off-by: Eric Debeau <eric.debeau@orange.com>
6 years agoFixes for properties files 23/41823/1
Jimmy Forsyth [Mon, 9 Apr 2018 22:16:44 +0000 (18:16 -0400)]
Fixes for properties files

Issue-ID: AAI-1016
Change-Id: Ic640254cb0f81d9a9a5d34120431249c03878891
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
6 years agoFix error in ajsc-override-web.xml 11/41811/1
sblimkie [Mon, 9 Apr 2018 21:01:36 +0000 (17:01 -0400)]
Fix error in ajsc-override-web.xml

Change-Id: I5e0175ef88e1e3c8b7d683cd772d51058b97b83a
Issue-ID: AAI-987
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
6 years agoProblems with Jenkins Build Jobs 89/41189/1
Blackwell, Ian (ib733q) [Thu, 5 Apr 2018 10:52:58 +0000 (11:52 +0100)]
Problems with Jenkins Build Jobs

Change to refer to nexus host as nexus.onap.org rather
than nexus.openecomp.org as suspicion that using
openecomp is the cause of the build failure

Issue-ID: AAI-996

Change-Id: I398e611ec146ed5d21ba235a83302ddd0c049216
Signed-off-by: Blackwell, Ian (ib733q) <IanB@amdocs.com>
6 years agoFix for build issues 45/40945/1
Blackwell, Ian (ib733q) [Wed, 4 Apr 2018 12:04:04 +0000 (13:04 +0100)]
Fix for build issues

Some missing repository configuration causes a build issue.

Issue-ID: AAI-996

Change-Id: Iabbc5de6cf7fbd4bae9fae9de7bf1b651da76bcc
Signed-off-by: Blackwell, Ian (ib733q) <IanB@amdocs.com>
6 years agoRevisions made to the Model Loader to use Babel 49/40749/1
Blackwell, Ian (ib733q) [Tue, 3 Apr 2018 16:28:44 +0000 (17:28 +0100)]
Revisions made to the Model Loader to use Babel

Change the Model Loader to use the Babel micro service.
Responsibility for transformation of ASDC TOSCA models,
the yaml files, has been moved from ASDC and placed into
the Bable microservice. Model Loader will forward any
CSAR received from ASDC and delegate transformation to
Babel. Babel will return the transformed TOSCA models
to Model Loader which will then ingest them into the
A&AI Inventory.

Issue-ID: AAI-987

Change-Id: I99594770b51b00cb7dcc0f30706060ae27cd94c5
Signed-off-by: Blackwell, Ian (ib733q) <IanB@amdocs.com>
6 years agoUpdate license date and text 59/38559/1
Sanchez, Gabriel (gs882h) [Mon, 26 Mar 2018 13:51:37 +0000 (14:51 +0100)]
Update license date and text

Update license data and disable license plugin

Issue-ID: AAI-867

Change-Id: Ida91a4fc99b9d8ca65b15d6a7be1eaf097d0ae4f
Signed-off-by: gabriel.sanchez <gabriel.sanchez@amdocs.com>
6 years agoFix GPL-2.0 license issues 13/33213/1
Lee, Tian (tl5884) [Tue, 27 Feb 2018 17:22:48 +0000 (17:22 +0000)]
Fix GPL-2.0 license issues

Remove maven-dependency-plugin which is copying powermock-module-javaagent
into the target folder

Change-Id: Ifd59f3d0af47e33783ac12d9d89cf40a1614d95a
Issue-ID: AAI-809
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
6 years agoAdd INFO.yaml file 13/33013/1
Jessica Wagantall [Tue, 27 Feb 2018 01:03:54 +0000 (17:03 -0800)]
Add INFO.yaml file

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

Change-Id: Ie8c5800e37c2c941b532f267303657d5d9fced5c
Issue-ID: CIMAN-134
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
6 years agoFix GPL-2.0 license issues 95/32895/1
Lee, Tian (tl5884) [Mon, 26 Feb 2018 12:13:31 +0000 (12:13 +0000)]
Fix GPL-2.0 license issues

Remove powermock-module-javaagent from dependency tree due to GPL-2.0
license

Change-Id: I505a4463637385aa0e3f509b34e4ae3df2545386
Issue-ID: AAI-809
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
6 years agoMerge "Sonar Major:Add the @Override annotation."
Steven Blimkie [Wed, 17 Jan 2018 14:32:54 +0000 (14:32 +0000)]
Merge "Sonar Major:Add the @Override annotation."

6 years agoMerge "Sonar Major:Merge if statement."
Steven Blimkie [Wed, 17 Jan 2018 14:32:30 +0000 (14:32 +0000)]
Merge "Sonar Major:Merge if statement."

6 years agoMerge "Sonar Major:Add the @Override annotation."
Steven Blimkie [Wed, 17 Jan 2018 14:31:50 +0000 (14:31 +0000)]
Merge "Sonar Major:Add the @Override annotation."

6 years agoMerge "Sonar Major:Replace with the diamond operator ."
Steven Blimkie [Wed, 17 Jan 2018 14:31:32 +0000 (14:31 +0000)]
Merge "Sonar Major:Replace with the diamond operator ."

6 years agoMerge "Sonar Major:Replace the type specification."
Steven Blimkie [Wed, 17 Jan 2018 14:30:30 +0000 (14:30 +0000)]
Merge "Sonar Major:Replace the type specification."

6 years agoMerge "Sonar Major:Annotate the IModelParser interface."
Steven Blimkie [Wed, 17 Jan 2018 14:29:25 +0000 (14:29 +0000)]
Merge "Sonar Major:Annotate the IModelParser interface."

6 years agoMerge "Sonar Major:Replace the type specification."
Steven Blimkie [Wed, 17 Jan 2018 14:29:00 +0000 (14:29 +0000)]
Merge "Sonar Major:Replace the type specification."

6 years agoSonar Major:Replace the type specification. 55/28155/1
aishkashyap [Mon, 15 Jan 2018 07:36:16 +0000 (13:06 +0530)]
Sonar Major:Replace the type specification.

Replace the type specification with the diamond operator.

Sonar Link:
https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#assignees=aishkashyap|resolved=false

Location:
src/mainn/java/org/onap/aai/modelloader/entity/model/ModelSorter.java

Line No:136

Issue-ID: AAI-655
Change-Id: I1568a96c99992e38902ec7a53bb8b5f5a0acac5e
Signed-off-by: aishkashyap <as00476394@techmahindra.com>
6 years agoSonar Major:Replace with the diamond operator . 53/28153/1
aishkashyap [Mon, 15 Jan 2018 07:22:24 +0000 (12:52 +0530)]
Sonar Major:Replace with the diamond operator .

Replace the type specification with the diamond operator.

Sonar Link:
https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#assignees=__me__|resolved=false

Location:
src/main/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParser.java

Line No:57

Issue-ID: AAI-654
Change-Id: I07f671f845a535a542c0742b26ed085bc9f3db67
Signed-off-by: aishkashyap <as00476394@techmahindra.com>
6 years agoSonar Major:Add the @Override annotation. 51/28151/1
aishkashyap [Mon, 15 Jan 2018 07:00:17 +0000 (12:30 +0530)]
Sonar Major:Add the @Override annotation.

Add the @Override annotation above this method signature.

Sonar Link:
https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#assignees=__me__|resolved=false

Location:
src/main/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParser.java

Line No:55

Issue-ID: AAI-653
Change-Id: Iacf71ed6a80b986815c774ba057df727385f0745
Signed-off-by: aishkashyap <as00476394@techmahindra.com>
6 years agoSonar Major:Merge if statement. 39/28139/1
aishkashyap [Mon, 15 Jan 2018 05:48:26 +0000 (11:18 +0530)]
Sonar Major:Merge if statement.

Merge if statement with the enclosing one.

Sonar Link:
https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#resolved=false|assigned=false

Location:
src/main/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParser.java

Line No:131

Issue-ID: AAI-648
Change-Id: I50ac1d612fb32b20a7520af44b7abe26b3d89399
Signed-off-by: aishkashyap <as00476394@techmahindra.com>
6 years agoSonar Major:Add the @Override annotation. 35/28135/1
aishkashyap [Mon, 15 Jan 2018 05:22:59 +0000 (10:52 +0530)]
Sonar Major:Add the @Override annotation.

Sonar Link:
https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#resolved=false|assignees=aishkashyap

Location:
src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java

Line No:75

Issue-ID: AAI-647
Change-Id: I2da826e5c3d825abf79d6452e006ac6196c5f73a
Signed-off-by: aishkashyap <as00476394@techmahindra.com>
6 years agoSonar Major:Replace the type specification. 51/28051/1
aishkashyap [Fri, 12 Jan 2018 12:28:10 +0000 (17:58 +0530)]
Sonar Major:Replace the type specification.

Replace the type specification with the diamond operator.

Sonar Link:
https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#resolved=false|assignees=aishkashyap

Location:
src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java

Line No:39

Issue-ID: AAI-646
Change-Id: I704dfd58340402982f4063e94e80b58ff158c8da
Signed-off-by: aishkashyap <as00476394@techmahindra.com>
6 years agoSonar Major:Annotate the IModelParser interface. 37/28037/1
aishkashyap [Fri, 12 Jan 2018 10:31:55 +0000 (16:01 +0530)]
Sonar Major:Annotate the IModelParser interface.

Annotate the IModelParser interface with the @FunctionalInterface annotation.

Sonar Link:
https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#resolved=false|assigned=false

Location:
src/main/java/org/onap/aai/modelloader/entity/model/IModelParser.java

Line No:30

Issue-ID: AAI-645
Change-Id: I0c65379ecde9f6b103bf17515bd9071213462fea
Signed-off-by: aishkashyap <as00476394@techmahindra.com>
6 years agoSonar Major: Replace the type specification. 31/28031/1
aishkashyap [Fri, 12 Jan 2018 09:32:57 +0000 (15:02 +0530)]
Sonar Major: Replace the type specification.

Replace the type specification with the diamond operator.

Sonar Link:
https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#resolved=false|assigned=false

Location:
src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java

Line No:60

Issue-ID: AAI-643
Change-Id: I231689bbf52153a0c806d8ee267d28fd9e6287f0
Signed-off-by: aishkashyap <as00476394@techmahindra.com>
6 years agoAdd unit tests to increase the sonar coverage 53/25753/3
aditya [Thu, 7 Dec 2017 04:08:54 +0000 (22:08 -0600)]
Add unit tests to increase the sonar coverage

Add unit tests to notification and service packages

Issue-ID: AAI-501

Change-Id: Ia15090f2f5999d76e2c274d4dc3dca6408ead7db
Signed-off-by: Aditya Gajulapalli <ag282f@att.com>
6 years agoBump minor version 51/23951/2
Jessica Wagantall [Thu, 16 Nov 2017 23:23:12 +0000 (15:23 -0800)]
Bump minor version

Bump minor version in preparation for Amsterdam
branching.

Change-Id: I5212e3b891e8d314e470220778e77a973c13b6e2
Issue-ID: CIMAN-120
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
6 years agoUpdate dependency versions to latest release 67/25167/1
Lee, Tian (tl5884) [Wed, 29 Nov 2017 15:29:18 +0000 (15:29 +0000)]
Update dependency versions to latest release

sdc-distribution-client version updated to 1.1.32, common-logging
version updated to 1.1.0

Change-Id: I04657cc7a6c65a01f822e05e0a462718f628ddb4
Issue-ID: AAI-511
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
6 years agoUpdate dependency versions to latest 07/25107/2
Lee, Tian (tl5884) [Tue, 28 Nov 2017 17:18:46 +0000 (17:18 +0000)]
Update dependency versions to latest

sdc-distribution-client version updated to 1.1.50-SNAPSHOT, common-logging
version updated to 1.2.0-SNAPSHOT.

Change-Id: I989a308637adefe68e26681a264374df720830e5
Issue-ID: AAI-511
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
6 years agoRevert change to ajsc version 37/23137/1 1.0.0-Amsterdam 1.0.0-ONAP v1.1.0
Blimkie, Steven (sb787e) [Fri, 10 Nov 2017 15:27:05 +0000 (17:27 +0200)]
Revert change to ajsc version

Upgrade to new ajsc version did not fix the build issue.  Reverting to the
version that is tested.

IssueID: AAI-458
Change-Id: I2fddb8198296b88e402f408288cf0830b6cfe1c5
Signed-off-by: Blimkie, Steven (sb787e) <steven.blimkie@amdocs.com>
6 years agoUpdate ajsc-archetype-parent parent pom version 15/23115/1
Lee, Tian (tl5884) [Fri, 10 Nov 2017 10:47:58 +0000 (10:47 +0000)]
Update ajsc-archetype-parent parent pom version

Update parent pom version from 2.0.0 to 2.1.0 to be in line with aai-resources and
aai-traversal

Change-Id: Ie1da717a5a8a6048f5f15c3f6b231f867000482a
Issue-Id: AAI-458
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
6 years agoRenaming openecomp to onap 83/14283/2
Arul.Nambi [Thu, 21 Sep 2017 14:39:37 +0000 (10:39 -0400)]
Renaming openecomp to onap

Issue-ID: AAI-208
Change-Id: I9029b292b051678bbddc2b80efd447ebc1c5b63a
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
6 years agoRenaming openecomp to onap 67/12267/1
Arul.Nambi [Wed, 13 Sep 2017 19:13:29 +0000 (15:13 -0400)]
Renaming openecomp to onap

Issue-ID: AAI-208
Change-Id: I559ba27fba96364c506730e8cbac05a9e6591694
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
6 years agoCleanup project's name in Sonar 97/11297/1
Jessica Wagantall [Fri, 8 Sep 2017 20:13:30 +0000 (13:13 -0700)]
Cleanup project's name in Sonar

The name parameter in the root pom.xml should
match the project name in gerrit to reflect consistency
in Sonar.

Change-Id: I4eca5b435c2a68c10ab1d9abd3bade58941b1cb8
Issue-id: CIMAN-65
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
6 years agoAdd name to the top level pom for model-loader 37/10937/1
Venkata Harish K Kajur [Thu, 7 Sep 2017 22:25:43 +0000 (18:25 -0400)]
Add name to the top level pom for model-loader

Issue-ID: AAI-271

Change-Id: I0f4fe0e3e23f58183f8654bdb9053821c2abe4e5
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
6 years agoRemove files containing ATT references 07/9207/1
Daniel Silverthorn [Tue, 29 Aug 2017 19:58:48 +0000 (15:58 -0400)]
Remove files containing ATT references

Issue ID: AAI-217

Change-Id: Id234071670d67c0fb540d95f99d7791859987bdd
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
6 years agoRemove OpenECOMP from license file 85/8185/2
Daniel Silverthorn [Mon, 21 Aug 2017 17:14:43 +0000 (13:14 -0400)]
Remove OpenECOMP from license file

Change-Id: I76110503a4f74f24bd8ba66c633e1a3cb13fef6a
Issue-ID: AAI-86
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
6 years agoRevert httpclient jar version change. 21/8021/1
Lee, Tian (tl5884) [Fri, 18 Aug 2017 15:45:23 +0000 (16:45 +0100)]
Revert httpclient jar version change.

- Add explicit dependency to version 4.5 instead

Change-Id: Ic4491a8e0d5fe4baaf902c02c5df21b6130e23dc
Issue-ID: AAI-192
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
6 years agofix container exit w/o httpclient 4.4.1 09/7909/1
Brian Freeman [Thu, 17 Aug 2017 18:49:57 +0000 (18:49 +0000)]
fix container exit w/o httpclient 4.4.1

Change-Id: I8d44531a28d40de11c6b1f1ee17de8446cda2c68
Signed-off-by: Brian Freeman <bf1936@att.com>
Issue-id: AAI-170
Signed-off-by: Brian Freeman <bf1936@att.com>
6 years ago[AAI-170 R1710] Upversion sdc-distribution-client 19/7619/1
Lee, Tian (tl5884) [Tue, 15 Aug 2017 15:18:20 +0000 (16:18 +0100)]
[AAI-170 R1710] Upversion sdc-distribution-client

- from 1.0.0 to 1.1.32-SNAPSHOT

Change-Id: Iac775e7ae3378dcaeca717cdafde9a8472c24172
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
6 years agoMerge "Update .gitreview with onap URL"
James Forsyth [Thu, 6 Jul 2017 20:12:54 +0000 (20:12 +0000)]
Merge "Update .gitreview with onap URL"

6 years agoAllow handling of legact model artifacts 77/5577/1
Blimkie, Steven (sb787e) [Tue, 27 Jun 2017 18:08:37 +0000 (21:08 +0300)]
Allow handling of legact model artifacts

Change-Id: I3d4c5e51140d4d05b3fd871d58c2590421c0e9db
Signed-off-by: Blimkie, Steven (sb787e) <steven.blimkie@amdocs.com>
6 years agopom.xml: Updating maven-dependency-plugin version 99/4999/1
Jessica Wagantall [Mon, 12 Jun 2017 21:38:05 +0000 (14:38 -0700)]
pom.xml: Updating maven-dependency-plugin version

CLM creashes after executing the tree goal.
After looking online, looks like vesion 2.8 of
maven-dependency-plugin can be compatible with the
migration to Eclipse Aether (MNG-5354).

Change-Id: Iff2a94a4944adf2a01e0c9a70eeccdac02ea70ec
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
6 years agoConfigurable max heap size and PID fix 37/4937/1
abatos [Fri, 9 Jun 2017 13:36:30 +0000 (09:36 -0400)]
Configurable max heap size and PID fix

Change-Id: I6e4ae9fd1c3e64e0d470c044ade0387045123f60
Signed-off-by: abatos <adrian.batos-parac@amdocs.com>
6 years agoEnsure shutdown hook is called on docker stop 87/4287/1
Blimkie, Steven (sb787e) [Wed, 17 May 2017 14:45:08 +0000 (17:45 +0300)]
Ensure shutdown hook is called on docker stop

Change-Id: I7f2165c6c4b8cfeb3d62c4a286b62f4e42dde449
Signed-off-by: Blimkie, Steven (sb787e) <steven.blimkie@amdocs.com>
6 years ago[AAI-3] Remove dependency on SDC 39/4239/1
Blimkie, Steven (sb787e) [Mon, 15 May 2017 17:15:44 +0000 (20:15 +0300)]
[AAI-3]  Remove dependency on SDC

Change-Id: Iacdf8fb0dabdfe396f508dec3755ef1a2ea0210e
Signed-off-by: Blimkie, Steven (sb787e) <steven.blimkie@amdocs.com>
6 years ago[AAI-8] Fix line feeds in versions.properties 83/4083/1
Fraboni, Gino (gf403a) [Wed, 10 May 2017 14:06:20 +0000 (10:06 -0400)]
[AAI-8] Fix line feeds in versions.properties

Change-Id: Id9c8c1245a8295abac930663fda1a66fd7ebc5a4
Signed-off-by: Fraboni, Gino (gf403a) <gino.fraboni@amdocs.com>
6 years agoImplement support for v10 model entities. 61/3861/1
Fraboni, Gino (gf403a) [Wed, 3 May 2017 17:47:43 +0000 (13:47 -0400)]
Implement support for v10 model entities.

Change-Id: Id2b42b70d7fe0ada6695ac9632b314f21ace193f
Signed-off-by: Fraboni, Gino (gf403a) <gino.fraboni@amdocs.com>
7 years agoUpdate nexus url from openecomp to onap 55/2655/1
Venkata Harish K Kajur [Wed, 29 Mar 2017 15:44:22 +0000 (15:44 +0000)]
Update nexus url from openecomp to onap

Change-Id: I71d28e98d04bb3fe20e780c0adeb815ff767770d
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
7 years agoUpdate .gitreview with onap URL 35/2535/1
Andrew Grimberg [Wed, 29 Mar 2017 15:18:47 +0000 (08:18 -0700)]
Update .gitreview with onap URL

Change-Id: I1984c1e52f538e0e1a258808ac1f7a823d032c21
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
7 years agoUpdate version to 1.1.0-SNAPSHOT 69/1969/1
Venkata Harish K Kajur [Thu, 9 Mar 2017 22:05:53 +0000 (22:05 +0000)]
Update version to 1.1.0-SNAPSHOT

Change-Id: I6c1425889e81643eeeffdeae51cc31816930400e
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
7 years agoUpdate pom for staging plugin 09/1809/1
Venkata Harish K Kajur [Wed, 8 Mar 2017 17:25:12 +0000 (17:25 +0000)]
Update pom for staging plugin

Change-Id: Idbe910093964313659db075ccf67ead3ca83d931
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
7 years agoUpdate pom to 1.0.0 89/1789/3
Venkata Harish K Kajur [Tue, 7 Mar 2017 06:11:38 +0000 (06:11 +0000)]
Update pom to 1.0.0

Also change the dependency version of sdc, logging service
Add the staging snapshot to look for sdc dependency
Remove the unnecessary docker tag

Change-Id: If3caa743ab931d3726c7d6ced82070bc4c5bc467
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
7 years agoFix wrong sdc-distribution-client version 85/1685/1
Alexis de Talhouët [Mon, 6 Mar 2017 19:19:39 +0000 (14:19 -0500)]
Fix wrong sdc-distribution-client version

The pom file specifies a version that isn't the one currently build.
The current version is 1.0.0-SNAPSHOT, see https://gerrit.openecomp.org/r/gitweb?p=sdc/sdc-distribution-client.git;a=blob;f=pom.xml;h=be86365835d8f149a742ade80f6063e90052bfff;hb=refs/heads/master#l6

Change-Id: Ice85aabf5f0cfea913b83f5b12e8657858b27c69
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
7 years agoUpdate pom for sonar 35/1535/1
Venkata Harish K Kajur [Tue, 28 Feb 2017 20:50:04 +0000 (20:50 +0000)]
Update pom for sonar

Change-Id: I3cc4b5f394dade885ce7b606279ac90e5d55310a
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
7 years agoUpdate the server id 53/1053/1
Venkata Harish K Kajur [Mon, 20 Feb 2017 23:58:13 +0000 (23:58 +0000)]
Update the server id

Change-Id: Ib7d367703bc0e68f9dc2a62c0117a943a46a69c8
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>