summaryrefslogtreecommitdiffstats
path: root/model/basic-model
AgeCommit message (Collapse)AuthorFilesLines
2022-02-08Remove JAXB and XML, use GSON for JSONliamfallon34-1539/+401
This review converst apex-pdp to use GSON for JSON handling. In order to preserve backward compatibility with the JAXB format of JSON, custom handling of maps was required. Therefore, the policy-common StandardCoder could not be used. There are a lot of small changes, removing annotations from concepts and tweaking of test data. However, this cleans up the code base so it is worth doing. Issue-ID: POLICY-1820 Change-Id: I213fa64f6d7f3f1df8d10f111d9fbedbe80f9fe0 Signed-off-by: liamfallon <liam.fallon@est.tech>
2022-02-04Remove JPA annotations from apex-pdp codeliamfallon7-74/+6
This review is part of a series of reviews to move the apex-pdp state machine model to use the base model types in policy models. Persistence of policies for apex-pdp is now implemented in PAP and API. The historic direct load and save functionality for APEX policy state machine models to and from databases is no longer used and no longer supported. This commit removes JPA annotations form apex-pdp code. Subsequent reviews will mvoe the mdoel across to use the policy models base model types. Issue-ID: POLICY-1820 Change-Id: I91a45a0ca6c88f9ba4b201bad920065f95ffb31e Signed-off-by: liamfallon <liam.fallon@est.tech>
2022-02-03Remove direct DB Load/Save from apex-pdpliamfallon16-1606/+44
This review is part of a series of reviews to move the apex-pdp state machine model to use the base model types in policy models. Persistence of policies for apex-pdp is now implemented in PAP and API. The historic direct load and save functionality for APEX policy state machine models to and from databases is no longer used and no longer supported. This revmoves the DAO code from apex-pdp and the associated handling and test code. The next review will remove the JPA annotations. Subsequent reviews will mvoe the mdoel across to use the policy models base model types. Issue-ID: POLICY-1820 Change-Id: Iabf034b40a413d32fe62091fe3446f52ec30d3af Signed-off-by: liamfallon <liam.fallon@est.tech>
2022-01-24Add TOSCA policy status header field to APEX event create CLIRashmi Pujar1-0/+46
In order to expose the processing status of a TOSCA policy to APEX-PDP, a new header field for APEX concept "event" has been introduced to track this within an APEX policy implementation. This field will be leveraged to extract the TOSCA policy execution metrics. Note, that the field is marked as optional for backward compatibility. Unit tests have been augmented to test for the field wherever applicable and the default empty value is retained for the others. "example-grpc" module has been updated to include this field. Exposing the TOSCA policy execution metrics is outside the scope of this patch since the current changes are already very large owing to the atomic nature of the change introduced. Issue-ID: POLICY-3845 Signed-off-by: Rashmi Pujar <rashmi.pujar1@bell.ca> Change-Id: Ief6d70f9abcfc8414e10aa51a27815ee9028e4c8
2021-11-29Update snapshot of policy/apex-pdp to 2.7.1-SNAPSHOTliamfallon1-1/+1
*** This commit is generated by a PF release script *** policy/apex-pdp is update from 2.7.0-SNAPSHOT to 2.7.1-SNAPSHOT Issue-ID: POLICY-3827 Signed-off-by: liamfallon <liam.fallon@est.tech> Change-Id: I334dda447490f6c3e848be7b58f4a5119ae70ead
2021-10-14Bump policy/apex-pdp to Jakarta 2.7.0-SNAPSHOTa.sreekumar1-1/+1
Change-Id: I8ead26be4968b94980dcafd269c7ab32022b34d0 Issue-ID: POLICY-3696 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2021-10-14Bump policy/apex-pdp to 2.6.2-SNAPSHOTa.sreekumar1-1/+1
Change-Id: I0db6ab5efb0595cba86ce9cbaaafab88349818ff Issue-ID: POLICY-3696 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2021-09-15Bump apex-pdp to 2.6.1-SNAPSHOTa.sreekumar1-1/+1
Change-Id: Ie39d324e02a302b882318d46735a727322ce409d Issue-ID: POLICY-3587 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2021-06-28Update policy-apex-pdp for checkstyle 8.43liamfallon2-3/+3
Issue-ID: POLICY-3209 Change-Id: I0cb6fc8f5693fe03b4d68af2fde5116e9e248115 Signed-off-by: liamfallon <liam.fallon@est.tech>
2021-06-24Update apex-pdp for checkstyle 8.43liamfallon1-1/+1
Issue-ID: POLICY-3206 Change-Id: I3873c85aab577e85a9ae6b610c3871ee4de6ea53 Signed-off-by: liamfallon <liam.fallon@est.tech>
2021-06-10Fix Rebase Issue on Sonar Issues apex-pdp-modellapentafd1-21/+0
Deleting a duplicate method inserted in two different reviews Issue-ID: POLICY-3093 Change-Id: Ie7c06c17ad1df380ebcd7129c218f5784152ff0e Signed-off-by: lapentafd <francesco.lapenta@est.tech>
2021-06-10Merge "Fix Sonar Issues in apex-pdp-basic-model"Pamela Dragosh7-52/+93
2021-06-09Fix Sonar Issues in apex-pdp-basic-modellapentafd10-74/+115
Test refactoring and use of Local-Variable Type Inference Issue-ID: POLICY-3093 Change-Id: If19c9ec96ba440a58eff679f276e4b53a26ce1ab Signed-off-by: lapentafd <francesco.lapenta@est.tech>
2021-06-08Fix Sonar Issues in apex-pdp-modellapentafd17-214/+249
Changes made into model/basic-model Renamed test classes to match the others Issue-ID: POLICY-3093 Change-Id: I7a0d6046ead42a9165aaf96b89511dd8d064d109 Signed-off-by: lapentafd <francesco.lapenta@est.tech>
2021-05-07Code coverage for File Carrier Pluginarkadiusz.adamski1-2/+8
- Increase code coverage for file carrier plugin in service engine Issue-ID: POLICY-3092 Signed-off-by: arkadiusz.adamski <aadamski@est.tech> Change-Id: I8c08ee55c9d31792e35a1acc79330c8eef42af56
2021-03-12Bump apex-pdp to 2.6.0-SNAPSHOTliamfallon1-1/+1
Issue-ID: POLICY-3105 Change-Id: I53abd7e9cf8c1425d115b0bb917db6389e9ded92 Signed-off-by: liamfallon <liam.fallon@est.tech>
2021-03-10Bump apex-pdp to 2.5.2-SNAPSHOTa.sreekumar1-1/+1
Change-Id: I291f968367b1f864bb417a72fd0bdb22a07ba0f7 Issue-ID: POLICY-3127 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2021-02-24Bump apex-pdp to 2.5.1-SNAPSHOTa.sreekumar1-1/+1
Change-Id: I761ded255a97128f858d3a7ce95f2479b6208a4e Issue-ID: POLICY-3088 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2021-02-18Fix sonars in apex-pdpJim Hahn9-33/+78
Addressed the following issues: - initialize mocks before use - use parameterized queries - Random() is not secure - provide parameterized type for generics - unused imports - constructor visibility - use compute() instead of containsKey()/put() - make final fields static - rename constants to all upper case - no assert() in Thread.run() methods - nested try - nested if/else - too many break/continue - use try-with-resources - repeatable annotations - overlapping characters in reg ex - hashcode is not sufficient in compareTo() - need equals() with compareTo() - make class an interface - use parameterized test - multiple calls in assert() - log or re-throw - use different type of lambda - use parameterized logging - use StringBuilder instead of concatenation - use StandardCharsets.UTF_8 Issue-ID: POLICY-2906 Change-Id: I2cf8c885e3e22c2c6cbe6403a34906928afad022 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-27Bump apex-pdp master to 2.5.0-SNAPSHOTRam Krishna Verma1-1/+1
Issue-ID: POLICY-2875 Change-Id: Ibb0e9a243bf92f0255cb5c145d31ccddb988fdf5 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-10-20Bump apex-pdp to 2.4.4-SNAPSHOTa.sreekumar1-1/+1
Change-Id: I5e2cd92ee3620dea4070d9fa3aeb5ffd65f9412c Issue-ID: POLICY-2869 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2020-10-08Bump apex-pdp to 2.4.3-SNAPSHOTRam Krishna Verma1-1/+1
Issue-ID: POLICY-2839 Change-Id: Ia7c847b3dafd28958d5df209af95cac19fa480a0 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-09-10Bump APEX version to 2.4.2-SNAPSHOTa.sreekumar1-1/+1
Change-Id: Idde5050b425eb1bebe312e80e795c21513367a1b Issue-ID: POLICY-2789 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2020-09-03Clean up warnings and SONAR issuesliamfallon1-36/+35
Issue-ID: POLICY-2654 Change-Id: Ifd391ea9141d37cfd3ca4110d66c667962230ae1 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-08-17SONAR fixes - assert dissimiliar typeswaynedunican5-6/+6
Fix for assertions comparing dissimiliar types. Issue-ID: POLICY-2761 Change-Id: I1b2b8afa3e6308cda887d73a4ee079709847d054 Signed-off-by: waynedunican <wayne.dunican@est.tech>
2020-08-10Merge "Sonar Fixes"Pamela Dragosh1-2/+2
2020-08-10SONAR assertion cleanupwaynedunican5-14/+16
Replaced assertions to not have the same actual and expected expression in apex-pdp Issue-ID: POLICY-2761 Change-Id: I2bf45a3cc4411bd39f93f9d0b8c8e56dd318281e Signed-off-by: waynedunican <wayne.dunican@est.tech>
2020-08-07Sonar FixesJvD_Ericsson1-2/+2
Replace the type specification in this constructor call with the diamond operator and other small fixes Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech> Issue-ID: POLICY-2760 Change-Id: I83821859a4a1dbbffbaeae15281abac2de3b5712
2020-07-28Merge "SONAR assertions apex-pdp"Jim Hahn2-4/+12
2020-07-27SONAR assertions apex-pdpwaynedunican2-4/+12
Ensure assertions are present in test cases Issue-ID: POLICY-2706 Change-Id: I3673a7668564401d2136450b0bdd7a013605dd7c Signed-off-by: waynedunican <wayne.dunican@est.tech>
2020-07-24Fix replaceAll SONAR issues in apex-pdpJvD_Ericsson1-6/+7
Change replaceAll() with repalce() in apex-pdp Issue-ID: POLICY-2722 Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech> Change-Id: I8a15b99f02399addfc8f0e25349e3022d8b8c9f1
2020-07-23Remove try/catch blocks with assertj - apex-pdpwaynedunican12-567/+306
Removed try/catch blocks in apex-pdp and replaced with assertj assertions Part III Issue-ID: POLICY-2451 Change-Id: I1e6ede1c256c5bcf7899e1af130add71fdf1381c Signed-off-by: waynedunican <wayne.dunican@est.tech>
2020-07-14Merge "Fix assertTrue SONAR issues in apex-pdp/examples and apex-pdp/model"Ram Krishna Verma8-100/+101
2020-07-13Remove old documentation from buildliamfallon4-145/+0
apex-pdp had an in-line docuemntation build system built on asciidoc. It has proven to be very difficult to maintain and keep up to date and it is incompatible with the ONAP official RST/ReadTheDocs docuementation system. In the Dublin release, we converted the asciidoc documentation to RST format, and hae been updating the RST documentation since. The asciidoc docuemntation system is now so out of date that it is being removed. In this change, the "site" directory is removed from all modules in apex-pdp and a profile called "apexSite" is removed from the pom.xml file in all modules. Issue-ID: POLICY-2686 Change-Id: I645f3ed101159d356cd90e619cef791067ad5eb5 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-07-13Fix assertTrue SONAR issues in apex-pdp/examples and apex-pdp/modelJvD_Ericsson8-100/+101
Replace assertTrue with assertEquals and assertFalse with assertNotEquals in apex-pdp/examples and apex-pdp/model Issue-ID: POLICY-2690 Change-Id: Ie863dd95ccead62268689a4a8388f9b6e8821649 Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
2020-07-10Bump apex-pdp to 2.4.1-SNAPSHOTRam Krishna Verma1-1/+1
Issue-ID: POLICY-2695 Change-Id: I15b489de9ca2614e3a6c94b450a3d6397d17d4ff Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-06-29Fix SonarQube vulnerabilitiesToineSiebelink1-0/+6
Added logging to handle file io boolean returns Added security related settings to xml factories and builders Issue-ID: POLICY-2654 Change-Id: Ibc0a01f978bfc446e1dc1f8ad952d1305a7b7178 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
2020-06-23remove build warning with json dependencyHenry.Sun1-5/+0
Signed-off-by: Henry.Sun <henry.a.sun@est.tech> Change-Id: Ieceb3e129620ced23552027e71fd09a2bd91acbe Issue-ID: POLICY-2649
2020-06-19Changes for checkstyle 8.32liamfallon43-141/+42
Issue-ID: POLICY-2188 Change-Id: I56bbf3aa3bd9e1ef433cc93ad2be0c54d141a2a5 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-05-21Bump apex master to 2.4.0RossC1-1/+1
Issue-ID: POLICY-2514 Change-Id: I764cfe41ed8cf8ffebd4ff076d0b76b79d61e142 Signed-off-by: RossC <ross.carter@est.tech>
2020-05-20Bump Apex to 2.3.3RossC1-1/+1
Issue-ID: POLICY-2514 Change-Id: I5b130b052150eb0e51759c751b83ab9d6f199759 Signed-off-by: RossC <ross.carter@est.tech>
2020-05-08Unit tests for various classesRossC1-2/+8
Issue-ID: POLICY-1916 Change-Id: Ie7cafa16ce12ca542a4e76307caddb36b7753990 Signed-off-by: RossC <ross.carter@est.tech>
2020-04-17Merge "Fix sonar issues"Pamela Dragosh1-4/+5
2020-04-15Bump policy-apex-pdp to 2.3.2-SNAPSHOTa.sreekumar1-1/+1
Change-Id: Ic668ab20498bdc41edc78f52c7ce9d89a1385f19 Issue-ID: POLICY-2378 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-04-15Fix sonar issueshuaxing1-4/+5
Issue-ID: POLICY-1913 Signed-off-by: huaxing <huaxing.jin@est.tech> Change-Id: Id1a9a6b6f7a9c8c74dd69bd0d30af05162a92cd1
2020-03-25Bump policy-apex-pdp to 2.3.1-SNAPSHOTa.sreekumar1-1/+1
Change-Id: I59b93fccb0f3a41f8db753d1e8e2978bbb51e9a0 Issue-ID: POLICY-2378 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-03-11Sonar Security vulnerabilities fixaditya.puthuparambil1-17/+14
Issue-ID: POLICY-1913 Signed-off-by: aditya.puthuparambil <aditya.puthuparambil@est.tech> Change-Id: Ic86e04776c9300e37134210cd9db5b6d7e6a5a9e
2020-02-26Fix Java 11/Checkstyle/Sonar warningsliamfallon4-78/+63
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-01-23Remove apex-pdp TextFileUtils classliamfallon1-28/+17
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 changesliamfallon1-2/+31
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>