aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
AgeCommit message (Collapse)AuthorFilesLines
2020-06-23Remove thread in JavascriptExecutorhuaxing9-704/+103
This change is basically a rollback of https://gerrit.onap.org/r/c/policy/apex-pdp/+/104230, with minor refactoring. The problem that 104230 tried to address was supposed to be caused by https://jira.onap.org/browse/POLICY-2463. With this rollback, apex-pdp increases performance and reduces memory usage. Issue-ID: POLICY-2572 Signed-off-by: huaxing <huaxing.jin@est.tech> Change-Id: I3a52d0ead0c1e530d218f9e3aba8b3eb5558abaf
2020-06-23Merge "Updating all Apex dependencies"Ram Krishna Verma6-9/+9
2020-06-23Remove apex-pdp Jackson security issueliamfallon1-4/+5
We should use the managed version of jackson from policy-parent rather than a specific apex-pdp version. Also upgrade the version of Avro, avro 1.9.2 uses a newer somewhat more secure version of Jackson. Issue-ID: POLICY-1508 Change-Id: If32218816ae76cf3cf6ddc8980e3a37e7e2ffd19 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-06-22Updating all Apex dependenciesRossC7-10/+10
Issue-ID: POLICY-2387 Change-Id: I6d9222cfe8841a4a4532d95dbc6f8b3f3d15ac87 Signed-off-by: RossC <ross.carter@est.tech>
2020-06-19Changes for checkstyle 8.32liamfallon87-116/+6
Issue-ID: POLICY-2188 Change-Id: I56bbf3aa3bd9e1ef433cc93ad2be0c54d141a2a5 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-05-21Bump apex master to 2.4.0RossC32-32/+32
Issue-ID: POLICY-2514 Change-Id: I764cfe41ed8cf8ffebd4ff076d0b76b79d61e142 Signed-off-by: RossC <ross.carter@est.tech>
2020-05-20Bump Apex to 2.3.3RossC33-33/+33
Issue-ID: POLICY-2514 Change-Id: I5b130b052150eb0e51759c751b83ab9d6f199759 Signed-off-by: RossC <ross.carter@est.tech>
2020-04-17Merge "Fix sonar issues"Pamela Dragosh1-1/+1
2020-04-15Bump policy-apex-pdp to 2.3.2-SNAPSHOTa.sreekumar33-33/+33
Change-Id: Ic668ab20498bdc41edc78f52c7ce9d89a1385f19 Issue-ID: POLICY-2378 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-04-15Fix sonar issueshuaxing1-1/+1
Issue-ID: POLICY-1913 Signed-off-by: huaxing <huaxing.jin@est.tech> Change-Id: Id1a9a6b6f7a9c8c74dd69bd0d30af05162a92cd1
2020-04-06Fix intermittent unit test failures WebSocketliamfallon1-4/+4
The Web Socket server is marked as started before the start process has complted. This change fixes that issue. Issue-ID: POLICY-1470 Change-Id: I5b5ef5832893d884a6551b0516df91cb71d6c622 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-04-05Fix intermittent unit test failures reseterquestorliamfallon8-278/+183
When consumers and producers are paired as in the case of the REST Rquestor, both sides must come up and be wired together in the initiation phase of apex-pdp before the consumers and producers start handling envents. In the ApexActivator class, the consumers were started immediately after they were initialized meaning that a consumer could return events to a producer that had not started yet. This change fixes the ApexActivator so that it waits until all consumers and producers are initialized before starting event handling. It also fixes the timings on RestRequestor tests and tidies up the unit tests. Issue-ID: POLICY-2469 Change-Id: Ib66d9531bf21f2a879ab33795aded4f48e7bfbc6 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-04-04Merge "Refer io.netty from policy/parent"Liam Fallon2-1/+11
2020-04-03Refer io.netty from policy/parentRam Krishna Verma2-1/+11
Issue-ID: POLICY-2467 Change-Id: Iea562574f466775f4dd443fc4ef9ecaa6ba610fd Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-04-03Fix failing Kafka testsliamfallon3-46/+41
All the Kafka components need something near 10 seconds to come up completely. This review tweaks the timing to allow the test Kafka server to come up and to allow the consumers to connect to it. Issue-ID: POLICY-2106 Change-Id: I6dd8ace0848bdc2549e658ef8908b4d85d5ea789 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-04-02Fix hanging timeout on Executor testliamfallon12-52/+54
Issue-ID: POLICY-2106 Change-Id: I7bd44f8dfe349d73a4c8c4f978a30b455c45b2c7 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-31Bump version of Infinispan for securityliamfallon1-2/+3
Change-Id: Ie01b221e182dd43e85e3e7277bb55169f85a1460 Signed-off-by: liamfallon <liam.fallon@est.tech> Issue-ID: POLICY-2449 Change-Id: Icbb7a769eb8f0d9ef278d222ab007f330576abb3 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-30Fix hanging tests in JavascritExecutorliamfallon6-66/+419
Added tests to check threads start, execute, and stop correctly and fixed JavescriptExecutor class to handle startup and shutdown correctly without hanging. Issue-ID: POLICY-2106 Change-Id: I9ab41023aae2ab1cbcaea53fdf5d48eccd90a2f1 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-25Bump policy-apex-pdp to 2.3.1-SNAPSHOTa.sreekumar33-33/+33
Change-Id: I59b93fccb0f3a41f8db753d1e8e2978bbb51e9a0 Issue-ID: POLICY-2378 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-03-25Ignore JUnit tests that hang on awaitliamfallon4-2/+11
This change ignores the tests that are hanging in Jenkins until the Apex images are released. Once the images are released we'll fix these tests. Issue-ID: POLICY-2106 Change-Id: I6a733896da044d3f24443ac202d6122a341db135 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-25Add timeout on Javascript latch awaitsliamfallon1-2/+7
It is possible that the initiation and especially shutdown happens so fast that the execution thread counts down the latch before the caller calls await(), in which case the Javascript Rhino thread will hang. This review adds a timeout on the await calls. Issue-ID: POLICY-2106 Change-Id: Icfc6d4b478cca62522461c25d61ce9ee7328684a Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-24Launch separate threads for Javascript task executionliamfallon8-80/+330
When a policy is loaded, a separate thread is spawned for each Javascript script executor. This allows us to precompile the Javascript scripts and also to have a larger stack available for script execution. Issue-ID: POLICY-2106 Change-Id: I97323aafb623ba537ac1889b3c9504b345b4f67e Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-11Fix minor checkstyle/eclipse warningsliamfallon4-27/+8
Some minor checkstyle and eclipse warnings have crept into the code in the last few weeks. This review cleams them up. Issue-ID: POLICY-1913 Change-Id: Ib5f103bc28c71a6c4db05ea05719eff41bb38914 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-11Merge "Convert examples to Rhino Javascript format"Ram Krishna Verma2-3/+2
2020-03-11Convert examples to Rhino Javascript formatliamfallon2-3/+2
All examples are converted to Rhino Javascript from Nashorn Javascript. Issue-ID: POLICY-2106 Change-Id: Ia6fec5b57b1e6131799b4b069968e4766ce54c96 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-11Fixing the gRPC consumer sidea.sreekumar5-83/+146
Change-Id: I21d9253f41eee9b958e8fb723f6c19f266502cef Issue-ID: POLICY-1656 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-03-09Use Rhino javascript executor in apex-pdpliamfallon15-261/+143
Integation unit tests resultd in StackOverflowException errors in the Graal Javascript interpreter. Following extensive testing and trouobleshooting, it proved very difficult to fix these issues in Graal as the stck overflow errors were occurring in native class instantiation methods being invoked by Grall on the JVM. The alternative Rhino Javascript engine is developed by mozilla, and was incorporated into the Java 6 JVM and evolved into Nashorn in the Java 8 JVM. Oracle dropped Nashorn in Java 11. However, in parallel, Rhino development has continued. This review brings in the Rhino javascript engine into apex-pdp as the replacement for Nashorn and instead of Graal. Graal seems to be pretty unstable as yet so we may bring it in in future releases but for now Rhino is a more stable and reliable alternative. Issue-ID: POLICY-2106 Change-Id: I0edeff3b0bee404b38e3ebe22001a6e3375a44dc Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-04Merge "replace test sleep() with awaitality package"Liam Fallon3-22/+19
2020-03-04Merge "Preparing integration tests for Graal Javascript"Pamela Dragosh3-38/+37
2020-03-04Merge "GRPC support for APEX-CDS interaction"Pamela Dragosh10-1/+718
2020-03-04Preparing integration tests for Graal Javascriptliamfallon3-38/+37
Graal enforces Javascript more strictly than Nashorn does. This review changes the tests in apex-pdp to comply with the stricter -Javascript checking, re-enabling the integration test module. - All log calls must be passed as strings, using toString() - Byte/Float/Long Java types not supported in Javascript Disable integration tests so that other changes can be brought in. JMS integration test is disabled for now, it will be re-enabled in a review shortly. Issue-ID: POLICY-2106 Change-Id: I14bdb930eff735e862b51802cf72e4793cec3699 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-04replace test sleep() with awaitality packageHenry.Sun3-22/+19
Signed-off-by: Henry.Sun <henry.a.sun@est.tech> Change-Id: I305771ddef42bd3032ad52f4c5ecd55b01ed5a1a Issue-ID: POLICY-1914 Signed-off-by: Henry.Sun <henry.a.sun@est.tech>
2020-03-03GRPC support for APEX-CDS interactiona.sreekumar10-1/+718
Change-Id: I586153244dbd97a41e9b9d616ee9a84327b7c2da Issue-ID: POLICY-1656 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-03-03use policy/parent awaitilityPamela Dragosh1-2/+1
use common version Issue-ID: POLICY-2381 Change-Id: Id231aa8709b3c4515fcac80b82d53fb8ed45eaf0 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-02Merge "FIxing Sonar issues in APEX"Jorge Hernandez2-11/+1
2020-03-02FIxing Sonar issues in APEXaditya.puthuparambil2-11/+1
Change-Id: I8ac07eede6758c84a4a9ca505382f215d531cf47 Issue-ID: POLICY-1913 Signed-off-by: aditya.puthuparambil <aditya.puthuparambil@est.tech>
2020-03-01Switch apex to Graal javascript engineliamfallon18-326/+2007
This is the main review to switch out the Nashorn Javascript interpreter and switch in the Graal javascript interpreter for apex Javascript tasks. The Graal Javascript dialect differs slightly from Nashorn in the way it accesses information passed over from the Java world so Javascript tasks need to be converted. Subsequent reviews will convert the JUnit tests marked @Ignore in previous reviews to this one and will convert the Javascript tasks into a format Graal can handle. Subsequent reviews will also convert the examples over to Graal format. Issue-ID: POLICY-2106 Change-Id: Ief582a36539e8a87724c17fb7e56864d5e471c07 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-02-26Merge "Fix Java 11/Checkstyle/Sonar warnings"Jim Hahn9-93/+64
2020-02-26Fix Java 11/Checkstyle/Sonar warningsliamfallon9-93/+64
A number of Java 11, checkstyle, and SONAR warnings have crept into the Apex codebase over the last number of reviews. This change fixes those issues. Issue-ID: POLICY-1913 Change-Id: I2afd607e80f48323355380fb2fe5e048e18879f9 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-02-25remove duplication code in plugins-event producerning.xi4-155/+16
Issue-ID: POLICY-1884 Change-Id: I7774dfdc7d7edcc0409a817bfd21ddacec21d085 Signed-off-by: ning.xi <ning.xi@est.tech>
2020-02-24Merge "remove code duplication in plugins"Ram Krishna Verma7-321/+21
2020-02-21remove code duplication in pluginsshaoqiu7-321/+21
Remove consumer code duplication in plugins-event-carrier Issue-ID: POLICY-1884 Signed-off-by: shaoqiu <tim.huang@est.tech> Change-Id: I2d222436a97224e54a03c2501f4dc14d3f5f6ac0
2020-02-20remove code duplication in plugin-event-carrierning.xi4-367/+21
Issue-ID: POLICY-1884 Change-Id: I610d7ee34d640cc3a7d3381b24993ee9b6f76f2d Signed-off-by: ning.xi <ning.xi@est.tech>
2020-01-23Remove apex-pdp TextFileUtils classliamfallon9-125/+132
This class was moved to policy-common some time ago. Removing it in apex-pdp. Issue-ID: POLICY-1913 Change-Id: I982fbd799334b34f1526e19f339236b52205b91e Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-01-23Run apex-pdp in Java 11: base changesliamfallon3-61/+65
This change brings in the minimum changes to get apex-pdp running in Java 11. Other reviews will bring in changes to remove Java 11 warnings and to convert apex-pdp Javascript handling from the now deprecated nashorn engine. Issue-ID: POLICY-1581 Change-Id: I879bbae08d4e67aca3f1bfeedeca639d8dbbc281 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-12-04Minor changes for new Eclipse checkstyle checksliamfallon1-17/+19
The laest Eclipse checkstyle version 8.26.0 does more thorough checking and identified a number of small issues in the apex-pdp codebase. This review fixes those issues. Issue-ID: POLICY-1913 Change-Id: I30ba25e3e425c6d54c77f925e8da3ab841a8357c Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-28Replace getCaononicalName() with getName() in code baseliamfallon14-96/+107
Issue-ID: POLICY-1861 Change-Id: Iccbdcbc5b5978305c56ab74c01a52a562697bee1 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-26Reduce verbosity of logging during unit testliamfallon2-4/+4
Logging dialled back in logback.xml files and on ligging statements in unit test java code. Issue-ID: POLICY-2272 Change-Id: I3b9a46d8993b1571c8dc62687a9c136af46c1f51 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-15Fix JRuby interpreter shutdown issueliamfallon5-29/+59
The new version of JRuby fixes this issue. Also amended unit test to check for shutdown and immediate recreation of JRuby interpreter. Issue-ID: POLICY-1276 Change-Id: I723e0396985d3163b483e52fdaceb4b4fab7274b Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-04Use jersey dependencies from policy-endpointsliamfallon3-33/+3
There is no need to have Jersey dependencies in the PDP POMs as they are inherited from the policy-endpoints POM. Issue-ID: POLICY-2209 Change-Id: I5c53e7b29f4df25fd730f7a521e149e4ee70d964 Signed-off-by: liamfallon <liam.fallon@est.tech>