summaryrefslogtreecommitdiffstats
path: root/src/main
AgeCommit message (Collapse)AuthorFilesLines
2018-12-19Merge "Remove clear text password"Michael Hwang1-3/+3
2018-12-14Merge "Simplify cli parser logic"Vijay Venkatesh Kumar1-18/+19
2018-12-14Remove clear text passwordZlatko Murgoski1-3/+3
Add common library to hash Issue-ID: DCAEGEN2-978 Change-Id: Ieb20f6a28aea3b9e8322df7b65b6441e12d4627a Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
2018-12-12Merge "Remove clear text password"Vijay Venkatesh Kumar3-9/+13
2018-12-10Merge "Fix critical issues in dcaegen2-collectors-ves"Vijay Venkatesh Kumar2-3/+4
2018-12-10Simplify cli parser logicBogumil Zebek1-18/+19
Change-Id: I7008efe19f567b178dd296f4f485fd14c5e7569d Issue-ID: DCAEGEN2-1022 Signed-off-by: bogumil_zebek <bogumil.zebek@nokia.com>
2018-12-07Remove clear text passwordZlatko Murgoski3-9/+13
Change to SHA256 Change-Id: I1c41247cf4094523b61487cbce0030d585982b06 Issue-ID: DCAEGEN2-978 Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
2018-11-27TLS mutual authentication has been added.andrzejszukuc4-15/+138
Change-Id: I60ebe8e1b06d72413940935396cb7a56af437c0d Issue-ID: DCAEGEN2-959 Signed-off-by: ANDRZEJ SZUKUC <andrzej.szukuc@nokia.com>
2018-11-19Fix critical issues in dcaegen2-collectors-vesParshad Patel2-3/+4
Fix issue related to InterruptedException and equals comparisons between unrelated types Issue-ID: DCAEGEN2-938 Change-Id: Iaef089dfd889053737fa53616064f1a6ef3a929e Signed-off-by: Parshad Patel <pars.patel@samsung.com>
2018-11-09Add spring boot bannerZlatko Murgoski2-6/+11
Add spring boot banner Change-Id: Icd3b637ad7ed9431d3258df96dfd1b64e0fc7f3b Issue-ID: DCAEGEN2-967 Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
2018-11-08Upgrade embeded TomcatZlatko Murgoski1-1/+0
Address VESCollector vulnerability reported R3 RC1 phase Change-Id: I78b82bd793bf59e13636b5534fabe484025071d9 Issue-ID: DCAEGEN2-927 Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
2018-10-10ApiAuthInterceptor tests have been addedandrzejszukuc1-3/+0
Change-Id: Ieb42e8fa417ff3afb8acad3bd6c48a8287026a2e Issue-ID: DCAEGEN2-517 Signed-off-by: ANDRZEJ SZUKUC <andrzej.szukuc@nokia.com>
2018-09-04Add protocols to hostsJakub Zieba8-38/+152
Add default protocols for Consul hosts Add controller for healt check Fix for merging properties from file and Consul Change-Id: Ifa8c7cdfa333d8ffee175b5eb4446f0c3a986f27 Issue-ID: DCAEGEN2-747 Signed-off-by: Jakub Zieba <jakub.zieba@nokia.com>
2018-08-23VES7.x to 5.x transformationPATRACHARI1-2/+97
Update transformation code based on Min's requirement. This includes all Measurement transformations. Issue-ID: DCAEGEN2-600 Change-Id: I082df846e159a4f158619e700a6dfed6de43cd95 Signed-off-by: PATRACHARI <gp2421@att.com>
2018-08-10Refactor the code base a bitPawelSzalapski6-320/+182
Remove potential race condition coming from shared 'version' veriable in singleton instance of RestController. Move the logic behind reading the json schemas out of a on-request phase to application startup. Minor refactoring done that will bump up test coverage. Change-Id: I2ad1ba91dafafd785ede61591a4dc146abf6a1eb Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com> Issue-ID: DCAEGEN2-526
2018-08-08VES 7.0.1 updatesVijay VK2-144/+212
Initial commit to include the support for below - VES 7.1 API - updated spec and data-format - Response code update per new spec - springfox for swagger doc - New topic defaults Todo - Swagger instrumention to include necessary annotation - Event Transformation 7.x to 5.x - VES7.x response header - AAF cert integration Change-Id: I9bc2223fa362b35ae8a7105acd651fe524a403c5 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-600
2018-08-06Implement second part of dynamic DMaaP configPawelSzalapski21-633/+908
VESCollector app can now fetch CBS configuration and rebuilt the part regarding sending events dynamically, without restarting application. Application will still be restarted by a .sh script, if there were changes regarding collector.properties file. The decision of whether dynamic configuration should be triggered is now based on existence of env vars CONSUL_HOST, CONFIG_BINDING_SERVICE, HOSTNAME, not as previously on CBSPOLLTIME. Frequency at which the config check should happen is now exposed via property from collector.properties Change-Id: I98ff160fa51d08d84a23c716d90ceaacbe17ada6 Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com> Issue-ID: DCAEGEN2-519
2018-08-01Replace nsaCore library with SpringPawelSzalapski26-1583/+1645
Change-Id: I2227939a67a2cbba2d392136d49ef4419600d186 Issue-ID: DCAEGEN2-602 Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
2018-07-19Merge "VES collector application settings provider"Vijay Venkatesh Kumar7-109/+289
2018-07-18VES collector application settings providerZlatko Murgoski7-109/+289
Extract application settings to diferent class First step to remove nsaServerLibrary Change-Id: Ib4fb236ac4683d241c7841ba66f1afbcfb10c92a Signed-off-by: ZlatkoMurgoski <zlatko.murgoski@nokia.com> Issue-ID: DCAEGEN2-566
2018-07-13Clean up .sh scriptsPawelSzalapski7-303/+164
Removed .sh scripts that are not needed. Fill readme with a description of some of the things that might be not visible at first glance Refactor .sh scripts, remove not used or not needed parts Fix a bug where pidof <package> does not work. Change logging of the scripts and they way that app is run so that the logs are in one place -> collector.logs Fixed a bug where tomcat startup problems are not logged Added log rotation with logrotate tool Change-Id: I156328ab23d18a20072177ae8c5420772c3e2c7c Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com> Issue-ID: DCAEGEN2-610
2018-07-02Prepare codebase for dynamic DMaaP configurationPawelSzalapski14-685/+815
From now on, there is only one single place where we can create whole app core concerning sending events and it has a single entry point, based on DMaaP configuration. It can be used to rebuild part of app that is responsible for sending events dynamically. Changes are in scope for the dynamic DMaaP config feature. + bumped up code coverage a bit Change-Id: Iecc8c4e534ae9b781f47e3616409271ba83169c8 Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com> Issue-ID: DCAEGEN2-517
2018-06-24Remove dead code from VESCollectorPawelSzalapski13-353/+176
Many things there are unused or have inproper modifiers, spelling etc. I run static analysis tool (Intellij code inspect) and clear those things up. It will be easier to maintain now. No actual behavior changes were done. Issue-ID: DCAEGEN2-526 Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com> Change-Id: I1a4ad0c896bd32165cba654344ffc5245648c615
2018-06-18Refactor DmaapPropertyReaderkoblosz3-203/+306
Issue-ID: DCAEGEN2-522 Signed-off-by: KOBLOSZ SANDRA <sandra.koblosz@nokia.com> Change-Id: I2d9928ff3ffeda0e204480f13e8c8bf91bddf912
2018-06-15Merge "Fix bug about custom exceptions not being used"Vijay Venkatesh Kumar4-181/+91
2018-06-12Replace shell build scripts with Maven solutionPiotr Bochenski1-8/+8
Remove dead bash code that is being executed during Maven build phases and reimplement Docker interaction using plain Maven solution. This change simplifies build procedure and allows developers to easily build, run and test their own self-built VES image on local machine. Issue-ID: DCAEGEN2-534 Change-Id: I63eb150406b78a71a55fdc728a4fbb4e1a4e6554 Signed-off-by: Piotr Bochenski <piotr.bochenski@nokia.com>
2018-06-11Fix bug about custom exceptions not being usedPawelSzalapski4-181/+91
The bug was that custom exception config was never actually queried because of the mismatch between the production code usages and .json config file. Change-Id: I416ef5f45770f9bb55d5dff143277b6c62fa25ba Issue-ID: DCAEGEN2-518 Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
2018-06-11Refactor tests to check actual behavior of methodsPawelSzalapski2-21/+24
Testcases were skimming through the code, but actually make no asserts. Change-Id: Icba8fe890c01fc11a4507ca468ab4d9b6141caf9 Issue-ID: DCAEGEN2-524 Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
2018-06-08Merge "Simplify & remove duplicated testcases"Vijay Venkatesh Kumar1-2/+2
2018-06-08Merge "Refactored event processor + sonar"Vijay Venkatesh Kumar3-147/+218
2018-06-08Refactored event processor + sonarKrysiak Adam Gabriel3-147/+218
Issue-ID: DCAEGEN2-521 Change-Id: I9290f21701945cd1bb5e7a43a671991417f25491 Signed-off-by: Krysiak Adam Gabriel <adam.krysiak@nokia.com>
2018-06-06Refactor tests to check actual behavior of methodsPawelSzalapski1-1/+1
Testcases were skimming through the code, but actually make no asserts. Change-Id: I3cab0a75c885e1e459b18066f13e351970f476b0 Issue-ID: DCAEGEN2-524 Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
2018-06-06Simplify & remove duplicated testcasesPawelSzalapski1-2/+2
Testcases in those files were overengineered, plus there were duplicates so they got simplified. Obsolete classes that were unneeded were removed Change-Id: I9fce325aed4f1a3a6073f0c564adac1ec5a6beae Issue-ID: DCAEGEN2-524 Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
2018-04-24Merge "Fixes in ConfigProcessors"v1.2.0beijingVijay Venkatesh Kumar1-154/+114
2018-04-24Fixes in ConfigProcessorsburdziak1-154/+114
Change-Id: I1d360fd371520bc34b9c99c667484eb5dad81e81 Issue-ID: DCAEGEN2-460 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-04-23Merge "Small Fixes in EventProcessor"Vijay Venkatesh Kumar1-8/+5
2018-04-23Small Fixes in EventProcessorburdziak1-8/+5
Change-Id: I545c2ab0fc46d6667b403e840bec2a1f0dde25d5 Issue-ID: DCAEGEN2-466 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-04-20Fixes in DmaapPropertyReaderburdziak1-25/+33
Change-Id: I12cd5be15e37b5c0fc93f71b8fbde90026b7aaec Issue-ID: DCAEGEN2-462 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2018-04-12Optimize and refactor EventPublisher class in VESPiotr Jaszczyk3-149/+229
* Remove need for having sendEvent synchronized by means of using Guava LoadingCache. The only thing that made it synchronized was the creation of new entries in the map but the synchronization was made on each incoming event. * Split the class to smaller classes which conform to SRP. This makes us able to... * ... write unit tests for affected classes * TODO: upgrade to Java8 so lambdas will simplify the code even more Change-Id: I14cf4cfab0570ce5aecc9a5e5dc9f541c499f9d7 Issue-ID: DCAEGEN2-440 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
2018-04-07fix default propertiesVijay VK1-2/+3
Change-Id: Iae00d76ac70d6fc318d54151f99ec58eb8188aac Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-434
2018-03-07sonar complaince updatesVijay VK1-5/+4
Change-Id: I3f1bee6b9ff072528246186a73ee5133f9a918aa Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-388
2018-03-01address clm-security issuesVijay VK1-1/+1
Change-Id: I7bfd3583b16c5f2b914a9b5f3cca2d3a07614895 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-360
2018-02-28fix CLM issue + logging updatesVENKATESH KUMAR2-6/+8
Change-Id: I73a1fdd0dc0624332fc799761e8681af7f19dd3c Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-360
2018-02-27Misc updates to collectorVijay VK5-290/+491
Change-Id: I7a3b52c454442d6a9f93331142b78bf671ffcd0a Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-373
2018-02-21fix sonar issue and additional testVijay VK3-486/+500
Change-Id: If32e2319c71b947b7e5c68410f32b19ba5ac8125 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-227
2018-02-20Change default DMaaP hostnameLusheng Ji1-1/+5
The changes are for the purpose of allowing DMAAPHOST environmental variable to accept either hostname and IP address. If it is IP address, the resolution for default dmaap hostname is written to /etc/hosts; if hostname,an alias is created in /etc/host.aliases for the default dmaap hostname. (for the hostname aliasing to work, chnage default dmaap hostname to onap-dmaap, no domain). Change-Id: I58583cc5b678a29b54d8baecbd0b7bec621f7c8f Signed-off-by: Lusheng Ji <lji@research.att.com> Issue-ID: DCAEGEN2-235
2018-02-20optimization and sonar fixesVijay VK2-167/+1
Change-Id: I47b2c429abc2a8c795f9faa7739d8d75f67ed287 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-227
2018-02-18additional testcaseVijay VK1-275/+277
Change-Id: Ib4fcdf3754c43f4d1996ea50b888d976e728705a Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-227
2018-02-14Fix keystore alais config and TCVENKATESH KUMAR4-362/+418
Change-Id: I8e0349f411dc05625b14536afc0acb1fac9a55c2 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-227
2018-02-12Update license textLusheng Ji1-1/+18
Change-Id: I2c6da3d590caed0b847a3dca90e5013951689788 Signed-off-by: Lusheng Ji <lji@research.att.com> Issue-ID: DCAEGEN2-325