summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-09-27Add JUnit for web service client toolliamfallon6-59/+283
JUnit, SOnar fixes, and some minor bug fixes. Issue-ID: POLICY-1034 Change-Id: I72f46e944051f7d65d6b106afe33c759975283af Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-27Add missing example policy models to installliamfallon2-2/+29
The policy models for the decision maker, periodic, and vCPE examples were not included in the install because the policy model json files are generated from CLI commands. THis review installs the generated policy models. Issue-ID: POLICY-954 Change-Id: Ie2076ddfb6199dac0c8b272de8d7c47f1652485e Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-27Add unit test for Apex command line toolsliamfallon21-128/+23036
THere was no unit test for the command line tools. This review adds unit test and also fixes a few small bugs that showed up when uit test was run. Issue-ID: POLICY-1034 Change-Id: Ic19aacdb168fb5a6faa0cd83ed22ccfcedaa51f5 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-26Allow custom JSON adapter specificationliamfallon13-95/+822
In order to decode and encode complex Java POJOs with GSON, type adapters must be specified. This change allows specification of GSON type adapters for decoding and encoding of JSON in apex. Issue-ID: POLICY-954 Change-Id: Ib402d4e82c4f22fa4d532c016f77fb8e7bb568d3 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-26Fix boolean constants in examplesliamfallon26-60/+60
When the checkstyle changes were made in the java code the .TRUE and .FALSE values were changed to .isTrue and .isFalse to comply with checkstyle. THis change needs to be propogated into example scripts. Issue-ID: POLICY-103 Change-Id: I419b5f398ef4f43b1b877d52bbe4ec638870f31d Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-26Add JUnit for engine serviceliamfallon14-812/+9267
Although the Apex engine service is called by the policy engine tests and the various interface tests, the test coverage on these classes is not showing up in Sonar. In any event it is better that specific JUint is done for them. Issue-ID: POLICY-1034 Change-Id: I0028c7e5e870c18649870536cf3691fce2ab689c Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-25JUnit for evaluation test model generatorliamfallon4-4/+177
Issue-ID: POLICY-1034 Change-Id: Ic8f9971d612dd5500c73f95e5cbbb786c5ad51f3 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-25Fix sonar issues in Command line editorliamfallon4-168/+258
THe Apex command line editor had issues in teh way its loops for processing commands were written. The loops are simplified in this review. Issue-ID: POLICY-1034 Change-Id: If684a57de79bd56211e1ca3e8c446bd9698666be Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-23Fix more sonar issuesliamfallon2-138/+248
These are the last few easy to fix issues. Most remaining issues are to do with code coverage. Othersare due tot he way script interpreters work and will have to be exempted. Issue-ID: POLICY-1034 Change-Id: Ie1d1def43d33ef78a13d7f9b43ae4e22ef00cb5b Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-22Fix sonar problems in Apexliamfallon51-541/+956
Fixed some easy to resolve Sonar issues. Issue-ID: POLICY-1034 Change-Id: Ia8e4606bd4307daca499b4a74c96135211e572fd Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-20Fix bug with POJO events in APexliamfallon24-94/+1511
When an envet should be decoded entirely into a POJO and is too complex for Avro, apex decoding breaks. This reviuew fixes thsi issue. Issue-ID: POLICY-1034 Change-Id: Iccd739c4bb5c1645a2a7165f5bbfdfd4b964d79e Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-20Refactor Editor REST servletliamfallon38-2089/+3551
Issue-ID: POLICY-1034 Change-Id: Ifa08c7a31b4fe19eb62c2035b67b6f5cad313b5f Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-19Fix examples broken by checkstyle changesliamfallon27-59/+59
Checkstyle changes to some class names must be propgated into example configurations and name changes meant some examples were not being packaged. Issue-ID: POLICY-1034 Change-Id: I5485fc2ffc22c496bbae9465e1c3b09c4feade97 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-19Fix license issue with Hibernate dependencyliamfallon1-1/+1
Change-Id: I0f0ce81661c505a7df4b6199c6d0baf7a9d0ce3e Issue-ID: POLICY-1059 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-18Merge "remove license issues"Pamela Dragosh6-17/+64
2018-09-18remove license issuesliamfallon6-17/+64
Change the versions of some second order dependencies to mitigate license issues. Change-Id: I39745ec1eb7c72fb481a4adafc2805e4bbbd8386 Issue-ID: POLICY-1059 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-18Fix issue in apex client editorramverma1-2/+2
Change-Id: If12bd289d9c8a22b86b4a9c9bff21c1a9d42a3d1 Issue-ID: POLICY-954 Signed-off-by: ramverma <ram.krishna.verma@ericsson.com>
2018-09-17Fix sonar issues in apex utiltiesliamfallon8-179/+314
This change fixes Sonar issues in apex command line utilities. Issue-ID: POLICY-1034 Change-Id: Ib63a3d4107260c5909405e6f0d899279da869028 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-17Merge "Re-implement Kafka tests that periodically fail"Jorge Hernandez9-230/+107
2018-09-16Fix Sonar issues in apexliamfallon56-335/+352
Fixing various Sonar issues in apex. Issue-ID: POLICY-1034 Change-Id: Ie693637d75bd7e38c71b7ba04886fb75636276ed Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-15Re-implement Kafka tests that periodically failliamfallon9-230/+107
The Kafla integration tests fail, this change re-implements the tests using a test framework from salesforce.com i Issue-ID: POLICY-1034 Change-Id: Iffcc9e0a9f419c8ec439771be7a7a58faa2f9860 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-14Fix exception not logged or rethrownliamfallon50-202/+318
Eclipse sonarlint does not check for exception dropping by default, it must be configured. This commit addresses exception dropping in apex. Change-Id: I406838990b3424c2912124b25d7326502cacc96c Issue-ID: POLICY-1034 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-14Merge "Try new version of JRuby"Pamela Dragosh1-30/+2
2018-09-14Merge "Address sonar/Checkstyle Issues"Jorge Hernandez154-2547/+4095
2018-09-14Try new version of JRubyliamfallon1-30/+2
We had to use an old versino of JRuby due to security issues. A new version of JRuby was released in May, it seems to have a lower vulnerability level when tested using the "pom" test. Raising this review to check it in CLM. Change-Id: I77bf8bae4f7efe66d7e244d0ff9a52432b00a5ce Issue-ID: POLICY-1065 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-14Updated examples for renamed parameter classesmmis26-59/+59
Parameter classes were renamed to correct camel case names, hence the references to those parameter classes in the example config files needs to be updated Issue-ID: POLICY-1034 Change-Id: Ie388d6e25cf4bbec6984d4386cdeb19a7a3916c0 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-09-13Address sonar/Checkstyle Issuesliamfallon154-2547/+4095
Sweep through Apex codebase to fix most ceheckstyle and straightforward sonar issues. Issue-ID: POLICY-1034 Change-Id: I149d9a94ad893affc93573e8de5e3304b6bdde2d Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-13Sonar/Checkstyle in service/pluginsliamfallon257-2276/+3481
Sonar and Checkstyle changes in plugins and services, and knock on changes Issue-ID: POLICY-1034 Change-Id: Iff7df74e54fce2c661dcc2fae75ae93d4cacfe5b Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-12Sonar/Checkstyle in model/context/coreliamfallon112-1878/+1947
Checkstyle and sonar changes in the model, contexot and core modules. Issue-ID: POLICY-1034 Change-Id: I2d40bc877f3a548844470fc290fc89d63fa465ae Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-12Merge "Fix soft stop and start of engine"Pamela Dragosh7-118/+203
2018-09-12Fix soft stop and start of engineliamfallon7-118/+203
Stopping an apexc engine is a soft stop, allowing the engine to be restarted again. However, when a model upgrade is carried out the engine must be stopped and cleared to clear the previous model, loaded with the new model and started again. THis handling must work over the Web Socket admin interface and also when apex is started as a service. This change fixes the handling so that it is consistent and works the same when apex is stopped/started/upgraded from the command line or over the management web socket interface Issue-ID: POLICY-1101 Change-Id: I1fe619641cb6ecd34d0669b4b7df105280e5e2c0 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-12Fix build failsliamfallon3-2/+4
Apex end to end tests often fail because the tests are not tuned correctly for Jenkins. The JRuby test needs a delay to allow the first test to completely clear dowm The volume of events sent in the Kafka tests is reduced from 100 to 10 The dom4j version is also changed back to 1.6.1 because 1.6 has the same security issues. Issue-ID: POLICY-954 Change-Id: Id38bf9fe526942870181bfd9c0762f0a471c0c02 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-12Merge "Updated example config for CSIT test"Liam Fallon1-4/+4
2018-09-11Use parent version of websocketliamfallon2-2/+0
Two conflicting versions of the websocket library were being used, causing an exception to be thrown on apex shutdown. Using the common version of websocket solves this issue. Issue-ID: POLICY-954 Change-Id: Id1a004b1f09931b53ec389c776f74c58f7b29e99 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-11Merge "Fix install script/examples on apex"Pamela Dragosh6-17/+17
2018-09-11Merge "Checkstyle changes for apex model"Pamela Dragosh141-4005/+4366
2018-09-11Updated example config for CSIT testmmis1-4/+4
Changed the config for the CSIT test to use javascript instead of mvel and changed the REST server host to enable communication from outside the docker container Issue-ID: POLICY-1099 Change-Id: I6173545d70d6b83c86bbee132cf057985487a501 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-09-11Fix install script/examples on apexliamfallon6-17/+17
The install script for apex did not coreate the soft link for apex correctly. One of the example json files was named incorrectlu. Issue-ID: POLICY-954 Change-Id: If7923e2287aebb956bd4bc9ed4b26b23a40d048b Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-10Checkstyle changes for apex modelliamfallon141-4005/+4366
Fix checkstyle warnings in the apex mode and knock on changes. Issue-ID: POLICY-1034 Change-Id: I10537e4288e9cad5ef18165ed2cdc1d3ab3139c1 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-10Added config and model to examplesmmis2-0/+7086
Added a config and model file to examples to be used in CSIT test Issue-ID: POLICY-1099 Change-Id: Idbd3bf323b366273bca9a5472abcf528725b2f77 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-09-10Merge "Address level 4-6 security issues"Pamela Dragosh7-89/+96
2018-09-09Adding jacoco plugin to main pomramverma1-0/+81
Overriding jacoco plugin setting in main pom of apex-pdp to build cumulative coverage report at project level so that the same gets reflected in sonar dashboard Change-Id: Ia4272192dae3af73806ed1caf3186b537ef10df1 Issue-ID: POLICY-1034 Signed-off-by: ramverma <ram.krishna.verma@ericsson.com>
2018-09-08Address level 4-6 security issuesliamfallon7-89/+96
Remove commons-compress and chage version of dom4j Also fix checkstyle in affected modules Issue-ID: POLICY-1065 Change-Id: Id37e54a54997656674af37dfd924aec5f69e410a Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-07Parameter group fields must have gettersliamfallon31-203/+302
Modifications to apex parameters to include getters that follow naming conventions, and knock on changes. Also checkstyle fixes taken in modifified classes. Issue-ID: POLICY-1095 Change-Id: Iff5ccc7a069a4ec2b2b974ed9f5ed70a88692e00 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-06Fix package of apex examples and documentsliamfallon201-1218/+1759
The examples are not packaged correctly in the apex build and the client wars are missing The links and location of the documents are corrected. Some POM duplicate dependencies removed. Javadoc warnings removed. Issue-ID: POLICY-867 Change-Id: I555c29191c61c0a9887365d95005dbc584eddf04 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-05Fix checkstyle warnings in examplesDinh Danh Le23-167/+190
Change-Id: Iad533f3987792d8713426234f3277c1ef6b72284 Issue-ID: POLICY-1034 Signed-off-by: Dinh Danh Le <dinh.danh.le@ericsson.com>
2018-09-04Merge "Fix checkstyle issues in apex model basic"Jorge Hernandez201-1511/+1535
2018-09-04Dependency version changes for securityliamfallon2-4/+4
Versions of Jython and hazelcast changed to more secure versions. Change-Id: Iad918705170846b8813512c4bd8087ba429f6e82 Issue-ID: POLICY-1065 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-04Fix checkstyle issues in apex model basicliamfallon201-1511/+1535
CHeckstyle issues in apex model basic and knock on changes in other apex modules. Issue-ID: POLICY-1034 Change-Id: I65823f5e2e344526abc74b0812877113acb056ec Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-08-31Use parameter service in apexliamfallon121-2117/+3267
Switch parameter handling in apex to use the ONAP PF common parameter service Change-Id: Id318d19c726b18b1a69c630fa81ca7d695355e9c Issue-ID: POLICY-954 Signed-off-by: liamfallon <liam.fallon@ericsson.com>