diff options
96 files changed, 360 insertions, 165 deletions
diff --git a/.gitreview b/.gitreview index 737fc8851..72623fb6f 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=gerrit.onap.org port=29418 project=policy/apex-pdp.git +defaultbranch=master diff --git a/auth/cli-codegen/pom.xml b/auth/cli-codegen/pom.xml index 52305ad5b..966e97803 100644 --- a/auth/cli-codegen/pom.xml +++ b/auth/cli-codegen/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.auth</groupId> <artifactId>auth</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>cli-codegen</artifactId> diff --git a/auth/cli-editor/pom.xml b/auth/cli-editor/pom.xml index 89d641544..49305966a 100644 --- a/auth/cli-editor/pom.xml +++ b/auth/cli-editor/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.auth</groupId> <artifactId>auth</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>cli-editor</artifactId> diff --git a/auth/pom.xml b/auth/pom.xml index 002fe980a..51454979c 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.auth</groupId> diff --git a/client/client-common/pom.xml b/client/client-common/pom.xml index 7009f5c65..b8013ca88 100644 --- a/client/client-common/pom.xml +++ b/client/client-common/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.client</groupId> <artifactId>client</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>client-common</artifactId> diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml index 118d0870f..b577e3913 100644 --- a/client/client-deployment/pom.xml +++ b/client/client-deployment/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.client</groupId> <artifactId>client</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>client-deployment</artifactId> diff --git a/client/client-editor/pom.xml b/client/client-editor/pom.xml index 88ffc0bf0..0ffd40a55 100644 --- a/client/client-editor/pom.xml +++ b/client/client-editor/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.client</groupId> <artifactId>client</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>client-editor</artifactId> diff --git a/client/client-full/pom.xml b/client/client-full/pom.xml index 56d00dc20..c5a53bb56 100644 --- a/client/client-full/pom.xml +++ b/client/client-full/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.client</groupId> <artifactId>client</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>client-full</artifactId> diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml index 1b1ef5aa9..5fd0676df 100644 --- a/client/client-monitoring/pom.xml +++ b/client/client-monitoring/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.client</groupId> <artifactId>client</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>client-monitoring</artifactId> diff --git a/client/pom.xml b/client/pom.xml index 8f7efb2ee..03b7e0eed 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.client</groupId> diff --git a/context/context-management/pom.xml b/context/context-management/pom.xml index ee93a1525..a4e6ae709 100644 --- a/context/context-management/pom.xml +++ b/context/context-management/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.context</groupId> <artifactId>context</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>context-management</artifactId> diff --git a/context/pom.xml b/context/pom.xml index 5d4e21c39..d622b997d 100644 --- a/context/pom.xml +++ b/context/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.context</groupId> diff --git a/core/core-deployment/pom.xml b/core/core-deployment/pom.xml index 6167d8218..72caf41af 100644 --- a/core/core-deployment/pom.xml +++ b/core/core-deployment/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.core</groupId> <artifactId>core</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>core-deployment</artifactId> diff --git a/core/core-engine/pom.xml b/core/core-engine/pom.xml index 2344c961f..fff6d528c 100644 --- a/core/core-engine/pom.xml +++ b/core/core-engine/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.core</groupId> <artifactId>core</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>core-engine</artifactId> diff --git a/core/core-infrastructure/pom.xml b/core/core-infrastructure/pom.xml index a0e7059ba..c96b10e90 100644 --- a/core/core-infrastructure/pom.xml +++ b/core/core-infrastructure/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.core</groupId> <artifactId>core</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>core-infrastructure</artifactId> diff --git a/core/core-protocols/pom.xml b/core/core-protocols/pom.xml index b23b6b933..38005e726 100644 --- a/core/core-protocols/pom.xml +++ b/core/core-protocols/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.core</groupId> <artifactId>core</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>core-protocols</artifactId> diff --git a/core/pom.xml b/core/pom.xml index b80ca078f..c6f74e974 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.core</groupId> diff --git a/examples/examples-aadm/pom.xml b/examples/examples-aadm/pom.xml index 6d28000c3..0abad0e87 100644 --- a/examples/examples-aadm/pom.xml +++ b/examples/examples-aadm/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.examples</groupId> <artifactId>examples</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>examples-aadm</artifactId> diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml index d0268cc69..63aaecd8b 100644 --- a/examples/examples-adaptive/pom.xml +++ b/examples/examples-adaptive/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.examples</groupId> <artifactId>examples</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>examples-adaptive</artifactId> diff --git a/examples/examples-decisionmaker/pom.xml b/examples/examples-decisionmaker/pom.xml index 9ba6c173c..9384a0963 100644 --- a/examples/examples-decisionmaker/pom.xml +++ b/examples/examples-decisionmaker/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.examples</groupId> <artifactId>examples</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>examples-decisionmaker</artifactId> diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml index cb4d43f32..0e3424120 100644 --- a/examples/examples-myfirstpolicy/pom.xml +++ b/examples/examples-myfirstpolicy/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.examples</groupId> <artifactId>examples</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>examples-myfirstpolicy</artifactId> diff --git a/examples/examples-onap-bbs/pom.xml b/examples/examples-onap-bbs/pom.xml index 551e34bbf..e5591ffc5 100644 --- a/examples/examples-onap-bbs/pom.xml +++ b/examples/examples-onap-bbs/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.examples</groupId> <artifactId>examples</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>examples-onap-bbs</artifactId> diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml index f688d3f43..89d688dca 100644 --- a/examples/examples-onap-vcpe/pom.xml +++ b/examples/examples-onap-vcpe/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.examples</groupId> <artifactId>examples</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>examples-onap-vcpe</artifactId> diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml index 3d41c8288..720ebf7a9 100644 --- a/examples/examples-pcvs/pom.xml +++ b/examples/examples-pcvs/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.examples</groupId> <artifactId>examples</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>examples-pcvs</artifactId> diff --git a/examples/examples-periodic/pom.xml b/examples/examples-periodic/pom.xml index b74f5a1c8..6fa29dc45 100644 --- a/examples/examples-periodic/pom.xml +++ b/examples/examples-periodic/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.examples</groupId> <artifactId>examples</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>examples-periodic</artifactId> diff --git a/examples/examples-servlet/pom.xml b/examples/examples-servlet/pom.xml index d22628fe3..68ac3e56f 100644 --- a/examples/examples-servlet/pom.xml +++ b/examples/examples-servlet/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.examples</groupId> <artifactId>examples</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>examples-servlet</artifactId> diff --git a/examples/pom.xml b/examples/pom.xml index 09f8c6f45..db2f34047 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.examples</groupId> diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml index 0cd481434..20254afb7 100644 --- a/model/basic-model/pom.xml +++ b/model/basic-model/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.model</groupId> <artifactId>model</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>basic-model</artifactId> diff --git a/model/context-model/pom.xml b/model/context-model/pom.xml index f31450725..a0b1909b6 100644 --- a/model/context-model/pom.xml +++ b/model/context-model/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.model</groupId> <artifactId>model</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>context-model</artifactId> diff --git a/model/engine-model/pom.xml b/model/engine-model/pom.xml index 9c903867e..72ed92816 100644 --- a/model/engine-model/pom.xml +++ b/model/engine-model/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.model</groupId> <artifactId>model</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>engine-model</artifactId> diff --git a/model/event-model/pom.xml b/model/event-model/pom.xml index d342cf106..ffce6620a 100644 --- a/model/event-model/pom.xml +++ b/model/event-model/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.model</groupId> <artifactId>model</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>event-model</artifactId> diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml index 188041a04..2a520ff20 100644 --- a/model/model-api/pom.xml +++ b/model/model-api/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.model</groupId> <artifactId>model</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>model-api</artifactId> diff --git a/model/policy-model/pom.xml b/model/policy-model/pom.xml index 275d4aed4..b0708ae1e 100644 --- a/model/policy-model/pom.xml +++ b/model/policy-model/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.model</groupId> <artifactId>model</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>policy-model</artifactId> diff --git a/model/pom.xml b/model/pom.xml index e172c4656..1f1386c0a 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.model</groupId> diff --git a/model/utilities/pom.xml b/model/utilities/pom.xml index a9537a3b6..801174524 100644 --- a/model/utilities/pom.xml +++ b/model/utilities/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.model</groupId> <artifactId>model</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>utilities</artifactId> diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml index 3050bdef8..f243f7a6e 100644 --- a/packages/apex-pdp-docker/pom.xml +++ b/packages/apex-pdp-docker/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.packages</groupId> <artifactId>packages</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>apex-pdp-docker</artifactId> diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml index 2e015ba25..b9b0613d6 100644 --- a/packages/apex-pdp-package-full/pom.xml +++ b/packages/apex-pdp-package-full/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.packages</groupId> <artifactId>packages</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>apex-pdp-package-full</artifactId> diff --git a/packages/pom.xml b/packages/pom.xml index e20664bdb..bd1c27c57 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.packages</groupId> diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml index 98345b525..a35f2c49f 100644 --- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId> <artifactId>plugins-context-distribution</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-context-distribution-hazelcast</artifactId> diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml index 3af217468..b173fb345 100644 --- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId> <artifactId>plugins-context-distribution</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-context-distribution-infinispan</artifactId> diff --git a/plugins/plugins-context/plugins-context-distribution/pom.xml b/plugins/plugins-context/plugins-context-distribution/pom.xml index 99d39a321..3ef613761 100644 --- a/plugins/plugins-context/plugins-context-distribution/pom.xml +++ b/plugins/plugins-context/plugins-context-distribution/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId> <artifactId>plugins-context</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId> diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml index 26c96ab56..e1f23e641 100644 --- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId> <artifactId>plugins-context-locking</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-context-locking-curator</artifactId> diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml index e0f38008a..f3b7d5b82 100644 --- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId> <artifactId>plugins-context-locking</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-context-locking-hazelcast</artifactId> diff --git a/plugins/plugins-context/plugins-context-locking/pom.xml b/plugins/plugins-context/plugins-context-locking/pom.xml index 07db40014..94bca7e3b 100644 --- a/plugins/plugins-context/plugins-context-locking/pom.xml +++ b/plugins/plugins-context/plugins-context-locking/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId> <artifactId>plugins-context</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId> diff --git a/plugins/plugins-context/plugins-context-persistence/pom.xml b/plugins/plugins-context/plugins-context-persistence/pom.xml index ebf362b74..b50049e6b 100644 --- a/plugins/plugins-context/plugins-context-persistence/pom.xml +++ b/plugins/plugins-context/plugins-context-persistence/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId> <artifactId>plugins-context</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-persistence</groupId> diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml index ae1ca7172..3b2a26f98 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId> <artifactId>plugins-context-schema</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-context-schema-avro</artifactId> diff --git a/plugins/plugins-context/plugins-context-schema/pom.xml b/plugins/plugins-context/plugins-context-schema/pom.xml index 510b5f49a..fd07dec04 100644 --- a/plugins/plugins-context/plugins-context-schema/pom.xml +++ b/plugins/plugins-context/plugins-context-schema/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId> <artifactId>plugins-context</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId> diff --git a/plugins/plugins-context/pom.xml b/plugins/plugins-context/pom.xml index c6cac81e0..cc3d8a2c2 100644 --- a/plugins/plugins-context/pom.xml +++ b/plugins/plugins-context/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins</groupId> <artifactId>plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId> diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml index f2e467269..9a738a5e5 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId> <artifactId>plugins-event-carrier</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-event-carrier-jms</artifactId> diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml index 1a9ffb590..5acb08ab0 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId> <artifactId>plugins-event-carrier</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-event-carrier-kafka</artifactId> diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml index 4c91c265b..81c85ee90 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId> <artifactId>plugins-event-carrier</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-event-carrier-restclient</artifactId> diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml index 4876be13e..f56cfd2ac 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId> <artifactId>plugins-event-carrier</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-event-carrier-restrequestor</artifactId> diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml index 4233c1973..458b7f025 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId> <artifactId>plugins-event-carrier</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-event-carrier-restserver</artifactId> @@ -50,6 +50,11 @@ <artifactId>jersey-container-servlet-core</artifactId> <version>${version.jersey}</version> </dependency> + <dependency> + <groupId>org.onap.policy.common</groupId> + <artifactId>policy-endpoints</artifactId> + <version>${version.policy.common}</version> + </dependency> </dependencies> <profiles> diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerAafFilter.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerAafFilter.java new file mode 100644 index 000000000..2c38cb489 --- /dev/null +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerAafFilter.java @@ -0,0 +1,39 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.event.carrier.restserver; + +import org.onap.policy.common.endpoints.http.server.aaf.AafGranularAuthFilter; + +/** + * Class to manage aaf filters for Apex Rest Server. + * + * @author Ajith Sreekumar (ajith.sreekumar@est.tech) + */ +public class ApexRestServerAafFilter extends AafGranularAuthFilter { + + public static final String AAF_NODETYPE = "apex-rest-server"; + public static final String AAF_ROOT_PERMISSION = DEFAULT_NAMESPACE + "." + AAF_NODETYPE; + + @Override + public String getPermissionTypeRoot() { + return AAF_ROOT_PERMISSION; + } +} diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumer.java index a8c508659..c8a07f234 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumer.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 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,17 +21,11 @@ package org.onap.policy.apex.plugins.event.carrier.restserver; -import java.net.URI; import java.util.EnumMap; import java.util.Map; import java.util.Properties; import java.util.concurrent.atomic.AtomicLong; - import javax.ws.rs.core.Response; - -import org.glassfish.grizzly.http.server.HttpServer; -import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; -import org.glassfish.jersey.server.ResourceConfig; import org.onap.policy.apex.core.infrastructure.threading.ApplicationThreadFactory; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; import org.onap.policy.apex.service.engine.event.ApexEventConsumer; @@ -40,6 +35,9 @@ import org.onap.policy.apex.service.engine.event.PeeredReference; import org.onap.policy.apex.service.engine.event.SynchronousEventCache; import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters; import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode; +import org.onap.policy.common.endpoints.http.server.HttpServletServer; +import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance; +import org.onap.policy.common.gson.GsonMessageBodyHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,8 +50,6 @@ public class ApexRestServerConsumer implements ApexEventConsumer, Runnable { // Get a reference to the logger private static final Logger LOGGER = LoggerFactory.getLogger(ApexRestServerConsumer.class); - private static final String BASE_URI_TEMPLATE = "http://%s:%d/apex"; - // The amount of time to wait in milliseconds between checks that the consumer thread has stopped private static final long REST_SERVER_CONSUMER_WAIT_SLEEP_TIME = 50; @@ -71,7 +67,7 @@ public class ApexRestServerConsumer implements ApexEventConsumer, Runnable { private boolean stopOrderedFlag = false; // The local HTTP server to use for REST call reception if we are running a local Grizzly server - private HttpServer server; + private HttpServletServer server; // Holds the next identifier for event execution. private static AtomicLong nextExecutionID = new AtomicLong(0L); @@ -126,15 +122,11 @@ public class ApexRestServerConsumer implements ApexEventConsumer, Runnable { throw new ApexEventException(errorMessage); } - // Compose the URI for the standalone server - final String baseUrl = String.format(BASE_URI_TEMPLATE, restConsumerProperties.getHost(), - restConsumerProperties.getPort()); - // Instantiate the standalone server - final ResourceConfig rc = new ResourceConfig(RestServerEndpoint.class, AccessControlFilter.class); - server = GrizzlyHttpServerFactory.createHttpServer(URI.create(baseUrl), rc); - - while (!server.isStarted()) { + LOGGER.info("Creating the Apex Rest Server"); + createServer(restConsumerProperties); + server.start(); + while (!server.isAlive()) { ThreadUtilities.sleep(REST_SERVER_CONSUMER_WAIT_SLEEP_TIME); } } @@ -143,6 +135,26 @@ public class ApexRestServerConsumer implements ApexEventConsumer, Runnable { RestServerEndpoint.registerApexRestServerConsumer(this.name, this); } + private void createServer(RestServerCarrierTechnologyParameters restConsumerProperties) { + + server = HttpServletServerFactoryInstance.getServerFactory().build( + restConsumerProperties.getName(), + restConsumerProperties.isHttps(), + restConsumerProperties.getHost(), + restConsumerProperties.getPort(), null, true, false); + if (restConsumerProperties.isAaf()) { + server.addFilterClass(null, ApexRestServerAafFilter.class.getName()); + } + server.addServletClass(null, RestServerEndpoint.class.getName()); + server.addServletClass(null, AccessControlFilter.class.getName()); + server.setSerializationProvider(GsonMessageBodyHandler.class.getName()); + if (null != restConsumerProperties.getUserName() + && null != restConsumerProperties.getPassword()) { + server.setBasicAuthentication(restConsumerProperties.getUserName(), + restConsumerProperties.getPassword(), null); + } + } + /** * {@inheritDoc}. */ @@ -262,5 +274,8 @@ public class ApexRestServerConsumer implements ApexEventConsumer, Runnable { while (consumerThread.isAlive()) { ThreadUtilities.sleep(REST_SERVER_CONSUMER_WAIT_SLEEP_TIME); } + if (server != null) { + server.stop(); + } } } diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParameters.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParameters.java index 9a98588a5..42613bcf8 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParameters.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParameters.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 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,6 +21,7 @@ package org.onap.policy.apex.plugins.event.carrier.restserver; +import lombok.Getter; import org.onap.policy.apex.service.parameters.carriertechnology.CarrierTechnologyParameters; import org.onap.policy.common.parameters.GroupValidationResult; import org.onap.policy.common.parameters.ValidationStatus; @@ -40,6 +42,7 @@ import org.onap.policy.common.parameters.ValidationStatus; * * @author Liam Fallon (liam.fallon@ericsson.com) */ +@Getter public class RestServerCarrierTechnologyParameters extends CarrierTechnologyParameters { // @formatter:off private static final int MIN_USER_PORT = 1024; @@ -58,6 +61,10 @@ public class RestServerCarrierTechnologyParameters extends CarrierTechnologyPara private boolean standalone = false; private String host = null; private int port = -1; + private String userName; + private String password; + private boolean https; + private boolean aaf; // @formatter:on /** @@ -74,34 +81,6 @@ public class RestServerCarrierTechnologyParameters extends CarrierTechnologyPara } /** - * Check if the REST server is running in standalone mode or is using an underlying servlet infrastructure to manage - * requests. - * - * @return true if in standalone mode - */ - public boolean isStandalone() { - return standalone; - } - - /** - * Gets the host. - * - * @return the host - */ - public String getHost() { - return host; - } - - /** - * Gets the port. - * - * @return the port - */ - public int getPort() { - return port; - } - - /** * {@inheritDoc}. */ @Override diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerEndpoint.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerEndpoint.java index ca2d797b9..c4354918f 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerEndpoint.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerEndpoint.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 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,9 +21,19 @@ package org.onap.policy.apex.plugins.event.carrier.restserver; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; +import io.swagger.annotations.BasicAuthDefinition; +import io.swagger.annotations.Info; +import io.swagger.annotations.SecurityDefinition; +import io.swagger.annotations.SwaggerDefinition; +import io.swagger.annotations.Tag; +import java.net.HttpURLConnection; import java.util.LinkedHashMap; import java.util.Map; - import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -32,7 +43,6 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,15 +52,35 @@ import org.slf4j.LoggerFactory; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -@Path("/{eventInput}") +@Path("/apex/{eventInput}") +@Api(value = "APEX REST SERVER API") @Produces( { MediaType.APPLICATION_JSON }) @Consumes( { MediaType.APPLICATION_JSON }) +@SwaggerDefinition( + info = @Info(description = + "APEX RestServer that handles REST requests and responses to and from Apex.", version = "v1.0", + title = "APEX RESTSERVER"), + consumes = {MediaType.APPLICATION_JSON}, + produces = {MediaType.APPLICATION_JSON}, + schemes = {SwaggerDefinition.Scheme.HTTP, SwaggerDefinition.Scheme.HTTPS}, + tags = {@Tag(name = "APEX RESTSERVER", description = "APEX RESTSERVER")}, + securityDefinition = @SecurityDefinition(basicAuthDefinitions = {@BasicAuthDefinition(key = "basicAuth")})) public class RestServerEndpoint { // Get a reference to the logger private static final Logger LOGGER = LoggerFactory.getLogger(RestServerEndpoint.class); + public static final String AUTHORIZATION_TYPE = "basicAuth"; + + public static final int AUTHENTICATION_ERROR_CODE = HttpURLConnection.HTTP_UNAUTHORIZED; + public static final int AUTHORIZATION_ERROR_CODE = HttpURLConnection.HTTP_FORBIDDEN; + public static final int SERVER_ERROR_CODE = HttpURLConnection.HTTP_INTERNAL_ERROR; + + public static final String AUTHENTICATION_ERROR_MESSAGE = "Authentication Error"; + public static final String AUTHORIZATION_ERROR_MESSAGE = "Authorization Error"; + public static final String SERVER_ERROR_MESSAGE = "Internal Server Error"; + // Statistics on the amount of HTTP messages handled private static int getMessagesReceived = 0; private static int postEventMessagesReceived = 0; @@ -82,6 +112,14 @@ public class RestServerEndpoint { */ @Path("/Status") @GET + @ApiOperation( + value = "Get Statistics", + notes = "Get statistics on apex REST event handlin", + authorizations = @Authorization(value = AUTHORIZATION_TYPE)) + @ApiResponses( + value = {@ApiResponse(code = AUTHENTICATION_ERROR_CODE, message = AUTHENTICATION_ERROR_MESSAGE), + @ApiResponse(code = AUTHORIZATION_ERROR_CODE, message = AUTHORIZATION_ERROR_MESSAGE), + @ApiResponse(code = SERVER_ERROR_CODE, message = SERVER_ERROR_MESSAGE)}) public Response serviceGetStats() { incrementGetMessages(); return Response.status(Response.Status.OK.getStatusCode()) @@ -92,13 +130,21 @@ public class RestServerEndpoint { } /** - * Service post request, an incoming event over RETS to Apex. + * Service post request, an incoming event over REST to Apex. * * @param jsonString the JSON string containing the data coming in on the REST call * @return the response event to the request */ @Path("/EventIn") @POST + @ApiOperation( + value = "Post Event", + notes = "Service post request, an incoming event over REST to Apex", + authorizations = @Authorization(value = AUTHORIZATION_TYPE)) + @ApiResponses( + value = {@ApiResponse(code = AUTHENTICATION_ERROR_CODE, message = AUTHENTICATION_ERROR_MESSAGE), + @ApiResponse(code = AUTHORIZATION_ERROR_CODE, message = AUTHORIZATION_ERROR_MESSAGE), + @ApiResponse(code = SERVER_ERROR_CODE, message = SERVER_ERROR_MESSAGE)}) public Response servicePostRequest(final String jsonString) { incrementPostEventMessages(); @@ -112,13 +158,21 @@ public class RestServerEndpoint { } /** - * Service put request, an incoming event over RETS to Apex. + * Service put request, an incoming event over REST to Apex. * * @param jsonString the JSON string containing the data coming in on the REST call * @return the response event to the request */ @Path("/EventIn") @PUT + @ApiOperation( + value = "Put Event", + notes = "Service put request, an incoming event over REST to Apex", + authorizations = @Authorization(value = AUTHORIZATION_TYPE)) + @ApiResponses( + value = {@ApiResponse(code = AUTHENTICATION_ERROR_CODE, message = AUTHENTICATION_ERROR_MESSAGE), + @ApiResponse(code = AUTHORIZATION_ERROR_CODE, message = AUTHORIZATION_ERROR_MESSAGE), + @ApiResponse(code = SERVER_ERROR_CODE, message = SERVER_ERROR_MESSAGE)}) public Response servicePutRequest(final String jsonString) { incrementPutEventMessages(); diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumerTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumerTest.java index 02daed02e..07f705cc6 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumerTest.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumerTest.java @@ -93,7 +93,7 @@ public class ApexRestServerConsumerTest { incomingEventReceiver); } - @Test(expected = IllegalStateException.class) + @Test(expected = IllegalArgumentException.class) public void testInitWithSynchronousModeAndProperValues() throws ApexEventException, NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParametersTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParametersTest.java index dbe20c960..2c8a764e8 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParametersTest.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParametersTest.java @@ -86,4 +86,65 @@ public class RestServerCarrierTechnologyParametersTest { assertFalse(result.isValid()); } + @Test + public void testValidateWithValidValues() throws NoSuchFieldException, SecurityException, + IllegalArgumentException, IllegalAccessException { + + Field field = RestServerCarrierTechnologyParameters.class.getDeclaredField("standalone"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, true); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("host"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, "localhost"); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("port"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, 6969); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("userName"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, "username"); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("password"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, "password"); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("https"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, true); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("aaf"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, true); + result = restServerCarrierTechnologyParameters.validate(); + assertNotNull(result); + assertTrue(result.isValid()); + } + + @Test + public void testValidateWithInvalidValues() throws NoSuchFieldException, SecurityException, + IllegalArgumentException, IllegalAccessException { + + Field field = RestServerCarrierTechnologyParameters.class.getDeclaredField("standalone"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, false); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("host"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, "localhost"); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("port"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, 6969); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("userName"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, "username"); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("password"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, "password"); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("https"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, true); + field = RestServerCarrierTechnologyParameters.class.getDeclaredField("aaf"); + field.setAccessible(true); + field.set(restServerCarrierTechnologyParameters, true); + result = restServerCarrierTechnologyParameters.validate(); + assertNotNull(result); + assertFalse(result.isValid()); + assertTrue(result.getResult().contains("host is specified only in standalone mode")); + assertTrue(result.getResult().contains("port is specified only in standalone mode")); + } } diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml index 868eda2f3..ba95247f4 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId> <artifactId>plugins-event-carrier</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-event-carrier-websocket</artifactId> diff --git a/plugins/plugins-event/plugins-event-carrier/pom.xml b/plugins/plugins-event/plugins-event-carrier/pom.xml index 40cb0e016..cd48929d3 100644 --- a/plugins/plugins-event/plugins-event-carrier/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId> <artifactId>plugins-event</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId> diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml index 47e5b8e9d..c1ea5b6bd 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId> <artifactId>plugins-event-protocol</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-event-protocol-jms</artifactId> diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml index 8349628b0..0ae99a5e4 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId> <artifactId>plugins-event-protocol</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-event-protocol-xml</artifactId> diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml index d563fb438..7857ef562 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId> <artifactId>plugins-event-protocol</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-event-protocol-yaml</artifactId> diff --git a/plugins/plugins-event/plugins-event-protocol/pom.xml b/plugins/plugins-event/plugins-event-protocol/pom.xml index 42ae5e45e..6532fef75 100644 --- a/plugins/plugins-event/plugins-event-protocol/pom.xml +++ b/plugins/plugins-event/plugins-event-protocol/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId> <artifactId>plugins-event</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId> diff --git a/plugins/plugins-event/pom.xml b/plugins/plugins-event/pom.xml index d4ed09920..89593b93d 100644 --- a/plugins/plugins-event/pom.xml +++ b/plugins/plugins-event/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins</groupId> <artifactId>plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId> diff --git a/plugins/plugins-executor/plugins-executor-java/pom.xml b/plugins/plugins-executor/plugins-executor-java/pom.xml index 5f711a704..288f01723 100644 --- a/plugins/plugins-executor/plugins-executor-java/pom.xml +++ b/plugins/plugins-executor/plugins-executor-java/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId> <artifactId>plugins-executor</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-executor-java</artifactId> diff --git a/plugins/plugins-executor/plugins-executor-javascript/pom.xml b/plugins/plugins-executor/plugins-executor-javascript/pom.xml index a565068b2..390b803d4 100644 --- a/plugins/plugins-executor/plugins-executor-javascript/pom.xml +++ b/plugins/plugins-executor/plugins-executor-javascript/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId> <artifactId>plugins-executor</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-executor-javascript</artifactId> diff --git a/plugins/plugins-executor/plugins-executor-jruby/pom.xml b/plugins/plugins-executor/plugins-executor-jruby/pom.xml index 1966384c5..72fd8cccf 100644 --- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml +++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId> <artifactId>plugins-executor</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-executor-jruby</artifactId> diff --git a/plugins/plugins-executor/plugins-executor-jython/pom.xml b/plugins/plugins-executor/plugins-executor-jython/pom.xml index b32ea76da..9c92b67cd 100644 --- a/plugins/plugins-executor/plugins-executor-jython/pom.xml +++ b/plugins/plugins-executor/plugins-executor-jython/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId> <artifactId>plugins-executor</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-executor-jython</artifactId> diff --git a/plugins/plugins-executor/plugins-executor-mvel/pom.xml b/plugins/plugins-executor/plugins-executor-mvel/pom.xml index 016a62181..dd3b39295 100644 --- a/plugins/plugins-executor/plugins-executor-mvel/pom.xml +++ b/plugins/plugins-executor/plugins-executor-mvel/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId> <artifactId>plugins-executor</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-executor-mvel</artifactId> diff --git a/plugins/plugins-executor/pom.xml b/plugins/plugins-executor/pom.xml index 8961053de..711bd0f03 100644 --- a/plugins/plugins-executor/pom.xml +++ b/plugins/plugins-executor/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins</groupId> <artifactId>plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId> diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml index b7c0f5140..dbe19ee02 100644 --- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml +++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa</groupId> <artifactId>plugins-persistence-jpa</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>plugins-persistence-jpa-eclipselink</artifactId> <name>${project.artifactId}</name> diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml index cb9f2a005..3002f0ac7 100644 --- a/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml +++ b/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence</groupId> <artifactId>plugins-persistence</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa</groupId> diff --git a/plugins/plugins-persistence/pom.xml b/plugins/plugins-persistence/pom.xml index 84c91c11a..389b59552 100644 --- a/plugins/plugins-persistence/pom.xml +++ b/plugins/plugins-persistence/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.plugins</groupId> <artifactId>plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence</groupId> diff --git a/plugins/pom.xml b/plugins/pom.xml index 15c1562ca..a0a7f8c7b 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.plugins</groupId> @@ -26,13 +26,13 @@ <parent> <groupId>org.onap.policy.parent</groupId> <artifactId>integration</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1</version> <relativePath /> </parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>policy-apex-pdp</name> @@ -45,8 +45,8 @@ <version.kafka>2.3.0</version.kafka> <version.jersey>2.26</version.jersey> <version.hibernate>5.3.7.Final</version.hibernate> - <version.policy.common>1.5.2-SNAPSHOT</version.policy.common> - <version.policy.models>2.1.3-SNAPSHOT</version.policy.models> + <version.policy.common>1.5.2</version.policy.common> + <version.policy.models>2.1.3</version.policy.models> <!-- sonar/jacoco overrides --> <!-- Overriding oparent default sonar/jacoco settings Combine all our reports into one file shared across sub-modules --> diff --git a/releases/2.2.2.yaml b/releases/2.2.2.yaml new file mode 100644 index 000000000..46ea0f0ff --- /dev/null +++ b/releases/2.2.2.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '2.2.2' +project: 'policy-apex-pdp' +log_dir: 'policy-apex-pdp-maven-stage-master/78/' diff --git a/services/pom.xml b/services/pom.xml index e4d4638b1..fd782eb0d 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.services</groupId> diff --git a/services/services-engine/pom.xml b/services/services-engine/pom.xml index 90adb1f06..0fafa09e6 100644 --- a/services/services-engine/pom.xml +++ b/services/services-engine/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.services</groupId> <artifactId>services</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>services-engine</artifactId> diff --git a/services/services-onappf/pom.xml b/services/services-onappf/pom.xml index 57814710b..fb510bdb0 100644 --- a/services/services-onappf/pom.xml +++ b/services/services-onappf/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.services</groupId> <artifactId>services</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>services-onappf</artifactId> diff --git a/testsuites/apex-pdp-stability/pom.xml b/testsuites/apex-pdp-stability/pom.xml index 34691e88f..25ddfc692 100644 --- a/testsuites/apex-pdp-stability/pom.xml +++ b/testsuites/apex-pdp-stability/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.testsuites</groupId> <artifactId>testsuites</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.testsuites.stability</groupId> diff --git a/testsuites/integration/integration-common/pom.xml b/testsuites/integration/integration-common/pom.xml index 7b2edefeb..942c5f267 100644 --- a/testsuites/integration/integration-common/pom.xml +++ b/testsuites/integration/integration-common/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId> <artifactId>integration</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>integration-common</artifactId> diff --git a/testsuites/integration/integration-context-test/pom.xml b/testsuites/integration/integration-context-test/pom.xml index 5500e60b6..51787a0a2 100644 --- a/testsuites/integration/integration-context-test/pom.xml +++ b/testsuites/integration/integration-context-test/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId> <artifactId>integration</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>integration-context-test</artifactId> diff --git a/testsuites/integration/integration-executor-test/pom.xml b/testsuites/integration/integration-executor-test/pom.xml index ee759135c..bca011612 100644 --- a/testsuites/integration/integration-executor-test/pom.xml +++ b/testsuites/integration/integration-executor-test/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId> <artifactId>integration</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>integration-executor-test</artifactId> diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml index 34fb2a9a9..73814306c 100644 --- a/testsuites/integration/integration-uservice-test/pom.xml +++ b/testsuites/integration/integration-uservice-test/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId> <artifactId>integration</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>integration-uservice-test</artifactId> diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restserver/TestRestServer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restserver/TestRestServer.java index 5514caab6..98eebf50e 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restserver/TestRestServer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restserver/TestRestServer.java @@ -1,19 +1,20 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -24,24 +25,22 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import com.google.gson.Gson; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; import java.util.Map; import java.util.Random; - import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Entity; import javax.ws.rs.core.Response; - import org.junit.Before; import org.junit.Test; import org.onap.policy.apex.core.infrastructure.messaging.MessagingException; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.service.engine.main.ApexMain; +import org.onap.policy.common.utils.network.NetworkUtil; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; @@ -73,16 +72,19 @@ public class TestRestServer { * @throws MessagingException the messaging exception * @throws ApexException the apex exception * @throws IOException Signals that an I/O exception has occurred. + * @throws InterruptedException interrupted exception */ @SuppressWarnings("unchecked") @Test - public void testRestServerPut() throws MessagingException, ApexException, IOException { - LOGGER.info("testRestServerPut start"); + public void testRestServerPut() throws MessagingException, ApexException, IOException, InterruptedException { + LOGGER.debug("testRestServerPut start"); final String[] args = { "-rfr", "target", "-c", "target/examples/config/SampleDomain/RESTServerJsonEvent.json" }; final ApexMain apexMain = new ApexMain(args); - + if (!NetworkUtil.isTcpPortOpen("localhost", 23324, 60, 500L)) { + throw new IllegalStateException("cannot connect to Apex Rest Server"); + } final Client client = ClientBuilder.newClient(); Response response = null; @@ -106,7 +108,7 @@ public class TestRestServer { assertEquals(Response.Status.OK.getStatusCode(), response.getStatus()); assertEquals("org.onap.policy.apex.sample.events", jsonMap.get("nameSpace")); assertEquals("Test slogan for External Event0", jsonMap.get("TestSlogan")); - LOGGER.info("testRestServerPut end"); + LOGGER.debug("testRestServerPut end"); } /** @@ -115,14 +117,18 @@ public class TestRestServer { * @throws MessagingException the messaging exception * @throws ApexException the apex exception * @throws IOException Signals that an I/O exception has occurred. + * @throws InterruptedException interrupted exception */ @SuppressWarnings("unchecked") @Test - public void testRestServerPost() throws MessagingException, ApexException, IOException { + public void testRestServerPost() throws MessagingException, ApexException, IOException, InterruptedException { + LOGGER.debug("testRestServerPost start"); final String[] args = { "-rfr", "target", "-c", "target/examples/config/SampleDomain/RESTServerJsonEvent.json" }; final ApexMain apexMain = new ApexMain(args); - + if (!NetworkUtil.isTcpPortOpen("localhost", 23324, 60, 500L)) { + throw new IllegalStateException("cannot connect to Apex Rest Server"); + } final Client client = ClientBuilder.newClient(); Response response = null; @@ -146,6 +152,7 @@ public class TestRestServer { assertEquals(Response.Status.OK.getStatusCode(), response.getStatus()); assertEquals("org.onap.policy.apex.sample.events", jsonMap.get("nameSpace")); assertEquals("Test slogan for External Event0", jsonMap.get("TestSlogan")); + LOGGER.debug("testRestServerPost end"); } /** @@ -154,13 +161,17 @@ public class TestRestServer { * @throws MessagingException the messaging exception * @throws ApexException the apex exception * @throws IOException Signals that an I/O exception has occurred. + * @throws InterruptedException interrupted exception */ @Test - public void testRestServerGetStatus() throws MessagingException, ApexException, IOException { + public void testRestServerGetStatus() throws MessagingException, ApexException, IOException, InterruptedException { + LOGGER.debug("testRestServerGetStatus start"); final String[] args = { "-rfr", "target", "-c", "target/examples/config/SampleDomain/RESTServerJsonEvent.json" }; final ApexMain apexMain = new ApexMain(args); - + if (!NetworkUtil.isTcpPortOpen("localhost", 23324, 60, 500L)) { + throw new IllegalStateException("cannot connect to Apex Rest Server"); + } final Client client = ClientBuilder.newClient(); Response postResponse = null; @@ -198,7 +209,7 @@ public class TestRestServer { assertEquals(1.0, jsonMap.get("STAT")); assertTrue((double) jsonMap.get("POST") >= 10.0); assertTrue((double) jsonMap.get("PUT") >= 10.0); - + LOGGER.debug("testRestServerGetStatus end"); } /** @@ -207,14 +218,19 @@ public class TestRestServer { * @throws MessagingException the messaging exception * @throws ApexException the apex exception * @throws IOException Signals that an I/O exception has occurred. + * @throws InterruptedException interrupted exception */ @SuppressWarnings("unchecked") @Test - public void testRestServerMultiInputs() throws MessagingException, ApexException, IOException { + public void testRestServerMultiInputs() + throws MessagingException, ApexException, IOException, InterruptedException { + LOGGER.debug("testRestServerMultiInputs start"); final String[] args = { "-rfr", "target", "-c", "target/examples/config/SampleDomain/RESTServerJsonEventMultiIn.json" }; final ApexMain apexMain = new ApexMain(args); - + if (!NetworkUtil.isTcpPortOpen("localhost", 23324, 60, 500L)) { + throw new IllegalStateException("cannot connect to Apex Rest Server"); + } final Client client = ClientBuilder.newClient(); Response firstResponse = null; @@ -230,12 +246,12 @@ public class TestRestServer { if (Response.Status.OK.getStatusCode() != firstResponse.getStatus()) { break; } - + final String firstResponseString = firstResponse.readEntity(String.class); firstJsonMap = new Gson().fromJson(firstResponseString, Map.class); - secondResponse = client.target("http://localhost:23324/apex/SecondConsumer/EventIn") + secondResponse = client.target("http://localhost:23325/apex/SecondConsumer/EventIn") .request("application/json").post(Entity.json(getEvent())); if (Response.Status.OK.getStatusCode() != secondResponse.getStatus()) { @@ -252,10 +268,11 @@ public class TestRestServer { assertEquals(Response.Status.OK.getStatusCode(), firstResponse.getStatus()); assertEquals("org.onap.policy.apex.sample.events", firstJsonMap.get("nameSpace")); assertEquals("Test slogan for External Event0", firstJsonMap.get("TestSlogan")); - + assertEquals(Response.Status.OK.getStatusCode(), secondResponse.getStatus()); assertEquals("org.onap.policy.apex.sample.events", secondJsonMap.get("nameSpace")); assertEquals("Test slogan for External Event0", secondJsonMap.get("TestSlogan")); + LOGGER.debug("testRestServerMultiInputs end"); } /** @@ -264,9 +281,12 @@ public class TestRestServer { * @throws MessagingException the messaging exception * @throws ApexException the apex exception * @throws IOException Signals that an I/O exception has occurred. + * @throws InterruptedException interrupted exception */ @Test - public void testRestServerProducerStandalone() throws MessagingException, ApexException, IOException { + public void testRestServerProducerStandalone() + throws MessagingException, ApexException, IOException, InterruptedException { + LOGGER.debug("testRestServerProducerStandalone start"); System.setOut(new PrintStream(outContent)); System.setErr(new PrintStream(errContent)); @@ -284,6 +304,7 @@ public class TestRestServer { assertTrue(outString.contains( "the parameters \"host\", \"port\", and \"standalone\" are illegal on REST Server producer")); + LOGGER.debug("testRestServerProducerStandalone end"); } /** @@ -292,9 +313,12 @@ public class TestRestServer { * @throws MessagingException the messaging exception * @throws ApexException the apex exception * @throws IOException Signals that an I/O exception has occurred. + * @throws InterruptedException interrupted exception */ @Test - public void testRestServerProducerHost() throws MessagingException, ApexException, IOException { + public void testRestServerProducerHost() + throws MessagingException, ApexException, IOException, InterruptedException { + LOGGER.debug("testRestServerProducerHost start"); System.setOut(new PrintStream(outContent)); System.setErr(new PrintStream(errContent)); @@ -311,6 +335,7 @@ public class TestRestServer { System.setErr(stderr); assertTrue(outString.contains(" host is specified only in standalone mode")); + LOGGER.debug("testRestServerProducerHost end"); } /** @@ -319,9 +344,12 @@ public class TestRestServer { * @throws MessagingException the messaging exception * @throws ApexException the apex exception * @throws IOException Signals that an I/O exception has occurred. + * @throws InterruptedException interrupted exception */ @Test - public void testRestServerProducerPort() throws MessagingException, ApexException, IOException { + public void testRestServerProducerPort() + throws MessagingException, ApexException, IOException, InterruptedException { + LOGGER.debug("testRestServerProducerPort start"); System.setOut(new PrintStream(outContent)); System.setErr(new PrintStream(errContent)); @@ -338,6 +366,7 @@ public class TestRestServer { System.setErr(stderr); assertTrue(outString.contains(" port is specified only in standalone mode")); + LOGGER.debug("testRestServerProducerPort end"); } /** @@ -349,6 +378,7 @@ public class TestRestServer { */ @Test public void testRestServerConsumerStandaloneNoHost() throws MessagingException, ApexException, IOException { + LOGGER.debug("testRestServerConsumerStandaloneNoHost start"); System.setOut(new PrintStream(outContent)); System.setErr(new PrintStream(errContent)); @@ -366,6 +396,7 @@ public class TestRestServer { assertTrue(outString.contains("the parameters \"host\" and \"port\" must be defined for REST Server consumer " + "(FirstConsumer) in standalone mode")); + LOGGER.debug("testRestServerConsumerStandaloneNoHost end"); } /** @@ -377,6 +408,7 @@ public class TestRestServer { */ @Test public void testRestServerConsumerStandaloneNoPort() throws MessagingException, ApexException, IOException { + LOGGER.debug("testRestServerConsumerStandaloneNoPort start"); System.setOut(new PrintStream(outContent)); System.setErr(new PrintStream(errContent)); @@ -394,6 +426,7 @@ public class TestRestServer { assertTrue(outString.contains("the parameters \"host\" and \"port\" must be defined for REST Server consumer " + "(FirstConsumer) in standalone mode")); + LOGGER.debug("testRestServerConsumerStandaloneNoPort end"); } /** @@ -405,6 +438,7 @@ public class TestRestServer { */ @Test public void testRestServerProducerNotSync() throws MessagingException, ApexException, IOException { + LOGGER.debug("testRestServerProducerNotSync start"); System.setOut(new PrintStream(outContent)); System.setErr(new PrintStream(errContent)); @@ -422,6 +456,7 @@ public class TestRestServer { assertTrue(outString.contains("REST Server producer (FirstProducer) must run in synchronous mode " + "with a REST Server consumer")); + LOGGER.debug("testRestServerProducerNotSync end"); } /** @@ -433,6 +468,7 @@ public class TestRestServer { */ @Test public void testRestServerConsumerNotSync() throws MessagingException, ApexException, IOException { + LOGGER.debug("testRestServerConsumerNotSync start"); System.setOut(new PrintStream(outContent)); System.setErr(new PrintStream(errContent)); @@ -451,6 +487,7 @@ public class TestRestServer { assertTrue(outString .contains("peer \"FirstConsumer for peered mode SYNCHRONOUS does not exist or is not defined " + "with the same peered mode")); + LOGGER.debug("testRestServerConsumerNotSync end"); } /** diff --git a/testsuites/integration/pom.xml b/testsuites/integration/pom.xml index 53f5afb55..4a7362c53 100644 --- a/testsuites/integration/pom.xml +++ b/testsuites/integration/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.testsuites</groupId> <artifactId>testsuites</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId> diff --git a/testsuites/performance/performance-benchmark-test/pom.xml b/testsuites/performance/performance-benchmark-test/pom.xml index bfc8e3c02..f0358d1e8 100644 --- a/testsuites/performance/performance-benchmark-test/pom.xml +++ b/testsuites/performance/performance-benchmark-test/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId> <artifactId>performance</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>performance-benchmark-test</artifactId> diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml index da9cf15b5..380501318 100644 --- a/testsuites/performance/pom.xml +++ b/testsuites/performance/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.testsuites</groupId> <artifactId>testsuites</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId> diff --git a/testsuites/pom.xml b/testsuites/pom.xml index ce77e42ef..5aa547ba1 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.testsuites</groupId> diff --git a/tools/model-generator/pom.xml b/tools/model-generator/pom.xml index 16ddb769d..c0b77e4f3 100644 --- a/tools/model-generator/pom.xml +++ b/tools/model-generator/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.tools</groupId> <artifactId>tools</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>model-generator</artifactId> diff --git a/tools/pom.xml b/tools/pom.xml index d81afd442..e353dde8f 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp</groupId> <artifactId>apex-pdp</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.apex-pdp.tools</groupId> diff --git a/tools/simple-wsclient/pom.xml b/tools/simple-wsclient/pom.xml index 181f35703..42d68dc6a 100644 --- a/tools/simple-wsclient/pom.xml +++ b/tools/simple-wsclient/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.tools</groupId> <artifactId>tools</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>simple-wsclient</artifactId> diff --git a/tools/tools-common/pom.xml b/tools/tools-common/pom.xml index 177dffd13..d9832473b 100644 --- a/tools/tools-common/pom.xml +++ b/tools/tools-common/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.apex-pdp.tools</groupId> <artifactId>tools</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>tools-common</artifactId> diff --git a/version.properties b/version.properties index 76584abcb..d54fa5b89 100644 --- a/version.properties +++ b/version.properties @@ -3,8 +3,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=2 -minor=2 -patch=2 +minor=3 +patch=0 base_version=${major}.${minor}.${patch} |