summaryrefslogtreecommitdiffstats
path: root/services/services-engine/src/main
AgeCommit message (Collapse)AuthorFilesLines
2018-12-11Remove unused parameter from test dataliamfallon1-1/+1
The "restRequestTimeout" parameter is not used in the current version of Apex, it was replaced by the "requestorTimeout" paramter. However, the parameter remained in the JSON data files. Also updated to improve output of messages during unit test. This review also sets the Jersey injection dependendy scope to "test" Issue-ID: POLICY-1074 Change-Id: I75f495f571c8101310bd1eaec01a305318346cd9 Signed-off-by: liamfallon <liam.fallon@est.tech>
2018-12-03Fix checkstyle/sonar issuesliamfallon1-24/+30
Remove unused imports Add @FunctionalInterface annotation Reduce the complexity of some methods Change-Id: If519c31b113233361fbb935121fe6494263ac957 Issue-ID: POLICY-1074 Signed-off-by: liamfallon <liam.fallon@est.tech>
2018-11-29Fixing issues in apex documentsramverma1-11/+10
Change-Id: Ibc07c20fa8ac1018443a3c061613fdaecc5efb83 Issue-ID: POLICY-1280 Signed-off-by: ramverma <ram.krishna.verma@ericsson.com>
2018-11-16Fix timing and move testsliamfallon1-0/+6
The timings on the REST test are too short and time out on ONAP Jenkins The tests of the Apex service and Apex model upgrade are not benchmark tests so are moved to Integration. Issue-ID: POLICY-1251 Change-Id: I2672d01042b33fe0cce5223005295e3b1aa26e7a Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-11-07Refactor unit test dataliamfallon4-30/+201
There were many copies of test policies and examples strewn through the Apex unit tests. This change cleans up the unit tests so that a single version of all example policies is used in all tests. Also added a new relative file root command line parameter to Apex to allow the root of relative paths in configuration files to be set. Apologies for the size of this review but unfortunately all of this must be done in one shot. Issue-ID: POLICY-1252 Change-Id: Ibbb18fbf18e3897a1c61301d0a65e62bc643a0e9 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-10-19Fix bug to allow JSON arrays of eventsliamfallon1-0/+3
Apex should allow JSON arrays of events to be processed, processing the array of events as they come in. This review changes the Apex JSON array handling to allow arrays of JSON events to be processed. Arrays of events are required to perform Apex pewrformance tests. Change-Id: I08ddc9659414bd076fbaa250182335d6f38473e6 Issue-ID: POLICY-812 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-10-05JUnit for apex Admin Protocol listenerliamfallon2-12/+17
Added coverage for this package. i Issue-ID: POLICY-1034 Change-Id: I2e4b51983eec245eb9f105587d15f853656ce35a Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-26Allow custom JSON adapter specificationliamfallon1-12/+32
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-26Add JUnit for engine serviceliamfallon2-78/+111
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-23Fix more sonar issuesliamfallon1-108/+218
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 Apexliamfallon6-33/+61
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 APexliamfallon6-83/+294
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-16Fix Sonar issues in apexliamfallon3-1/+3
Fixing various Sonar issues in apex. Issue-ID: POLICY-1034 Change-Id: Ie693637d75bd7e38c71b7ba04886fb75636276ed Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-14Fix exception not logged or rethrownliamfallon5-11/+26
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-13Sonar/Checkstyle in service/pluginsliamfallon30-550/+560
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/coreliamfallon2-3/+3
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-12Fix soft stop and start of engineliamfallon5-111/+198
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-07Parameter group fields must have gettersliamfallon11-37/+80
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 documentsliamfallon4-13/+10
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-04Fix checkstyle issues in apex model basicliamfallon4-90/+90
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 apexliamfallon19-541/+550
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>
2018-08-09Checkstyle the services-engine packageDinh Danh Le30-126/+154
Change-Id: I0d7fd6f867ba280953eb4fd0dc2a5ad1779fb045 Signed-off-by: Dinh Danh Le <dinh.danh.le@ericsson.com> Issue-ID: POLICY-1034
2018-08-03Use common components in apexliamfallon3-5/+5
Common ResourceUtil class replaces specific one in APEX Managed dependency version clashes removed in POMs Dependency versions with security vulnerabilities changed for zookeeper kafka infinispan Change-Id: I3c4b367cb5556b2dc255ab62c84f85738165eb81 Issue-ID: POLICY-954 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-07-24Fix bug in APEX parameter serviceliamfallon1-3/+1
The parameter calss name was not initialized in the constructor of the parameter service The web socket connections() method is depricated and replaced by getConnections() Fixed order of build in main pom to put packages module last fixed some comments that were incorrect Change-Id: I6340655100655e181e2d97fe39def4874873dff5 Issue-ID: POLICY-954 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-06-28Adding integration test modulewaqas.ikram2-86/+74
Change-Id: If94ff28724a31269cf20b32c43fa0790c3b2dac3 Issue-ID: POLICY-865 Signed-off-by: waqas.ikram <waqas.ikram@ericsson.com>
2018-06-14Add YAML plugin and cleanup for checkstyleliamfallon6-139/+270
Bringing in the APEX YAML plugin, allows events with YAML bodies to be consumed by APEX. Also clean up of event protocol interface to make it not specific for JSON. Also some checkstyle changes on classes impacted by event protocol interface change. Change-Id: I7c3867ac508096fd8acad2488e61db87dfa1d6bd Issue-ID: POLICY-862 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-06-08Fixing Sonar bugs and Vulnerabilitieswaqas.ikram6-4/+16
Change-Id: Id5a95f23f1308dbb9f7f0c0f5567e238ecf830af Issue-ID: POLICY-859 Signed-off-by: waqas.ikram <waqas.ikram@ericsson.com>
2018-06-06Adding services engine modulewaqas.ikram82-0/+10653
Change-Id: I68bbe6d95d17cfcdda204d1ee3eec3b92d12ebd4 Issue-ID: POLICY-859 Signed-off-by: waqas.ikram <waqas.ikram@ericsson.com>