diff options
25 files changed, 77 insertions, 39 deletions
diff --git a/applications/common/pom.xml b/applications/common/pom.xml index c4ddeb2b..bba2440e 100644 --- a/applications/common/pom.xml +++ b/applications/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>common</artifactId> diff --git a/applications/guard/pom.xml b/applications/guard/pom.xml index 658b28d6..1b3ba522 100644 --- a/applications/guard/pom.xml +++ b/applications/guard/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-guard</artifactId> diff --git a/applications/match/pom.xml b/applications/match/pom.xml index 6c8d793f..396236d8 100644 --- a/applications/match/pom.xml +++ b/applications/match/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-match</artifactId> diff --git a/applications/monitoring/pom.xml b/applications/monitoring/pom.xml index 91f44cae..beedf1b1 100644 --- a/applications/monitoring/pom.xml +++ b/applications/monitoring/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-monitoring</artifactId> diff --git a/applications/naming/pom.xml b/applications/naming/pom.xml index ac18c330..a7409019 100644 --- a/applications/naming/pom.xml +++ b/applications/naming/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-naming</artifactId> diff --git a/applications/native/pom.xml b/applications/native/pom.xml index 3522dc27..fa586d64 100644 --- a/applications/native/pom.xml +++ b/applications/native/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-native</artifactId> diff --git a/applications/optimization/pom.xml b/applications/optimization/pom.xml index 9134766d..50c4f043 100644 --- a/applications/optimization/pom.xml +++ b/applications/optimization/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-optimization</artifactId> diff --git a/applications/pom.xml b/applications/pom.xml index d57ab1a1..8f686a11 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> diff --git a/main/pom.xml b/main/pom.xml index a5df6928..05ef2140 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-main</artifactId> diff --git a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java index 550248b9..f774e022 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2024 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,15 +21,11 @@ package org.onap.policy.pdpx.main.rest; -import com.openpojo.reflection.filters.FilterClassName; -import com.openpojo.validation.Validator; -import com.openpojo.validation.ValidatorBuilder; -import com.openpojo.validation.rule.impl.GetterMustExistRule; -import com.openpojo.validation.rule.impl.SetterMustExistRule; -import com.openpojo.validation.test.impl.GetterTester; -import com.openpojo.validation.test.impl.SetterTester; -import org.junit.Test; -import org.onap.policy.common.utils.test.ToStringTester; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.onap.policy.pdpx.main.rest.model.StatisticsReport; /** @@ -37,11 +34,39 @@ import org.onap.policy.pdpx.main.rest.model.StatisticsReport; */ public class TestStatisticsReport { + static StatisticsReport report; + + @BeforeAll + static void setUp() { + report = new StatisticsReport(); + } + @Test - public void testStatisticsReport() { - final Validator validator = ValidatorBuilder.create().with(new ToStringTester()).with(new SetterMustExistRule()) - .with(new GetterMustExistRule()).with(new SetterTester()).with(new GetterTester()).build(); - validator.validate(StatisticsReport.class.getPackage().getName(), - new FilterClassName(StatisticsReport.class.getName())); + void testStatisticsReportConstructor() { + assertNotNull(report); + } + + @Test + void testGettersAndSetters() { + report.setCode(123); + report.setApplicationMetrics(null); + report.setDenyDecisionsCount(123456); + report.setDeployFailureCount(1111); + report.setDeploySuccessCount(2222); + report.setPermitDecisionsCount(3333); + report.setIndeterminantDecisionsCount(4444); + report.setNotApplicableDecisionsCount(5555); + report.setTotalErrorCount(6666); + report.setTotalPoliciesCount(7777); + report.setUndeployFailureCount(8888); + report.setUndeploySuccessCount(9999); + report.setTotalPolicyTypesCount(9898); + + assertThat(report.toString()).contains("code=123", "totalPolicyTypesCount=9898", + "totalPoliciesCount=7777", "totalErrorCount=6666", "permitDecisionsCount=3333", + "denyDecisionsCount=123456", "deploySuccessCount=2222", "deployFailureCount=1111", + "undeploySuccessCount=9999", "undeployFailureCount=8888", + "indeterminantDecisionsCount=4444", "notApplicableDecisionsCount=5555", + "applicationMetrics=null"); } } diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml index 899e656e..afe593f5 100644 --- a/packages/policy-xacmlpdp-docker/pom.xml +++ b/packages/policy-xacmlpdp-docker/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-packages</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <packaging>pom</packaging> diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile index 0660af68..02f6418f 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile +++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile @@ -25,7 +25,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-xacmlpdp.tar.gz /packages/ RUN tar xvzf /packages/policy-xacmlpdp.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:4.0.0-SNAPSHOT +FROM onap/policy-jre-alpine:4.0.1-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy XACML PDP" diff --git a/packages/policy-xacmlpdp-tarball/pom.xml b/packages/policy-xacmlpdp-tarball/pom.xml index 0cd60e96..9a685db2 100644 --- a/packages/policy-xacmlpdp-tarball/pom.xml +++ b/packages/policy-xacmlpdp-tarball/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-packages</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>policy-xacmlpdp-tarball</artifactId> diff --git a/packages/pom.xml b/packages/pom.xml index 3938636b..63a1e180 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-packages</artifactId> @@ -27,13 +27,13 @@ <parent> <groupId>org.onap.policy.parent</groupId> <artifactId>integration</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.0.1-SNAPSHOT</version> <relativePath /> </parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> <packaging>pom</packaging> @@ -41,8 +41,8 @@ <description>This code implements the XACML PDP engine</description> <properties> - <policy.common.version>3.0.0-SNAPSHOT</policy.common.version> - <policy.models.version>4.0.0-SNAPSHOT</policy.models.version> + <policy.common.version>3.0.1-SNAPSHOT</policy.common.version> + <policy.models.version>4.0.1-SNAPSHOT</policy.models.version> <jacoco.dataFile>${project.basedir}/target/code-coverage/jacoco-ut.exec</jacoco.dataFile> </properties> diff --git a/releases/4.0.0-container.yaml b/releases/4.0.0-container.yaml new file mode 100644 index 00000000..6fcafee2 --- /dev/null +++ b/releases/4.0.0-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '4.0.0' +project: 'policy-xacml-pdp' +log_dir: 'policy-xacml-pdp-maven-docker-stage-master/1410' +ref: 402334608f26590460b93557a1485d83bb8ac073 +containers: + - name: 'policy-xacml-pdp' + version: '4.0.0-20240712T1139' diff --git a/releases/4.0.0.yaml b/releases/4.0.0.yaml new file mode 100644 index 00000000..1e8722e5 --- /dev/null +++ b/releases/4.0.0.yaml @@ -0,0 +1,5 @@ +distribution_type: 'maven' +version: '4.0.0' +project: 'policy-xacml-pdp' +tag_release: false +log_dir: 'policy-xacml-pdp-maven-stage-master/1413/' diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml index 198602fd..19164dd8 100644 --- a/testsuites/performance/pom.xml +++ b/testsuites/performance/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-testsuites</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-performance</artifactId> <build> diff --git a/testsuites/pom.xml b/testsuites/pom.xml index f652a0d9..f6605b92 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-testsuites</artifactId> diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml index 63a67c6b..c660beee 100644 --- a/testsuites/stability/pom.xml +++ b/testsuites/stability/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-testsuites</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-stability</artifactId> <build> diff --git a/tutorials/pom.xml b/tutorials/pom.xml index de861381..7ca07970 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-tutorials</artifactId> diff --git a/tutorials/tutorial-enforcement/pom.xml b/tutorials/tutorial-enforcement/pom.xml index d33103dd..fa24f25a 100644 --- a/tutorials/tutorial-enforcement/pom.xml +++ b/tutorials/tutorial-enforcement/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-tutorials</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <groupId>org.onap.policy.tutorial</groupId> diff --git a/tutorials/tutorial-xacml-application/pom.xml b/tutorials/tutorial-xacml-application/pom.xml index 1d613c83..bf5f9396 100644 --- a/tutorials/tutorial-xacml-application/pom.xml +++ b/tutorials/tutorial-xacml-application/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>xacml-tutorials</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> </parent> <packaging>jar</packaging> diff --git a/version.properties b/version.properties index 19e0714b..bac52448 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=4 minor=0 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} diff --git a/xacml-test/pom.xml b/xacml-test/pom.xml index bfe47a66..f2131dfe 100644 --- a/xacml-test/pom.xml +++ b/xacml-test/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.xacml-pdp</groupId> <artifactId>policy-xacml-pdp</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> |