aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
AgeCommit message (Collapse)AuthorFilesLines
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>
2019-11-01Add common Jersey versionliamfallon4-11/+2
Add a common version of Jersey for all Policy Framework components. Issue-ID: POLICY-2209 Change-Id: I6282bc9938cbb63ddf3bf85e488f7b6be0dbdfc3 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-01Resolve mapping between TOSCA policies and APEX policy modelsa.sreekumar1-13/+12
Change-Id: Ifaedc5074bcc51a5d495e342feae89b6a2aac1cf Issue-ID: POLICY-1626 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-10-16replace grizzly server with policy common endpointHenry.Sun2-24/+43
Issue-ID: POLICY-1915 Change-Id: I8702a8b54e158dfd0ac08140ca083f14f23963a2 Signed-off-by: Henry.Sun <henry.a.sun@est.tech>
2019-09-25Fix typos in dependenciesliamfallon1-1/+2
Dependencies were spelt incorrectly in the dependency management section of the main apex-pdp POM. Issue-ID: POLICY-2115 Change-Id: I622dafe9f74b82dcc1c094eaee4ec113fe7f9c99 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-09-25Upgrade dependency versions for securityliamfallon1-9/+0
This change upgrades dependencies to versions that ve no or lesser security issues than the current versions. Issue-ID: POLICY-1644 Change-Id: Ib6dc8193c8da2547046791d82956019e0c741544 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-09-16Merge "Disable Jython Excutor for security"Liam Fallon2-2/+3
2019-09-14Disable Jython Excutor for securityliamfallon2-2/+3
The Jython interpreter pulls in many dependencies that are flagged as having security problems. We will disable Python support in apex-pdp until Frankfurt, users can compile from source if they wish to re-enable python support. Issue-ID: POLICY-1509 Change-Id: I84215ba8d1009cb7af99cd98ba19008fdff5c378 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-09-12Bump version in apex-pdp masterjrh332-32/+32
Also added defaultbranch to the .gitreview file to make it easier to change it when apex-pdp is branched in the future. Issue-ID: POLICY-2045 Signed-off-by: jrh3 <jrh3@att.com> Change-Id: Ib2570fd395aae38862299f2193b07ab06e32ace5
2019-09-03Enable https support in ApexRestServera.sreekumar7-51/+204
Enable https support in ApexRestServer by using the RestServer from policy-common Change-Id: I3dc8d88a499dfa9f0a82585a083526e236420c6e Issue-ID: POLICY-2016 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-08-21Fix checkstyle warnings in apex-pdpliamfallon7-71/+60
Unit tests introduced some checkstyle warnings, this review resolves those warnings. Issue-ID: POLICY-1942 Change-Id: I16438621c1db0adfbe70bc8b237d05bd7cc72697 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-08-08Review maven dependency for snakeyamlBruno Sakoto1-1/+0
Remove explicit version for snakeyaml maven dependency and inherit it from integration parent artifact. Upgrade snakeyaml to latest 1.24 version. Issue-ID: POLICY-1603 Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca> Change-Id: Ice5c76ee720638154a7ed086f26e6a0ac2fa7a73
2019-08-07Bump version of apex-pdpjrh332-32/+32
Issue-ID: POLICY-1965 Signed-off-by: jrh3 <jrh3@att.com> Change-Id: Icd437f10c4d991030652ffa1abf48b7b5738145c
2019-07-12add status filter in restclient and restrequestorHenry.Sun20-557/+797
Issue-ID: POLICY-1742 Change-Id: Ib4984b18c0353cddb12c13c352277728be691bf5 Signed-off-by: Henry.Sun <henry.a.sun@est.tech>
2019-07-12fix sonar issues in restclient/restrequestning.xi2-19/+14
Issue-ID: POLICY-1743 Change-Id: I2bd2224904e459d56f5802e8b5276823e7f5d454 Signed-off-by: ning.xi <ning.xi@est.tech>
2019-07-11Merge "Make URL configurable in REST Requestor/Client"Jim Hahn12-37/+415
2019-07-11Make URL configurable in REST Requestor/Clientning.xi12-37/+415
Change-Id: Ifb9870636996d1af786f05fcef7aa811d6f57532 Issue-ID: POLICY-1743 Signed-off-by: ning.xi <ning.xi@est.tech>
2019-07-10Add integration tests for executor propertiesliamfallon21-59/+92
Added integration test that sets properties in a dummy plugin and amends them in tasks in a policy. Variosu tests added to check combinations of where properties are set in plugins or in tasks or both. Implementaiton changed to: - Always pass in a Properies object, the properties object coming into the policy cannot be null because the task/TSL/SFL may wish to set it - Fix a bug where the properties were not passed from the ApexEvent to the engine event in the ApexEventUnmarshaller class Issue-ID: POLICY-1743 Change-Id: I6aa152b28d46cf3cc6fa56a1a95b76a8e55f5a49 Signed-off-by: liamfallon <liam.fallon@est.tech>