From 438e51c16647c4a9b3db648016109448295be488 Mon Sep 17 00:00:00 2001 From: Prafulrakhade Date: Wed, 31 Jul 2024 07:39:51 +0000 Subject: [PATCH 01/29] Updated Pom versions for release changes Signed-off-by: GitHub --- commons-packet/commons-packet-manager/pom.xml | 26 +++++++++---------- commons-packet/commons-packet-service/pom.xml | 22 ++++++++-------- commons-packet/pom.xml | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index 4e23bf41cb..f8459287e6 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -9,7 +9,7 @@ commons-packet-manager Mosip commons project https://github.com/mosip/commons - 1.2.1-SNAPSHOT + 1.3.0-B1-SNAPSHOT UTF-8 @@ -26,20 +26,20 @@ 1.6.7 3.0.1 2.22.0 - 1.2.1-SNAPSHOT + 1.3.0-B1-SNAPSHOT 1.3.1 - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT 3.11.2 **/constants/**,**/config/**,**/audit/**,**/util/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index 31e86e0893..d58d35faa7 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.mosip.commons commons-packet-service - 1.2.1-SNAPSHOT + 1.3.0-B1-SNAPSHOT commons-packet-service Mosip commons project https://github.com/mosip/commons @@ -27,20 +27,20 @@ 3.0.1 - 1.2.1-SNAPSHOT + 1.3.0-B1-SNAPSHOT 2.9.2 - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT + 1.3.0-B1-SNAPSHOT **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** - 1.2.1-SNAPSHOT + 1.3.0-B1-SNAPSHOT 0.8.11 diff --git a/commons-packet/pom.xml b/commons-packet/pom.xml index 358bf2a62a..b4a49d40bc 100644 --- a/commons-packet/pom.xml +++ b/commons-packet/pom.xml @@ -7,7 +7,7 @@ io.mosip.commons commons-packet - 1.2.1-SNAPSHOT + 1.3.0-B1-SNAPSHOT common-packet Common packet manager for MOSIP https://github.com/mosip/packet-manager From d2ae13cdc8bc776459fe71e3d72989519f3cf190 Mon Sep 17 00:00:00 2001 From: Chandra Keshav Mishra Date: Thu, 1 Aug 2024 11:33:51 +0530 Subject: [PATCH 02/29] Updated Pom versions for release changes (#168) Signed-off-by: GitHub Co-authored-by: Prafulrakhade --- commons-packet/commons-packet-manager/pom.xml | 26 +++++++++---------- commons-packet/commons-packet-service/pom.xml | 22 ++++++++-------- commons-packet/pom.xml | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index f8459287e6..b4a1db5ed2 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -9,7 +9,7 @@ commons-packet-manager Mosip commons project https://github.com/mosip/commons - 1.3.0-B1-SNAPSHOT + 1.3.0-SNAPSHOT UTF-8 @@ -26,20 +26,20 @@ 1.6.7 3.0.1 2.22.0 - 1.3.0-B1-SNAPSHOT + 1.3.0-SNAPSHOT 1.3.1 - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT 3.11.2 **/constants/**,**/config/**,**/audit/**,**/util/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index d58d35faa7..8ec329bb2f 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.mosip.commons commons-packet-service - 1.3.0-B1-SNAPSHOT + 1.3.0-SNAPSHOT commons-packet-service Mosip commons project https://github.com/mosip/commons @@ -27,20 +27,20 @@ 3.0.1 - 1.3.0-B1-SNAPSHOT + 1.3.0-SNAPSHOT 2.9.2 - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT - 1.3.0-B1-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** - 1.3.0-B1-SNAPSHOT + 1.3.0-SNAPSHOT 0.8.11 diff --git a/commons-packet/pom.xml b/commons-packet/pom.xml index b4a49d40bc..8d77dfe170 100644 --- a/commons-packet/pom.xml +++ b/commons-packet/pom.xml @@ -7,7 +7,7 @@ io.mosip.commons commons-packet - 1.3.0-B1-SNAPSHOT + 1.3.0-SNAPSHOT common-packet Common packet manager for MOSIP https://github.com/mosip/packet-manager From 5aa2789eb39408c9ff2b2fd29b1ebe77f01c5148 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Mon, 9 Sep 2024 13:41:59 +0530 Subject: [PATCH 03/29] [MOSIP-35160] Updated URL from https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh to https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh Signed-off-by: techno-467 --- deploy/copy_cm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/copy_cm.sh b/deploy/copy_cm.sh index 2255e8e00d..faf5ce9f1f 100755 --- a/deploy/copy_cm.sh +++ b/deploy/copy_cm.sh @@ -3,7 +3,7 @@ # DST_NS: Destination namespace function copying_cm() { - UTIL_URL=https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh + UTIL_URL=https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh COPY_UTIL=./copy_cm_func.sh DST_NS=packetmanager From 6763f01e3edbc9e44ede74e6c33e9d6693180b72 Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Mon, 7 Oct 2024 14:37:52 +0530 Subject: [PATCH 04/29] MOSIP-32461 Changing commons versions for 1.3.x branch Signed-off-by: khuddus shariff --- commons-packet/commons-packet-manager/pom.xml | 12 ++++++------ commons-packet/commons-packet-service/pom.xml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index b4a1db5ed2..7aae0a01d3 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -29,17 +29,17 @@ 1.3.0-SNAPSHOT 1.3.1 - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.3.0-beta.1 + 1.3.0-beta.1 + 1.3.0-beta.1 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.3.0-beta.1 + 1.3.0-beta.1 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.3.0-beta.1 3.11.2 **/constants/**,**/config/**,**/audit/**,**/util/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index 8ec329bb2f..1b929120de 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -30,14 +30,14 @@ 1.3.0-SNAPSHOT 2.9.2 - 1.3.0-SNAPSHOT + 1.3.0-beta.1 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.3.0-beta.1 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.3.0-beta.1 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** 1.3.0-SNAPSHOT From 4223c6b387a57cd8b63f55918e41d0e200514257 Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Wed, 9 Oct 2024 13:18:05 +0530 Subject: [PATCH 05/29] MOSIP-32461, MOSIP-36412 Changing commons versions for 1.3.x branch Signed-off-by: khuddus shariff --- commons-packet/commons-packet-manager/pom.xml | 2 -- commons-packet/commons-packet-service/pom.xml | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index 7aae0a01d3..afea23cf65 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -26,7 +26,6 @@ 1.6.7 3.0.1 2.22.0 - 1.3.0-SNAPSHOT 1.3.1 1.3.0-beta.1 @@ -34,7 +33,6 @@ 1.3.0-beta.1 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT 1.3.0-beta.1 1.3.0-beta.1 diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index 1b929120de..517719fe96 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -27,15 +27,13 @@ 3.0.1 - 1.3.0-SNAPSHOT 2.9.2 1.3.0-beta.1 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT 1.3.0-beta.1 - 1.3.0-SNAPSHOT + 1.3.0-beta.1 1.3.0-SNAPSHOT 1.3.0-beta.1 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" From 54ab6d184e2f5b9b78c451e7463a57c3c46c0db9 Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Sun, 20 Oct 2024 00:28:24 +0530 Subject: [PATCH 06/29] MOSIP-32461, MOSIP-36412 Changings versions to 1.3.0-beta.1 for 1.3.x branch Signed-off-by: khuddus shariff --- commons-packet/commons-packet-manager/pom.xml | 8 ++++---- commons-packet/commons-packet-service/pom.xml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index afea23cf65..09b040dc88 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -31,12 +31,12 @@ 1.3.0-beta.1 1.3.0-beta.1 1.3.0-beta.1 - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.3.0-beta.1 + 1.3.0-beta.1 + 1.3.0-beta.1 1.3.0-beta.1 1.3.0-beta.1 - 1.3.0-SNAPSHOT + 1.3.0-beta.1 1.3.0-beta.1 3.11.2 **/constants/**,**/config/**,**/audit/**,**/util/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index 517719fe96..cd9c02f930 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -30,11 +30,11 @@ 2.9.2 1.3.0-beta.1 - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.3.0-beta.1 + 1.3.0-beta.1 1.3.0-beta.1 1.3.0-beta.1 - 1.3.0-SNAPSHOT + 1.3.0-beta.1 1.3.0-beta.1 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** From 88ce15f30941992ddc4f08a79094cc265f4c77ef Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Mon, 11 Nov 2024 20:14:10 +0530 Subject: [PATCH 07/29] [MOSIP-37256 ] adding readme Signed-off-by: khuddus shariff --- README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a6d9fe2925..5db07d32f3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,49 @@ # Packet Manager + +## Overview + +* This repository contains the source code MOSIP Packet Manager module. For an overview refer [here](https://docs.mosip.io/1.2.0/modules/packet-manager). +--- + + ## About * Its used by "Registration Client" and "Resident Service" to create packets. -* Its used by "Registration Processor" to read packet. - +* Its used by "Registration Processor" to read packet +___ +## Build & run (for developers) +The project requires JDK 21.0.3 and mvn version 3.9.6 + +1. Build and install: + > $ cd commons-packet
+ > $ mvn clean install -Dgpg.skip=true +___ +## Build Docker for a service +>$ cd ``
+$ docker build -f Dockerfile +> +--- +## Configuration +We are using two property files that are accessible in this [repository](https://github.com/mosip/mosip-config). Please refer the required released tagged version for configuration. +> 1: [application-default.properties](https://github.com/mosip/mosip-config/blob/master/application-default.properties)
2:[ packet-manager-default.properties](https://github.com/mosip/mosip-config/blob/master/packet-manager-default.properties) + +--- +## Deployment + +To deploy services on Kubernetes cluster using Dockers. Refer to [Sandbox Deployment](https://docs.mosip.io/1.2.0/deploymentnew/v3-installation). + +--- + +## Test +Tests are performed for this repository using [DSL](https://github.com/mosip/mosip-automation-tests) automation testing. + +--- + +## APIs +API documentation is available [here](https://mosip.github.io/documentation/). + +--- + +## License +This project is licensed under the terms of [Mozilla Public License 2.0](LICENSE). \ No newline at end of file From 450162be783d55c4b59e6c62a5b984f5a556c0dd Mon Sep 17 00:00:00 2001 From: Prafulrakhade <99539100+Prafulrakhade@users.noreply.github.com> Date: Wed, 4 Dec 2024 15:00:18 +0000 Subject: [PATCH 08/29] Updated chart versions, image and tag for release changes Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- deploy/install.sh | 2 +- helm/packetmanager/Chart.yaml | 2 +- helm/packetmanager/values.yaml | 46 +--------------------------------- 3 files changed, 3 insertions(+), 47 deletions(-) diff --git a/deploy/install.sh b/deploy/install.sh index 2a0f3f9924..b26c6c18a5 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=packetmanager -CHART_VERSION=0.0.1-develop +CHART_VERSION=1.3.0-beta.1-develop echo Create $NS namespace kubectl create ns $NS diff --git a/helm/packetmanager/Chart.yaml b/helm/packetmanager/Chart.yaml index e41dc30b51..ddca432b1c 100644 --- a/helm/packetmanager/Chart.yaml +++ b/helm/packetmanager/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: packetmanager description: A Helm chart for MOSIP Packetmanager module type: application -version: 0.0.1-develop +version: 1.3.0-beta.1-develop appVersion: "" dependencies: - name: common diff --git a/helm/packetmanager/values.yaml b/helm/packetmanager/values.yaml index 45292860d9..10ab92e033 100644 --- a/helm/packetmanager/values.yaml +++ b/helm/packetmanager/values.yaml @@ -12,23 +12,18 @@ ## commonLabels: app.kubernetes.io/component: mosip - ## Add annotations to all the deployed resources ## commonAnnotations: {} - ## Kubernetes Cluster Domain ## clusterDomain: cluster.local - ## Extra objects to deploy (value evaluated as a template) ## extraDeploy: [] - ## Number of nodes ## replicaCount: 1 - service: type: ClusterIP port: 80 @@ -49,11 +44,10 @@ service: ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip ## externalTrafficPolicy: Cluster - image: registry: docker.io repository: mosipqa/commons-packet-service - tag: develop + tag: 1.3.x ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -65,10 +59,8 @@ image: ## # pullSecrets: # - myRegistryKeySecretName - ## Port on which this particular spring service module is running. springServicePort: 8093 - ## Configure extra options for liveness and readiness probes ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes ## @@ -82,7 +74,6 @@ startupProbe: timeoutSeconds: 5 failureThreshold: 30 successThreshold: 1 - livenessProbe: enabled: true httpGet: @@ -93,7 +84,6 @@ livenessProbe: timeoutSeconds: 5 failureThreshold: 6 successThreshold: 1 - readinessProbe: enabled: true httpGet: @@ -104,7 +94,6 @@ readinessProbe: timeoutSeconds: 5 failureThreshold: 6 successThreshold: 1 - ## # existingConfigmap: @@ -112,12 +101,10 @@ readinessProbe: ## command: [] args: [] - ## Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## hostAliases: [] - ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## resources: @@ -131,37 +118,31 @@ resources: requests: cpu: 500m memory: 1500Mi - additionalResources: ## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources ## Example: java_opts: "-Xms500M -Xmx500M" javaOpts: "-Xms4000M -Xmx4000M" - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container ## Clamav container already runs as 'mosip' user, so we may not need to enable this containerSecurityContext: enabled: false runAsUser: mosip runAsNonRoot: true - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod ## podSecurityContext: enabled: false fsGroup: 1001 - ## Pod affinity preset ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity ## Allowed values: soft, hard ## podAffinityPreset: "" - ## Pod anti-affinity preset ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity ## Allowed values: soft, hard ## podAntiAffinityPreset: soft - ## Node affinity preset ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity ## Allowed values: soft, hard @@ -183,32 +164,26 @@ nodeAffinityPreset: ## - e2e-az2 ## values: [] - ## Affinity for pod assignment. Evaluated as a template. ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity ## affinity: {} - ## Node labels for pod assignment. Evaluated as a template. ## ref: https://kubernetes.io/docs/user-guide/node-selection/ ## nodeSelector: {} - ## Tolerations for pod assignment. Evaluated as a template. ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] - ## Pod extra labels ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ ## podLabels: {} - ## Annotations for server pods. ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ ## podAnnotations: {} - ## pods' priority. ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -217,15 +192,12 @@ podAnnotations: {} ## lifecycleHooks for the container to automate configuration before or after startup. ## lifecycleHooks: {} - ## Custom Liveness probes for ## customLivenessProbe: {} - ## Custom Rediness probes ## customReadinessProbe: {} - ## Update strategy - only really applicable for deployments with RWO PVs attached ## If replicas = 1, an update can get "stuck", as the previous pod remains attached to the ## PV, and the "incoming" pod can never start. Changing the strategy to "Recreate" will @@ -233,7 +205,6 @@ customReadinessProbe: {} ## updateStrategy: type: RollingUpdate - ## Additional environment variables to set ## Example: ## extraEnvVars: @@ -241,26 +212,21 @@ updateStrategy: ## value: "bar" ## extraEnvVars: [] - ## ConfigMap with extra environment variables that used ## extraEnvVarsCM: - global - config-server-share - artifactory-share - ## Secret with extra environment variables ## extraEnvVarsSecret: - ## Extra volumes to add to the deployment ## extraVolumes: [] - ## Extra volume mounts to add to the container ## extraVolumeMounts: [] - ## Add init containers to the pods. ## Example: ## initContainers: @@ -272,7 +238,6 @@ extraVolumeMounts: [] ## containerPort: 1234 ## initContainers: {} - ## Add sidecars to the pods. ## Example: ## sidecars: @@ -284,7 +249,6 @@ initContainers: {} ## containerPort: 1234 ## sidecars: {} - persistence: enabled: false ## If defined, storageClassName: @@ -306,7 +270,6 @@ persistence: existingClaim: # Dir where config and keys are written inside container mountDir: - ## Init containers parameters: ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section. ## @@ -340,12 +303,10 @@ volumePermissions: ## cpu: 100m ## memory: 128Mi ## - ## Specifies whether RBAC resources should be created ## rbac: create: true - ## Specifies whether a ServiceAccount should be created ## serviceAccount: @@ -354,7 +315,6 @@ serviceAccount: ## If not set and create is true, a name is generated using the fullname template ## name: - ## Prometheus Metrics ## metrics: @@ -364,9 +324,7 @@ metrics: ## podAnnotations: prometheus.io/scrape: "true" - endpointPath: /commons/v1/packetmanager/actuator/prometheus - ## Prometheus Service Monitor ## ref: https://github.com/coreos/prometheus-operator ## @@ -393,7 +351,6 @@ metrics: ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec ## additionalLabels: {} - ## Custom PrometheusRule to be defined ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions @@ -411,7 +368,6 @@ metrics: # labels: # severity: error rules: [] - ## Only internal access istio: enabled: true From 8e3273870cfe1922d21453ef083148ded8971c93 Mon Sep 17 00:00:00 2001 From: Chandra Keshav Mishra Date: Tue, 10 Dec 2024 16:21:33 +0530 Subject: [PATCH 09/29] [DSD-6825] platform 1.2.1.0-beta-1 release (#184) * Updated Pom versions for release changes Signed-off-by: GitHub * [DSD-6825] platform 1.2.1.0-beta-1 release Signed-off-by: Praful Rakhade * [DSD-6825] platform 1.2.1.0-beta-1 release Signed-off-by: Praful Rakhade * [DSD-6825] platform 1.2.1.0-beta-1 release Signed-off-by: Praful Rakhade --------- Signed-off-by: GitHub Signed-off-by: Praful Rakhade Co-authored-by: Prafulrakhade Co-authored-by: Praful Rakhade --- .github/workflows/push-trigger.yml | 2 +- commons-packet/commons-packet-manager/pom.xml | 4 ++-- commons-packet/commons-packet-service/pom.xml | 6 +++--- commons-packet/pom.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 659c6158f0..4ad25d6afb 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -43,7 +43,7 @@ jobs: secrets: OSSRH_USER: ${{ secrets.OSSRH_USER }} OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_URL: ${{ secrets.RELEASE_URL }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index 09b040dc88..d1d4467001 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -9,7 +9,7 @@ commons-packet-manager Mosip commons project https://github.com/mosip/commons - 1.3.0-SNAPSHOT + 1.3.0-beta.1 UTF-8 @@ -23,7 +23,7 @@ 2.8.1 2.2.1 1.5 - 1.6.7 + 1.6.14 3.0.1 2.22.0 1.3.1 diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index cd9c02f930..a90bac8b6d 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.mosip.commons commons-packet-service - 1.3.0-SNAPSHOT + 1.3.0-beta.1 commons-packet-service Mosip commons project https://github.com/mosip/commons @@ -23,7 +23,7 @@ 2.8.1 2.2.1 1.5 - 1.6.7 + 1.6.14 3.0.1 @@ -38,7 +38,7 @@ 1.3.0-beta.1 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** - 1.3.0-SNAPSHOT + 1.3.0-beta.1 0.8.11 diff --git a/commons-packet/pom.xml b/commons-packet/pom.xml index 8d77dfe170..0cf92fbb5f 100644 --- a/commons-packet/pom.xml +++ b/commons-packet/pom.xml @@ -7,7 +7,7 @@ io.mosip.commons commons-packet - 1.3.0-SNAPSHOT + 1.3.0-beta.1 common-packet Common packet manager for MOSIP https://github.com/mosip/packet-manager @@ -30,7 +30,7 @@ 2.8.1 2.2.1 1.5 - 1.6.7 + 1.6.14 3.0.1 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** From aa266cd8f28268e9df898ac5d2698cc0d40ad8dd Mon Sep 17 00:00:00 2001 From: Chandra Keshav Mishra Date: Tue, 10 Dec 2024 16:35:04 +0530 Subject: [PATCH 10/29] Updated chart versions, image and tag for release changes (#185) Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Prafulrakhade <99539100+Prafulrakhade@users.noreply.github.com> --- deploy/install.sh | 2 +- helm/packetmanager/Chart.yaml | 2 +- helm/packetmanager/values.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/install.sh b/deploy/install.sh index b26c6c18a5..a2251a29e2 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=packetmanager -CHART_VERSION=1.3.0-beta.1-develop +CHART_VERSION=1.3.0-beta.1 echo Create $NS namespace kubectl create ns $NS diff --git a/helm/packetmanager/Chart.yaml b/helm/packetmanager/Chart.yaml index ddca432b1c..bda20658da 100644 --- a/helm/packetmanager/Chart.yaml +++ b/helm/packetmanager/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: packetmanager description: A Helm chart for MOSIP Packetmanager module type: application -version: 1.3.0-beta.1-develop +version: 1.3.0-beta.1 appVersion: "" dependencies: - name: common diff --git a/helm/packetmanager/values.yaml b/helm/packetmanager/values.yaml index 10ab92e033..d3e68ce384 100644 --- a/helm/packetmanager/values.yaml +++ b/helm/packetmanager/values.yaml @@ -46,8 +46,8 @@ service: externalTrafficPolicy: Cluster image: registry: docker.io - repository: mosipqa/commons-packet-service - tag: 1.3.x + repository: mosipid/commons-packet-service + tag: 1.3.0-beta.1 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images From 1a56485a62fc8482851f9c2ea3e7e08ad3a4c522 Mon Sep 17 00:00:00 2001 From: Chandra Keshav Mishra Date: Fri, 13 Dec 2024 14:33:54 +0530 Subject: [PATCH 11/29] Updated Pom version and Chart version for post-release changes (#186) Signed-off-by: GitHub Co-authored-by: Prafulrakhade --- .github/workflows/push-trigger.yml | 2 +- deploy/install.sh | 2 +- helm/packetmanager/Chart.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 4ad25d6afb..659c6158f0 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -43,7 +43,7 @@ jobs: secrets: OSSRH_USER: ${{ secrets.OSSRH_USER }} OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_URL: ${{ secrets.RELEASE_URL }} + OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/deploy/install.sh b/deploy/install.sh index a2251a29e2..b26c6c18a5 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=packetmanager -CHART_VERSION=1.3.0-beta.1 +CHART_VERSION=1.3.0-beta.1-develop echo Create $NS namespace kubectl create ns $NS diff --git a/helm/packetmanager/Chart.yaml b/helm/packetmanager/Chart.yaml index bda20658da..ddca432b1c 100644 --- a/helm/packetmanager/Chart.yaml +++ b/helm/packetmanager/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: packetmanager description: A Helm chart for MOSIP Packetmanager module type: application -version: 1.3.0-beta.1 +version: 1.3.0-beta.1-develop appVersion: "" dependencies: - name: common From 9ab9e6dc939099bb5470b0b9c4a759b3b398ccae Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Wed, 26 Feb 2025 15:43:14 +0530 Subject: [PATCH 12/29] [MOSIP-40012] Corrected ZCG Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- commons-packet/commons-packet-service/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/commons-packet/commons-packet-service/Dockerfile b/commons-packet/commons-packet-service/Dockerfile index d148e987e7..12eebd8dd1 100644 --- a/commons-packet/commons-packet-service/Dockerfile +++ b/commons-packet/commons-packet-service/Dockerfile @@ -93,10 +93,11 @@ CMD if [ -n "$cache_provider_url_env" ]; then \ wget -q --show-progress "${kernel_ref_idobjectvalidator_url}" -O "${loader_path_env}"/kernel-ref-idobjectvalidator.jar; \ wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ wget -q --show-progress "${cache_provider_url_env}" -O "${loader_path_env}"/cache-provider.jar; \ - java -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" commons-packet-service.jar; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -Xms1g -Xmx2g -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops \ + -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" commons-packet-service.jar; \ else \ wget -q --show-progress "${kernel_ref_idobjectvalidator_url}" -O "${loader_path_env}"/kernel-ref-idobjectvalidator.jar; \ wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" commons-packet-service.jar; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -Xms1g -Xmx2g -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops \ + -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" commons-packet-service.jar; \ fi -#CMD ["java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-XX:MaxRAMFraction=1", "-XX:+HeapDumpOnOutOfMemoryError", "-XX:+UseG1GC", "-XX:+UseStringDeduplication", "-jar", "-Dspring.cloud.config.label=${spring_config_label_env}","-Dspring.profiles.active=${active_profile_env}","-Dspring.cloud.config.uri=${spring_config_url_env}", "-Dcom.sun.management.jmxremote=true", "-Dcom.sun.management.jmxremote.rmi.port="${management.jmxremote.rmi.port_env}"8099" , "-Dcom.sun.management.jmxremote.port="${management.jmxremote.rmi.port_env}"", "-Dcom.sun.management.jmxremote.ssl=false" ,"-Dcom.sun.management.jmxremote.authenticate=false", "-Dcom.sun.management.jmxremote.local.only=false", "-Djava.rmi.server.hostname="${management.rmi.server.hostname_env}"" , "commons-packet-service.jar"] From f9a53220817e97ecd795d52f3438467295b8aa4a Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Wed, 26 Feb 2025 15:58:57 +0530 Subject: [PATCH 13/29] Corrected -jar Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- commons-packet/commons-packet-service/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commons-packet/commons-packet-service/Dockerfile b/commons-packet/commons-packet-service/Dockerfile index 12eebd8dd1..6209c6ace2 100644 --- a/commons-packet/commons-packet-service/Dockerfile +++ b/commons-packet/commons-packet-service/Dockerfile @@ -94,10 +94,10 @@ CMD if [ -n "$cache_provider_url_env" ]; then \ wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ wget -q --show-progress "${cache_provider_url_env}" -O "${loader_path_env}"/cache-provider.jar; \ java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -Xms1g -Xmx2g -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops \ - -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" commons-packet-service.jar; \ + -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar commons-packet-service.jar; \ else \ wget -q --show-progress "${kernel_ref_idobjectvalidator_url}" -O "${loader_path_env}"/kernel-ref-idobjectvalidator.jar; \ wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -Xms1g -Xmx2g -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops \ - -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" commons-packet-service.jar; \ + -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar commons-packet-service.jar; \ fi From e476aa06452dfd8b3ff44335ef9dcdbcbbf79dd7 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Wed, 26 Feb 2025 17:13:55 +0530 Subject: [PATCH 14/29] Revert "Corrected -jar" This reverts commit eae60dc39aeca064c2148c9cbe50d457199c687e. Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- commons-packet/commons-packet-service/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commons-packet/commons-packet-service/Dockerfile b/commons-packet/commons-packet-service/Dockerfile index 6209c6ace2..12eebd8dd1 100644 --- a/commons-packet/commons-packet-service/Dockerfile +++ b/commons-packet/commons-packet-service/Dockerfile @@ -94,10 +94,10 @@ CMD if [ -n "$cache_provider_url_env" ]; then \ wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ wget -q --show-progress "${cache_provider_url_env}" -O "${loader_path_env}"/cache-provider.jar; \ java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -Xms1g -Xmx2g -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops \ - -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar commons-packet-service.jar; \ + -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" commons-packet-service.jar; \ else \ wget -q --show-progress "${kernel_ref_idobjectvalidator_url}" -O "${loader_path_env}"/kernel-ref-idobjectvalidator.jar; \ wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -Xms1g -Xmx2g -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops \ - -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar commons-packet-service.jar; \ + -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" commons-packet-service.jar; \ fi From 53f4c3a08098038a99ffaed406d90fea506ba9d5 Mon Sep 17 00:00:00 2001 From: nagendra0721 Date: Mon, 3 Mar 2025 12:53:27 +0530 Subject: [PATCH 15/29] MOSIP-37901: packet-manager-release (#189) * MOSIP-37901: packet-manager-release Signed-off-by: nagendra0721 * MOSIP-37901: packet-manager-release Signed-off-by: nagendra0721 --------- Signed-off-by: nagendra0721 --- .github/workflows/push-trigger.yml | 2 +- commons-packet/commons-packet-service/pom.xml | 79 ++++++++++--------- commons-packet/pom.xml | 36 +-------- 3 files changed, 44 insertions(+), 73 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 659c6158f0..4ad25d6afb 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -43,7 +43,7 @@ jobs: secrets: OSSRH_USER: ${{ secrets.OSSRH_USER }} OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_URL: ${{ secrets.RELEASE_URL }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index a90bac8b6d..9fcc46f722 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -20,7 +20,7 @@ 3.1.0 3.2.0 2.3 - 2.8.1 + 3.1.1 2.2.1 1.5 1.6.14 @@ -40,6 +40,7 @@ **/dto/**,**/entity/**,**/config/** 1.3.0-beta.1 0.8.11 + 1.6.14 @@ -145,42 +146,46 @@ - - - maven-deploy-plugin - ${maven.deploy.plugin.version} - - - default-deploy - deploy - - deploy - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus.staging.plugin.version} - true - - - default-deploy - deploy - - deploy - - - - - ossrh - https://oss.sonatype.org/ - false - - - - + + maven-deploy-plugin + ${maven.deploy.plugin.version} + + true + + + + default-deploy + none + + deploy + + + true + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.maven.plugin.version} + true + + + default-deploy + none + + deploy + + + + + ossrh + https://oss.sonatype.org/ + false + + + org.apache.maven.plugins maven-source-plugin true diff --git a/commons-packet/pom.xml b/commons-packet/pom.xml index 0cf92fbb5f..c55cf04ea2 100644 --- a/commons-packet/pom.xml +++ b/commons-packet/pom.xml @@ -128,41 +128,7 @@ ${maven.compiler.target} - - maven-deploy-plugin - ${maven.deploy.plugin.version} - - - default-deploy - deploy - - deploy - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus.staging.plugin.version} - true - - - default-deploy - deploy - - deploy - - - - - ossrh - https://oss.sonatype.org/ - false - - - - + org.apache.maven.plugins maven-source-plugin true From 059f8b94a2ab3207e6a538b0c6cef39aa8555f41 Mon Sep 17 00:00:00 2001 From: Gokulraj C <110164849+GOKULRAJ136@users.noreply.github.com> Date: Wed, 12 Mar 2025 10:20:12 +0530 Subject: [PATCH 16/29] MOSIP-39985 (#195) * [ MOSIP-35378 ] Release 1.2.0.x adding to develop Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * pom version change for packet manager Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * pom version change for packet manager Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * pom version change for packet service Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * pom version changes Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --------- Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- commons-packet/commons-packet-manager/pom.xml | 2 +- .../packet/dto/packet/RegistrationPacket.java | 10 +-- .../commons/packet/util/PacketValidator.java | 7 +- .../dto/packet/RegistrationPacketTest.java | 83 +++++++++++++++++++ .../test/impl/PacketReaderImplTest.java | 3 + commons-packet/commons-packet-service/pom.xml | 11 ++- commons-packet/pom.xml | 2 +- 7 files changed, 106 insertions(+), 12 deletions(-) create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/dto/packet/RegistrationPacketTest.java diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index d1d4467001..daa4cf7ff5 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -9,7 +9,7 @@ commons-packet-manager Mosip commons project https://github.com/mosip/commons - 1.3.0-beta.1 + 1.3.0-SNAPSHOT UTF-8 diff --git a/commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/dto/packet/RegistrationPacket.java b/commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/dto/packet/RegistrationPacket.java index 38cbabbcaa..5c24208cd7 100644 --- a/commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/dto/packet/RegistrationPacket.java +++ b/commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/dto/packet/RegistrationPacket.java @@ -23,7 +23,8 @@ public class RegistrationPacket { private static final Logger LOGGER = PacketManagerLogger.getLogger(RegistrationPacket.class); - + private static final ObjectMapper mapper=new ObjectMapper(); + private String registrationId; private double idSchemaVersion; private String creationDate; @@ -85,16 +86,15 @@ private void setFields(String fieldName, String value, Map finalMap) { if (value != null) { Object json = new JSONTokener(value).nextValue(); if (json instanceof JSONObject) { - HashMap hashMap = new ObjectMapper().readValue(value, HashMap.class); + HashMap hashMap = mapper.readValue(value, HashMap.class); finalMap.putIfAbsent(fieldName, hashMap); } else if (json instanceof JSONArray) { List jsonList = new ArrayList<>(); JSONArray jsonArray = new JSONArray(value); for (int i = 0; i < jsonArray.length(); i++) { - Object obj = jsonArray.get(i); - HashMap hashMap = new ObjectMapper().readValue(obj.toString(), HashMap.class); - jsonList.add(hashMap); + Object obj = jsonArray.get(i); + jsonList.add(obj instanceof org.json.JSONObject ? mapper.readValue(obj.toString(), HashMap.class):obj); } finalMap.putIfAbsent(fieldName, jsonList); } else diff --git a/commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/util/PacketValidator.java b/commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/util/PacketValidator.java index cce5f273b8..8b6ec394da 100644 --- a/commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/util/PacketValidator.java +++ b/commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/util/PacketValidator.java @@ -308,16 +308,17 @@ private LinkedHashMap loadDemographicIdentity(Map fieldMap) thro if (value != null) { Object json = new JSONTokener(value).nextValue(); if (json instanceof org.json.JSONObject) { - HashMap hashMap = new ObjectMapper().readValue(value, HashMap.class); + HashMap hashMap = mapper.readValue(value, HashMap.class); demographicIdentity.putIfAbsent(e.getKey(), hashMap); } + else if (json instanceof JSONArray) { List jsonList = new ArrayList<>(); JSONArray jsonArray = new JSONArray(value); + for (int i = 0; i < jsonArray.length(); i++) { Object obj = jsonArray.get(i); - HashMap hashMap = new ObjectMapper().readValue(obj.toString(), HashMap.class); - jsonList.add(hashMap); + jsonList.add(obj instanceof org.json.JSONObject ? mapper.readValue(obj.toString(), HashMap.class):obj); } demographicIdentity.putIfAbsent(e.getKey(), jsonList); } else diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/dto/packet/RegistrationPacketTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/dto/packet/RegistrationPacketTest.java new file mode 100644 index 0000000000..6b31f381fc --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/dto/packet/RegistrationPacketTest.java @@ -0,0 +1,83 @@ +package io.mosip.commons.packet.test.dto.packet; + +import io.mosip.commons.packet.dto.packet.RegistrationPacket; +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.Assert.assertEquals; + +public class RegistrationPacketTest { + + @Autowired + private RegistrationPacket registrationPacket; + + @Before + public void before(){ + registrationPacket =new RegistrationPacket("yyyy-MM-dd'T'HH:mm:ss.SSS"); + } + + @Test + public void setFields_withArrayOfString_thenPass() + { + String arrayOfString="[\"handle1\", \"handle2\", \"handle3\"]"; + registrationPacket.setField("handle",arrayOfString); + Map mapObj=registrationPacket.getDemographics(); + List handleList= (List) mapObj.get("handle"); + assertEquals(3, handleList.size()); + assertEquals("handle1", handleList.get(0)); + assertEquals("handle2", handleList.get(1)); + assertEquals("handle3", handleList.get(2)); + } + + @Test + public void setFields_withObjectofMap_thenPass() + { + String arrayofMapAsString="[\n" + + " {\n" + + " \"language\": \"eng\",\n" + + " \"value\": \"NFR\"\n" + + " },\n" + + " {\n" + + " \"language\": \"ara\",\n" + + " \"value\": \"NFR\"\n" + + " }\n" + + " ]"; + registrationPacket.setField("residenceStatus",arrayofMapAsString); + Map mapObj=registrationPacket.getDemographics(); + List handleList= (List) mapObj.get("residenceStatus"); + HashMap has1= (HashMap) handleList.get(0); + assertEquals("eng",has1.get("language")); + assertEquals("NFR",has1.get("value")); + } + + @Test + public void setFields_withHashmap_thenPass() + { + String mapAsString="{\n" + + " \"format\": \"pdf\",\n" + + " \"type\": \"Reference Identity Card\",\n" + + " \"value\": \"proofOfIdentity\"\n" + + " }"; + registrationPacket.setField("proofOfIdentity",mapAsString); + Map mapObj=registrationPacket.getDemographics(); + HashMap handleList= (HashMap) mapObj.get("proofOfIdentity"); + assertEquals("pdf",handleList.get("format")); + assertEquals("Reference Identity Card",handleList.get("type")); + } + + @Test + public void setFields_withString_thenPass() + { + String string="ExpString"; + registrationPacket.setField("StringExp",string); + Map mapObj=registrationPacket.getDemographics(); + String responceString= (String) mapObj.get("StringExp"); + assertEquals("ExpString",responceString); + } + +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/impl/PacketReaderImplTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/impl/PacketReaderImplTest.java index 03ff31324d..915002535b 100644 --- a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/impl/PacketReaderImplTest.java +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/impl/PacketReaderImplTest.java @@ -186,6 +186,9 @@ public void setup() throws PacketKeeperException, IOException { " \"value\" : \"جهة الرباط سلا القنيطرة\"\n" + " } ],\n" + " \"email\" : \"niyati.swami@technoforte.co.in\"\n" + + " \"selectedHandles\": [\n" + + " \"nrcId\"\n" + + " ]" + "} } "; keyValueMap = new LinkedHashMap<>(); diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index 9fcc46f722..3e6ca2cc32 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.mosip.commons commons-packet-service - 1.3.0-beta.1 + 1.3.0-SNAPSHOT commons-packet-service Mosip commons project https://github.com/mosip/commons @@ -38,7 +38,7 @@ 1.3.0-beta.1 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** - 1.3.0-beta.1 + 1.3.0-SNAPSHOT 0.8.11 1.6.14 @@ -101,6 +101,13 @@ + + + org.springframework.security + spring-security-test + test + + diff --git a/commons-packet/pom.xml b/commons-packet/pom.xml index c55cf04ea2..5a14392e65 100644 --- a/commons-packet/pom.xml +++ b/commons-packet/pom.xml @@ -7,7 +7,7 @@ io.mosip.commons commons-packet - 1.3.0-beta.1 + 1.3.0-SNAPSHOT common-packet Common packet manager for MOSIP https://github.com/mosip/packet-manager From 2e816b82cf9afc631547816d3b265188aecabde2 Mon Sep 17 00:00:00 2001 From: kameshsr <47484458+kameshsr@users.noreply.github.com> Date: Mon, 17 Mar 2025 13:58:43 +0530 Subject: [PATCH 17/29] MOSIP-40717 change version to snaphsot (#196) Signed-off-by: kameshsr --- commons-packet/commons-packet-manager/pom.xml | 20 +++++++++---------- commons-packet/commons-packet-service/pom.xml | 14 ++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index daa4cf7ff5..03644a40a7 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -28,16 +28,16 @@ 2.22.0 1.3.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT 3.11.2 **/constants/**,**/config/**,**/audit/**,**/util/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index 3e6ca2cc32..d76c56d0df 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -29,13 +29,13 @@ 2.9.2 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 - 1.3.0-beta.1 + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** 1.3.0-SNAPSHOT From b8b1a068ee7594e5be83dcbdfe503e5f44858b1e Mon Sep 17 00:00:00 2001 From: Gokulraj C <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 27 May 2025 12:47:01 +0530 Subject: [PATCH 18/29] MOSIP-39775 : pom version changes (#202) Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- commons-packet/commons-packet-manager/pom.xml | 22 +++++++++---------- commons-packet/commons-packet-service/pom.xml | 18 +++++++-------- commons-packet/pom.xml | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index 03644a40a7..529efde911 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -9,7 +9,7 @@ commons-packet-manager Mosip commons project https://github.com/mosip/commons - 1.3.0-SNAPSHOT + 1.3.0-beta.2-SNAPSHOT UTF-8 @@ -28,16 +28,16 @@ 2.22.0 1.3.1 - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.3.0-beta.3-SNAPSHOT + 1.3.0-beta.2 + 1.3.0-beta.2 + 1.3.0-beta.1 + 1.3.0-beta.1 + 1.3.0-beta.1 + 1.3.0-beta.2 + 1.3.0-beta.2 + 1.3.0-beta.1 + 1.3.0-beta.2 3.11.2 **/constants/**,**/config/**,**/audit/**,**/util/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index d76c56d0df..5ab7ebf99b 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.mosip.commons commons-packet-service - 1.3.0-SNAPSHOT + 1.3.0-beta.2-SNAPSHOT commons-packet-service Mosip commons project https://github.com/mosip/commons @@ -29,16 +29,16 @@ 2.9.2 - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.3.0-beta.2 + 1.3.0-beta.1 + 1.3.0-beta.1 + 1.3.0-beta.2 + 1.3.0-beta.2 + 1.3.0-beta.1 + 1.3.0-beta.2 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** - 1.3.0-SNAPSHOT + 1.3.0-beta.2-SNAPSHOT 0.8.11 1.6.14 diff --git a/commons-packet/pom.xml b/commons-packet/pom.xml index 5a14392e65..691e55fa32 100644 --- a/commons-packet/pom.xml +++ b/commons-packet/pom.xml @@ -7,7 +7,7 @@ io.mosip.commons commons-packet - 1.3.0-SNAPSHOT + 1.3.0-beta.2-SNAPSHOT common-packet Common packet manager for MOSIP https://github.com/mosip/packet-manager From 294484ce0111594ed30b9b11469b08dd2dea2b42 Mon Sep 17 00:00:00 2001 From: Gokulraj C <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 27 May 2025 14:59:24 +0530 Subject: [PATCH 19/29] Update push-trigger.yml (#205) Signed-off-by: Gokulraj C <110164849+GOKULRAJ136@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 4ad25d6afb..659c6158f0 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -43,7 +43,7 @@ jobs: secrets: OSSRH_USER: ${{ secrets.OSSRH_USER }} OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_URL: ${{ secrets.RELEASE_URL }} + OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} From 5ebb85199f02ebdf3520dc64536440afe3d872f6 Mon Sep 17 00:00:00 2001 From: Gokulraj C <110164849+GOKULRAJ136@users.noreply.github.com> Date: Wed, 28 May 2025 12:58:02 +0530 Subject: [PATCH 20/29] MOSIP-41586 : Snapshot version changes (#207) Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- commons-packet/commons-packet-manager/pom.xml | 4 ++-- commons-packet/commons-packet-service/pom.xml | 4 ++-- commons-packet/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index 529efde911..7952a7f661 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -9,7 +9,7 @@ commons-packet-manager Mosip commons project https://github.com/mosip/commons - 1.3.0-beta.2-SNAPSHOT + 1.3.0-SNAPSHOT UTF-8 @@ -28,7 +28,7 @@ 2.22.0 1.3.1 - 1.3.0-beta.3-SNAPSHOT + 1.3.0-SNAPSHOT 1.3.0-beta.2 1.3.0-beta.2 1.3.0-beta.1 diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index 5ab7ebf99b..f2af122b9e 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.mosip.commons commons-packet-service - 1.3.0-beta.2-SNAPSHOT + 1.3.0-SNAPSHOT commons-packet-service Mosip commons project https://github.com/mosip/commons @@ -38,7 +38,7 @@ 1.3.0-beta.2 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** - 1.3.0-beta.2-SNAPSHOT + 1.3.0-SNAPSHOT 0.8.11 1.6.14 diff --git a/commons-packet/pom.xml b/commons-packet/pom.xml index 691e55fa32..5a14392e65 100644 --- a/commons-packet/pom.xml +++ b/commons-packet/pom.xml @@ -7,7 +7,7 @@ io.mosip.commons commons-packet - 1.3.0-beta.2-SNAPSHOT + 1.3.0-SNAPSHOT common-packet Common packet manager for MOSIP https://github.com/mosip/packet-manager From c55c9d50acfe4386eda1b6b03308b94c5aa0f0b1 Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN <103260988+VSIVAKALYAN@users.noreply.github.com> Date: Thu, 29 May 2025 18:46:38 +0530 Subject: [PATCH 21/29] [MOSIP-41627] Updated Resource limits to fix OOM killed issue (#209) Signed-off-by: VSIVAKALYAN <103260988+VSIVAKALYAN@users.noreply.github.com> --- helm/packetmanager/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/packetmanager/values.yaml b/helm/packetmanager/values.yaml index d3e68ce384..0e98aeaeb1 100644 --- a/helm/packetmanager/values.yaml +++ b/helm/packetmanager/values.yaml @@ -113,11 +113,11 @@ resources: # resources, such as Minikube. If you do want to specify resources, uncomment the following # lines, adjust them as necessary, and remove the curly braces after 'resources:'. limits: - cpu: 1000m + cpu: 2000m memory: 5000Mi requests: - cpu: 500m - memory: 1500Mi + cpu: 1000m + memory: 3000Mi additionalResources: ## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources ## Example: java_opts: "-Xms500M -Xmx500M" From aa12ad93fc4970459b5c065c590cf4a402697301 Mon Sep 17 00:00:00 2001 From: Praful Rakhade Date: Wed, 9 Jul 2025 12:43:59 +0530 Subject: [PATCH 22/29] [MOSIP-41674] central sonatype migration changes (#218) * [MOSIP-41674] central sonatype migration changes Signed-off-by: Prafulrakhade * [MOSIP-41674] central sonatype migration changes Signed-off-by: Praful Rakhade --------- Signed-off-by: Prafulrakhade Signed-off-by: Praful Rakhade Co-authored-by: Prafulrakhade --- .github/workflows/push-trigger.yml | 2 +- commons-packet/commons-packet-manager/pom.xml | 53 ++++++++----------- commons-packet/commons-packet-service/pom.xml | 45 +++++++--------- commons-packet/pom.xml | 37 ++++++++----- 4 files changed, 64 insertions(+), 73 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 659c6158f0..41b25dc8d0 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -43,7 +43,7 @@ jobs: secrets: OSSRH_USER: ${{ secrets.OSSRH_USER }} OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_URL: ${{ secrets.OSSRH_CENTRAL_URL }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index 7952a7f661..3fd06092d0 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -23,7 +23,7 @@ 2.8.1 2.2.1 1.5 - 1.6.14 + 0.7.0 3.0.1 2.22.0 1.3.1 @@ -150,16 +150,16 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + + ossrh + https://central.sonatype.com/repository/maven-snapshots/ + + + ossrh + https://central.sonatype.com/api/v1/publisher + + @@ -196,27 +196,16 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus.staging.plugin.version} - true - - - default-deploy - deploy - - deploy - - - - - ossrh - https://oss.sonatype.org/ - false - - - + + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} + true + + ossrh + false + + org.apache.maven.plugins maven-source-plugin diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index f2af122b9e..a0ed4d0aa9 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -40,7 +40,7 @@ **/dto/**,**/entity/**,**/config/** 1.3.0-SNAPSHOT 0.8.11 - 1.6.14 + 0.7.0 @@ -111,16 +111,16 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + + ossrh + https://central.sonatype.com/repository/maven-snapshots/ + + + ossrh + https://central.sonatype.com/api/v1/publisher + + @@ -136,6 +136,9 @@ build-info repackage + + false + @@ -173,23 +176,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus.staging.maven.plugin.version} + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - none - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false diff --git a/commons-packet/pom.xml b/commons-packet/pom.xml index 5a14392e65..7efad9852d 100644 --- a/commons-packet/pom.xml +++ b/commons-packet/pom.xml @@ -30,8 +30,8 @@ 2.8.1 2.2.1 1.5 - 1.6.14 - 3.0.1 + 0.7.0 + 3.0.1 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** @@ -41,17 +41,17 @@ commons-packet-service - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - + + + ossrh + https://central.sonatype.com/repository/maven-snapshots/ + + + ossrh + https://central.sonatype.com/api/v1/publisher + + + @@ -142,7 +142,16 @@ - + + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} + true + + ossrh + false + + org.apache.maven.plugins maven-javadoc-plugin From 1de4169d8c2ed9e3f17bf9a2ed7b7030f8d914dd Mon Sep 17 00:00:00 2001 From: Chandra Keshav Mishra Date: Wed, 9 Jul 2025 15:28:30 +0530 Subject: [PATCH 23/29] [DSD-8455] PLA 1.3.0-beta phase4 release changes (#221) * Updated Pom versions for release changes Signed-off-by: GitHub * [DSD-8455] PLA 1.3.0-beta phase4 release changes Signed-off-by: Prafulrakhade --------- Signed-off-by: GitHub Signed-off-by: Prafulrakhade Co-authored-by: Prafulrakhade Co-authored-by: Prafulrakhade --- README.md | 4 ++-- commons-packet/commons-packet-manager/pom.xml | 4 ++-- commons-packet/commons-packet-service/pom.xml | 4 ++-- commons-packet/pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5db07d32f3..29624f4fde 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Maven Package upon a push](https://github.com/mosip/packet-manager/actions/workflows/push_trigger.yml/badge.svg?branch=release-1.2.0.1)](https://github.com/mosip/packet-manager/actions/workflows/push_trigger.yml) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=release-1.2.0.1&project=mosip_packet-manager&id=mosip_packet-manager2&metric=alert_status)](https://sonarcloud.io/dashboard?branch=release-1.2.0.1&id=mosip_packet-manager) +[![Maven Package upon a push](https://github.com/mosip/packet-manager/actions/workflows/push-trigger.yml/badge.svg?branch=release-1.3.x)](https://github.com/mosip/packet-manager/actions/workflows/push-trigger.yml) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=release-1.3.x&project=mosip_packet-manager&id=mosip_packet-manager2&metric=alert_status)](https://sonarcloud.io/dashboard?branch=release-1.3.x&id=mosip_packet-manager) # Packet Manager diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index 3fd06092d0..b5eb6cf21f 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -9,7 +9,7 @@ commons-packet-manager Mosip commons project https://github.com/mosip/commons - 1.3.0-SNAPSHOT + 1.3.0-beta.2 UTF-8 @@ -28,7 +28,7 @@ 2.22.0 1.3.1 - 1.3.0-SNAPSHOT + 1.3.0-beta.3 1.3.0-beta.2 1.3.0-beta.2 1.3.0-beta.1 diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index a0ed4d0aa9..c9a92b4c96 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.mosip.commons commons-packet-service - 1.3.0-SNAPSHOT + 1.3.0-beta.2 commons-packet-service Mosip commons project https://github.com/mosip/commons @@ -38,7 +38,7 @@ 1.3.0-beta.2 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** - 1.3.0-SNAPSHOT + 1.3.0-beta.2 0.8.11 0.7.0 diff --git a/commons-packet/pom.xml b/commons-packet/pom.xml index 7efad9852d..2ce645be8e 100644 --- a/commons-packet/pom.xml +++ b/commons-packet/pom.xml @@ -7,7 +7,7 @@ io.mosip.commons commons-packet - 1.3.0-SNAPSHOT + 1.3.0-beta.2 common-packet Common packet manager for MOSIP https://github.com/mosip/packet-manager From 41c36916b187158a27ba44b2c3e79321a5ceff1e Mon Sep 17 00:00:00 2001 From: Chandra Keshav Mishra Date: Wed, 9 Jul 2025 15:34:27 +0530 Subject: [PATCH 24/29] Updated chart versions, image and tag for release changes (#222) Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Prafulrakhade <99539100+Prafulrakhade@users.noreply.github.com> --- deploy/install.sh | 2 +- helm/packetmanager/Chart.yaml | 2 +- helm/packetmanager/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/install.sh b/deploy/install.sh index b26c6c18a5..2381aa8cfe 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=packetmanager -CHART_VERSION=1.3.0-beta.1-develop +CHART_VERSION=1.3.0-beta.2 echo Create $NS namespace kubectl create ns $NS diff --git a/helm/packetmanager/Chart.yaml b/helm/packetmanager/Chart.yaml index ddca432b1c..5819d51287 100644 --- a/helm/packetmanager/Chart.yaml +++ b/helm/packetmanager/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: packetmanager description: A Helm chart for MOSIP Packetmanager module type: application -version: 1.3.0-beta.1-develop +version: 1.3.0-beta.2 appVersion: "" dependencies: - name: common diff --git a/helm/packetmanager/values.yaml b/helm/packetmanager/values.yaml index 0e98aeaeb1..ecda349ef1 100644 --- a/helm/packetmanager/values.yaml +++ b/helm/packetmanager/values.yaml @@ -47,7 +47,7 @@ service: image: registry: docker.io repository: mosipid/commons-packet-service - tag: 1.3.0-beta.1 + tag: 1.3.0-beta.2 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images From 3e68486b6b4ce072f870b96af3d936c050d6cf01 Mon Sep 17 00:00:00 2001 From: Dhanendra Sahu Date: Thu, 10 Jul 2025 11:38:53 +0530 Subject: [PATCH 25/29] MOSIP-40013 Signed-off-by: Dhanendra Sahu --- commons-packet/commons-packet-manager/pom.xml | 2 +- commons-packet/commons-packet-service/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index b5eb6cf21f..4e3044493f 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -36,7 +36,7 @@ 1.3.0-beta.1 1.3.0-beta.2 1.3.0-beta.2 - 1.3.0-beta.1 + 1.2.2-SNAPSHOT 1.3.0-beta.2 3.11.2 **/constants/**,**/config/**,**/audit/**,**/util/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index c9a92b4c96..0fb30124dc 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -34,7 +34,7 @@ 1.3.0-beta.1 1.3.0-beta.2 1.3.0-beta.2 - 1.3.0-beta.1 + 1.2.2-SNAPSHOT 1.3.0-beta.2 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** From 4b54df5c80133fd7c3705da8e33dcfc958323a16 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 06:08:48 +0000 Subject: [PATCH 26/29] I am working on adding JUnit tests for commons-packet and commons-packet-service. --- .../packet/test/audit/AuditLogEntryTest.java | 21 ++ .../packet/test/audit/ServerUtilTest.java | 42 +++ .../ApiNotAccessibleExceptionTest.java | 27 ++ .../test/exception/CryptoExceptionTest.java | 27 ++ .../FieldNameNotFoundExceptionTest.java | 27 ++ ...ileNotFoundInDestinationExceptionTest.java | 27 ++ .../GetAllIdentityExceptionTest.java | 27 ++ .../GetAllMetaInfoExceptionTest.java | 27 ++ .../exception/GetBiometricExceptionTest.java | 27 ++ .../exception/GetDocumentExceptionTest.java | 27 ++ .../test/exception/GetTagExceptionTest.java | 27 ++ .../NoAvailableProviderExceptionTest.java | 27 ++ .../ObjectDoesnotExistsExceptionTest.java | 27 ++ .../ObjectStoreAdapterExceptionTest.java | 27 ++ .../exception/PacketCreatorExceptionTest.java | 27 ++ .../PacketDecryptionFailureExceptionTest.java | 27 ++ .../PacketIntegrityFailureExceptionTest.java | 27 ++ .../exception/PacketKeeperExceptionTest.java | 27 ++ .../exception/PacketReaderExceptionTest.java | 27 ++ .../PacketValidationFailureExceptionTest.java | 27 ++ .../exception/SignatureExceptionTest.java | 27 ++ .../exception/TagCreationExceptionTest.java | 27 ++ .../exception/TagDeletionExceptionTest.java | 27 ++ .../exception/ZipParsingExceptionTest.java | 27 ++ .../packet/test/util/IdSchemaUtilsTest.java | 84 ++++++ .../test/util/PacketManagerHelperTest.java | 66 +++++ .../packet/test/util/PacketValidatorTest.java | 38 +++ .../packet/test/util/ZipUtilsTest.java | 36 +++ .../PacketManagerControllerTest.java | 13 +- .../PacketReaderControllerTest.java | 254 +++++++++++++++++ .../PacketWriterControllerTest.java | 144 ++++++++++ .../SourceNotPresentExceptionTest.java | 27 ++ .../test/service/PacketReaderServiceTest.java | 27 ++ .../test/service/PacketWriterServiceTest.java | 266 +++++++++--------- 34 files changed, 1476 insertions(+), 136 deletions(-) create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/audit/AuditLogEntryTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/audit/ServerUtilTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ApiNotAccessibleExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/CryptoExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/FieldNameNotFoundExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/FileNotFoundInDestinationExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetAllIdentityExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetAllMetaInfoExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetBiometricExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetDocumentExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetTagExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/NoAvailableProviderExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ObjectDoesnotExistsExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ObjectStoreAdapterExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketCreatorExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketDecryptionFailureExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketIntegrityFailureExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketKeeperExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketReaderExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketValidationFailureExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/SignatureExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/TagCreationExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/TagDeletionExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ZipParsingExceptionTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/IdSchemaUtilsTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/PacketManagerHelperTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/PacketValidatorTest.java create mode 100644 commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/ZipUtilsTest.java create mode 100644 commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketReaderControllerTest.java create mode 100644 commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketWriterControllerTest.java create mode 100644 commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/exception/SourceNotPresentExceptionTest.java diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/audit/AuditLogEntryTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/audit/AuditLogEntryTest.java new file mode 100644 index 0000000000..deca5cb183 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/audit/AuditLogEntryTest.java @@ -0,0 +1,21 @@ +package io.mosip.commons.packet.test.audit; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.audit.AuditLogEntry; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class AuditLogEntryTest { + + @Test + public void testAuditLogEntry() { + AuditLogEntry auditLogEntry = new AuditLogEntry("test-event", "test-type", "test-app-id", "test-app-name"); + assertNotNull(auditLogEntry); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/audit/ServerUtilTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/audit/ServerUtilTest.java new file mode 100644 index 0000000000..4f402f0667 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/audit/ServerUtilTest.java @@ -0,0 +1,42 @@ +package io.mosip.commons.packet.test.audit; + +import static org.junit.Assert.assertNotNull; +import static org.mockito.Mockito.when; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.core.env.Environment; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.audit.ServerUtil; +import io.mosip.commons.packet.constants.PacketManagerConstants; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ServerUtilTest { + + @Mock + private Environment environment; + + @Before + public void setup() { + when(environment.getProperty(PacketManagerConstants.AUDIT_HOST_NAME)).thenReturn("test-host"); + when(environment.getProperty(PacketManagerConstants.AUDIT_HOST_IP)).thenReturn("127.0.0.1"); + } + + @Test + public void testGetHostName() { + String hostName = ServerUtil.getHostName(); + assertNotNull(hostName); + } + + @Test + public void testGetHostIp() { + String hostIp = ServerUtil.getHostIp(); + assertNotNull(hostIp); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ApiNotAccessibleExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ApiNotAccessibleExceptionTest.java new file mode 100644 index 0000000000..ea8d84d552 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ApiNotAccessibleExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.ApiNotAccessibleException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ApiNotAccessibleExceptionTest { + + @Test + public void testApiNotAccessibleException() { + ApiNotAccessibleException exception = new ApiNotAccessibleException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testApiNotAccessibleExceptionWithCause() { + ApiNotAccessibleException exception = new ApiNotAccessibleException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/CryptoExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/CryptoExceptionTest.java new file mode 100644 index 0000000000..df1d6f3ca0 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/CryptoExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.CryptoException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class CryptoExceptionTest { + + @Test + public void testCryptoException() { + CryptoException exception = new CryptoException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testCryptoExceptionWithCause() { + CryptoException exception = new CryptoException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/FieldNameNotFoundExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/FieldNameNotFoundExceptionTest.java new file mode 100644 index 0000000000..4fb36805fc --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/FieldNameNotFoundExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.FieldNameNotFoundException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class FieldNameNotFoundExceptionTest { + + @Test + public void testFieldNameNotFoundException() { + FieldNameNotFoundException exception = new FieldNameNotFoundException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testFieldNameNotFoundExceptionWithCause() { + FieldNameNotFoundException exception = new FieldNameNotFoundException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/FileNotFoundInDestinationExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/FileNotFoundInDestinationExceptionTest.java new file mode 100644 index 0000000000..7ec50b757d --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/FileNotFoundInDestinationExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.FileNotFoundInDestinationException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class FileNotFoundInDestinationExceptionTest { + + @Test + public void testFileNotFoundInDestinationException() { + FileNotFoundInDestinationException exception = new FileNotFoundInDestinationException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testFileNotFoundInDestinationExceptionWithCause() { + FileNotFoundInDestinationException exception = new FileNotFoundInDestinationException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetAllIdentityExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetAllIdentityExceptionTest.java new file mode 100644 index 0000000000..3ff7dd595a --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetAllIdentityExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.GetAllIdentityException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class GetAllIdentityExceptionTest { + + @Test + public void testGetAllIdentityException() { + GetAllIdentityException exception = new GetAllIdentityException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testGetAllIdentityExceptionWithCause() { + GetAllIdentityException exception = new GetAllIdentityException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetAllMetaInfoExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetAllMetaInfoExceptionTest.java new file mode 100644 index 0000000000..053b3114de --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetAllMetaInfoExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.GetAllMetaInfoException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class GetAllMetaInfoExceptionTest { + + @Test + public void testGetAllMetaInfoException() { + GetAllMetaInfoException exception = new GetAllMetaInfoException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testGetAllMetaInfoExceptionWithCause() { + GetAllMetaInfoException exception = new GetAllMetaInfoException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetBiometricExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetBiometricExceptionTest.java new file mode 100644 index 0000000000..20e55d9c78 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetBiometricExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.GetBiometricException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class GetBiometricExceptionTest { + + @Test + public void testGetBiometricException() { + GetBiometricException exception = new GetBiometricException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testGetBiometricExceptionWithCause() { + GetBiometricException exception = new GetBiometricException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetDocumentExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetDocumentExceptionTest.java new file mode 100644 index 0000000000..057f5f33dd --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetDocumentExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.GetDocumentException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class GetDocumentExceptionTest { + + @Test + public void testGetDocumentException() { + GetDocumentException exception = new GetDocumentException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testGetDocumentExceptionWithCause() { + GetDocumentException exception = new GetDocumentException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetTagExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetTagExceptionTest.java new file mode 100644 index 0000000000..a73e1e0eaf --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/GetTagExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.GetTagException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class GetTagExceptionTest { + + @Test + public void testGetTagException() { + GetTagException exception = new GetTagException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testGetTagExceptionWithCause() { + GetTagException exception = new GetTagException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/NoAvailableProviderExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/NoAvailableProviderExceptionTest.java new file mode 100644 index 0000000000..a6df65203c --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/NoAvailableProviderExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.NoAvailableProviderException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class NoAvailableProviderExceptionTest { + + @Test + public void testNoAvailableProviderException() { + NoAvailableProviderException exception = new NoAvailableProviderException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testNoAvailableProviderExceptionWithCause() { + NoAvailableProviderException exception = new NoAvailableProviderException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ObjectDoesnotExistsExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ObjectDoesnotExistsExceptionTest.java new file mode 100644 index 0000000000..a332fdc51a --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ObjectDoesnotExistsExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.ObjectDoesnotExistsException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ObjectDoesnotExistsExceptionTest { + + @Test + public void testObjectDoesnotExistsException() { + ObjectDoesnotExistsException exception = new ObjectDoesnotExistsException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testObjectDoesnotExistsExceptionWithCause() { + ObjectDoesnotExistsException exception = new ObjectDoesnotExistsException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ObjectStoreAdapterExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ObjectStoreAdapterExceptionTest.java new file mode 100644 index 0000000000..a552090b30 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ObjectStoreAdapterExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.ObjectStoreAdapterException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ObjectStoreAdapterExceptionTest { + + @Test + public void testObjectStoreAdapterException() { + ObjectStoreAdapterException exception = new ObjectStoreAdapterException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testObjectStoreAdapterExceptionWithCause() { + ObjectStoreAdapterException exception = new ObjectStoreAdapterException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketCreatorExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketCreatorExceptionTest.java new file mode 100644 index 0000000000..f8db2eec62 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketCreatorExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.PacketCreatorException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PacketCreatorExceptionTest { + + @Test + public void testPacketCreatorException() { + PacketCreatorException exception = new PacketCreatorException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testPacketCreatorExceptionWithCause() { + PacketCreatorException exception = new PacketCreatorException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketDecryptionFailureExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketDecryptionFailureExceptionTest.java new file mode 100644 index 0000000000..4c9cf5f73c --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketDecryptionFailureExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.PacketDecryptionFailureException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PacketDecryptionFailureExceptionTest { + + @Test + public void testPacketDecryptionFailureException() { + PacketDecryptionFailureException exception = new PacketDecryptionFailureException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testPacketDecryptionFailureExceptionWithCause() { + PacketDecryptionFailureException exception = new PacketDecryptionFailureException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketIntegrityFailureExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketIntegrityFailureExceptionTest.java new file mode 100644 index 0000000000..15d88d394a --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketIntegrityFailureExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.PacketIntegrityFailureException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PacketIntegrityFailureExceptionTest { + + @Test + public void testPacketIntegrityFailureException() { + PacketIntegrityFailureException exception = new PacketIntegrityFailureException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testPacketIntegrityFailureExceptionWithCause() { + PacketIntegrityFailureException exception = new PacketIntegrityFailureException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketKeeperExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketKeeperExceptionTest.java new file mode 100644 index 0000000000..45816fde97 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketKeeperExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.PacketKeeperException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PacketKeeperExceptionTest { + + @Test + public void testPacketKeeperException() { + PacketKeeperException exception = new PacketKeeperException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testPacketKeeperExceptionWithCause() { + PacketKeeperException exception = new PacketKeeperException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketReaderExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketReaderExceptionTest.java new file mode 100644 index 0000000000..a5ac3d4e50 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketReaderExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.PacketReaderException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PacketReaderExceptionTest { + + @Test + public void testPacketReaderException() { + PacketReaderException exception = new PacketReaderException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testPacketReaderExceptionWithCause() { + PacketReaderException exception = new PacketReaderException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketValidationFailureExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketValidationFailureExceptionTest.java new file mode 100644 index 0000000000..29a269d81e --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/PacketValidationFailureExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.PacketValidationFailureException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PacketValidationFailureExceptionTest { + + @Test + public void testPacketValidationFailureException() { + PacketValidationFailureException exception = new PacketValidationFailureException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testPacketValidationFailureExceptionWithCause() { + PacketValidationFailureException exception = new PacketValidationFailureException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/SignatureExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/SignatureExceptionTest.java new file mode 100644 index 0000000000..95c871f6e4 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/SignatureExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.SignatureException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class SignatureExceptionTest { + + @Test + public void testSignatureException() { + SignatureException exception = new SignatureException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testSignatureExceptionWithCause() { + SignatureException exception = new SignatureException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/TagCreationExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/TagCreationExceptionTest.java new file mode 100644 index 0000000000..e81320ebd1 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/TagCreationExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.TagCreationException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class TagCreationExceptionTest { + + @Test + public void testTagCreationException() { + TagCreationException exception = new TagCreationException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testTagCreationExceptionWithCause() { + TagCreationException exception = new TagCreationException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/TagDeletionExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/TagDeletionExceptionTest.java new file mode 100644 index 0000000000..de97d388b2 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/TagDeletionExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.TagDeletionException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class TagDeletionExceptionTest { + + @Test + public void testTagDeletionException() { + TagDeletionException exception = new TagDeletionException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testTagDeletionExceptionWithCause() { + TagDeletionException exception = new TagDeletionException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ZipParsingExceptionTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ZipParsingExceptionTest.java new file mode 100644 index 0000000000..f813907a4d --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/exception/ZipParsingExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packet.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.ZipParsingException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ZipParsingExceptionTest { + + @Test + public void testZipParsingException() { + ZipParsingException exception = new ZipParsingException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testZipParsingExceptionWithCause() { + ZipParsingException exception = new ZipParsingException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/IdSchemaUtilsTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/IdSchemaUtilsTest.java new file mode 100644 index 0000000000..26c8936f22 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/IdSchemaUtilsTest.java @@ -0,0 +1,84 @@ +package io.mosip.commons.packet.test.util; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.core.env.Environment; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.web.client.RestTemplate; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.mosip.commons.packet.dto.packet.SimpleDto; +import io.mosip.commons.packet.exception.IdObjectIOException; +import io.mosip.commons.packet.exception.IdObjectValidationException; +import io.mosip.commons.packet.util.IdSchemaUtils; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class IdSchemaUtilsTest { + + @Mock + private RestTemplate restTemplate; + + @MockBean + private Environment environment; + + @Autowired + private IdSchemaUtils idSchemaUtils; + + @Before + public void setup() { + when(environment.getProperty(Mockito.anyString())).thenReturn("some-value"); + } + + @Test + public void testGetAllField() throws IOException, IdObjectIOException { + String schema = "{\"$schema\":\"http://json-schema.org/draft-07/schema#\",\"title\":\"Test\",\"description\":\"Test\",\"type\":\"object\",\"properties\":{\"identity\":{\"type\":\"object\",\"properties\":{\"test\":{\"type\":\"string\"}}}}}"; + List fieldNames = idSchemaUtils.getAllField(schema.getBytes()); + assertEquals(1, fieldNames.size()); + assertEquals("test", fieldNames.get(0)); + } + + @Test + public void testGetIdSchema() throws IOException { + String schema = "{\"$schema\":\"http://json-schema.org/draft-07/schema#\",\"title\":\"Test\",\"description\":\"Test\",\"type\":\"object\",\"properties\":{\"identity\":{\"type\":\"object\",\"properties\":{\"test\":{\"type\":\"string\"}}}}}"; + when(restTemplate.getForObject(Mockito.anyString(), Mockito.any())).thenReturn(schema); + Map idSchema = idSchemaUtils.getIdSchema("some-url"); + assertNotNull(idSchema); + } + + @Test + public void testValidate() throws IOException, IdObjectValidationException { + String schema = "{\"$schema\":\"http://json-schema.org/draft-07/schema#\",\"title\":\"Test\",\"description\":\"Test\",\"type\":\"object\",\"properties\":{\"identity\":{\"type\":\"object\",\"properties\":{\"test\":{\"type\":\"string\"}}}}}"; + List simpleDtoList = new ArrayList<>(); + SimpleDto simpleDto = new SimpleDto(); + simpleDto.setLanguage("eng"); + simpleDto.setValue("testValue"); + simpleDtoList.add(simpleDto); + ObjectMapper objectMapper = new ObjectMapper(); + String identity = objectMapper.writeValueAsString(simpleDtoList); + idSchemaUtils.validate(schema.getBytes(), identity); + } + + @Test + public void testIsIdSchemaValid() throws IOException { + String schema = "{\"$schema\":\"http://json-schema.org/draft-07/schema#\",\"title\":\"Test\",\"description\":\"Test\",\"type\":\"object\",\"properties\":{\"identity\":{\"type\":\"object\",\"properties\":{\"test\":{\"type\":\"string\"}}}}}"; + assertTrue(idSchemaUtils.isIdSchemaValid(schema.getBytes())); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/PacketManagerHelperTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/PacketManagerHelperTest.java new file mode 100644 index 0000000000..51bfcbd4fd --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/PacketManagerHelperTest.java @@ -0,0 +1,66 @@ +package io.mosip.commons.packet.test.util; + +import static org.junit.Assert.assertNotNull; +import static org.mockito.Mockito.when; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.core.env.Environment; +import org.springframework.test.context.junit4.SpringRunner; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; + +import io.mosip.commons.packet.constants.PacketManagerConstants; +import io.mosip.commons.packet.util.PacketManagerHelper; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PacketManagerHelperTest { + + @Autowired + private PacketManagerHelper packetManagerHelper; + + @MockBean + private Environment environment; + + @Mock + private ObjectMapper objectMapper; + + @Before + public void setup() { + when(environment.getProperty(PacketManagerConstants.AUDIT_EVENT_NAME)).thenReturn("test-event"); + when(environment.getProperty(PacketManagerConstants.AUDIT_EVENT_TYPE)).thenReturn("test-type"); + when(environment.getProperty(PacketManagerConstants.AUDIT_APPLICATION_ID)).thenReturn("test-app-id"); + when(environment.getProperty(PacketManagerConstants.AUDIT_APPLICATION_NAME)).thenReturn("test-app-name"); + when(environment.getProperty(PacketManagerConstants.AUDIT_HOST_NAME)).thenReturn("test-host"); + when(environment.getProperty(PacketManagerConstants.AUDIT_HOST_IP)).thenReturn("127.0.0.1"); + } + + @Test + public void testGetPacketInfo() throws IOException { + Map resources = new HashMap<>(); + String json = "{\"key\":\"value\"}"; + resources.put("some-path", new ByteArrayInputStream(json.getBytes())); + ObjectNode objectNode = packetManagerHelper.getPacketInfo(resources); + assertNotNull(objectNode); + } + + @Test + public void testBuildAuditRequest() { + ObjectNode objectNode = packetManagerHelper.buildAuditRequest(null, "test-id", "test-name"); + assertNotNull(objectNode); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/PacketValidatorTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/PacketValidatorTest.java new file mode 100644 index 0000000000..10770ba2e9 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/PacketValidatorTest.java @@ -0,0 +1,38 @@ +package io.mosip.commons.packet.test.util; + +import static org.junit.Assert.assertTrue; + +import java.util.HashSet; +import java.util.Set; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.PacketValidationFailureException; +import io.mosip.commons.packet.util.PacketValidator; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PacketValidatorTest { + + @Autowired + private PacketValidator packetValidator; + + @Test + public void testValidate() throws PacketValidationFailureException { + Set tags = new HashSet<>(); + tags.add("test-tag"); + packetValidator.validate(tags, "test-tag-to-validate"); + assertTrue(true); + } + + @Test(expected = PacketValidationFailureException.class) + public void testValidateFailure() throws PacketValidationFailureException { + Set tags = new HashSet<>(); + tags.add("test-tag"); + packetValidator.validate(tags, "invalid-tag"); + } +} diff --git a/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/ZipUtilsTest.java b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/ZipUtilsTest.java new file mode 100644 index 0000000000..c8a0384777 --- /dev/null +++ b/commons-packet/commons-packet-manager/src/test/java/io/mosip/commons/packet/test/util/ZipUtilsTest.java @@ -0,0 +1,36 @@ +package io.mosip.commons.packet.test.util; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Map; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.exception.ZipParsingException; +import io.mosip.commons.packet.util.ZipUtils; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ZipUtilsTest { + + @Test + public void testUnzip() throws IOException, ZipParsingException { + // Create a dummy zip file + byte[] zipData = new byte[] { 80, 75, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + Map unzippedFiles = ZipUtils.unzip(new ByteArrayInputStream(zipData)); + assertNotNull(unzippedFiles); + } + + @Test + public void testZip() throws IOException { + byte[] zipData = ZipUtils.zip(null); + assertNotNull(zipData); + assertTrue(zipData.length > 0); + } +} diff --git a/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketManagerControllerTest.java b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketManagerControllerTest.java index 8daf396a52..2a7e709555 100644 --- a/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketManagerControllerTest.java +++ b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketManagerControllerTest.java @@ -237,7 +237,6 @@ public void testValidatePacket() throws Exception { @Test @WithUserDetails("reg-processor") - @Ignore public void testCreatePacket() throws Exception { PacketDto packetDto = new PacketDto(); packetDto.setId("id"); @@ -249,14 +248,13 @@ public void testCreatePacket() throws Exception { request.setRequest(packetDto); - this.mockMvc.perform(put("/createPacket").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + this.mockMvc.perform(put("/create").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) .andExpect(status().isOk()); } @Test @WithUserDetails("reg-processor") - @Ignore public void testBaseUncheckedException() throws Exception { PacketDto packetDto = new PacketDto(); packetDto.setId("id"); @@ -268,13 +266,12 @@ public void testBaseUncheckedException() throws Exception { request.setRequest(packetDto); - this.mockMvc.perform(put("/createPacket").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) - .andExpect(status().isOk()); + this.mockMvc.perform(put("/create").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().is4xxClientError()); } @Test @WithUserDetails("reg-processor") - @Ignore public void testBaseCheckedException() throws Exception { InfoDto infoDto = new InfoDto(); infoDto.setBypassCache(false); @@ -282,7 +279,7 @@ public void testBaseCheckedException() throws Exception { infoDto.setProcess("NEW"); infoDto.setSource("REGISTRATION"); - Mockito.when(packetReaderService.getSourceAndProcess(any(),any(),any(),any())).thenReturn(new SourceProcessDto("source", "process")); + Mockito.when(packetReaderService.getSourceAndProcess(any(),any(),any())).thenReturn(new SourceProcessDto("source", "process")); Mockito.when( packetReader.getAudits(anyString(), anyString(), anyString(), anyBoolean())).thenThrow(new BaseCheckedException("errorCode", "errorMessage")); @@ -290,7 +287,7 @@ public void testBaseCheckedException() throws Exception { request.setRequest(infoDto); this.mockMvc.perform(post("/audits").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) - .andExpect(status().isOk()); + .andExpect(status().is4xxClientError()); } @Test @WithUserDetails("reg-processor") diff --git a/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketReaderControllerTest.java b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketReaderControllerTest.java new file mode 100644 index 0000000000..f88b44d433 --- /dev/null +++ b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketReaderControllerTest.java @@ -0,0 +1,254 @@ +package io.mosip.commons.packetmanager.test.controller; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.util.ArrayList; +import java.util.HashMap; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.MediaType; +import org.springframework.security.test.context.support.WithUserDetails; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.web.client.RestTemplate; + +import com.google.common.collect.Lists; + +import io.mosip.commons.packet.dto.Document; +import io.mosip.commons.packet.dto.TagRequestDto; +import io.mosip.commons.packet.dto.TagResponseDto; +import io.mosip.commons.packet.facade.PacketReader; +import io.mosip.commons.packetmanager.dto.BiometricRequestDto; +import io.mosip.commons.packetmanager.dto.DocumentDto; +import io.mosip.commons.packetmanager.dto.FieldDto; +import io.mosip.commons.packetmanager.dto.FieldDtos; +import io.mosip.commons.packetmanager.dto.InfoDto; +import io.mosip.commons.packetmanager.dto.InfoRequestDto; +import io.mosip.commons.packetmanager.dto.InfoResponseDto; +import io.mosip.commons.packetmanager.dto.SourceProcessDto; +import io.mosip.commons.packetmanager.service.PacketReaderService; +import io.mosip.commons.packetmanager.test.TestBootApplication; +import io.mosip.kernel.biometrics.entities.BiometricRecord; +import io.mosip.kernel.core.exception.BaseCheckedException; +import io.mosip.kernel.core.http.RequestWrapper; +import io.mosip.kernel.core.util.JsonUtils; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = TestBootApplication.class) +@AutoConfigureMockMvc +public class PacketReaderControllerTest { + + @MockBean + private RestTemplate restTemplate; + + @Autowired + private MockMvc mockMvc; + + @MockBean + private PacketReader packetReader; + + @MockBean + private PacketReaderService packetReaderService; + + private RequestWrapper request = new RequestWrapper<>(); + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + Mockito.when(packetReaderService.getSourceAndProcess(any(),any(),any(),any())).thenReturn(new SourceProcessDto("source", "process")); + Mockito.when(packetReaderService.getSourceAndProcess(any(),any(),any())).thenReturn(new SourceProcessDto("source", "process")); + } + + @Test + @WithUserDetails("reg-processor") + public void testSearchField() throws Exception { + String value = "value"; + FieldDto fieldDto = new FieldDto(); + fieldDto.setField("name"); + fieldDto.setBypassCache(false); + fieldDto.setId("id"); + fieldDto.setProcess("NEW"); + fieldDto.setSource("REGISTRATION"); + + Mockito.when( + packetReader.getField(anyString(), anyString(), anyString(), anyString(), anyBoolean())).thenReturn(value); + + request.setRequest(fieldDto); + + this.mockMvc.perform(post("/field").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + + @Test + @WithUserDetails("reg-processor") + public void testSearchFields() throws Exception { + FieldDtos fieldDto = new FieldDtos(); + fieldDto.setFields(Lists.newArrayList("fullname", "email")); + fieldDto.setBypassCache(false); + fieldDto.setId("id"); + fieldDto.setProcess("NEW"); + fieldDto.setSource("REGISTRATION"); + + Mockito.when( + packetReader.getFields(anyString(), any(), anyString(), anyString(), anyBoolean())).thenReturn(new HashMap<>()); + + request.setRequest(fieldDto); + + this.mockMvc.perform(post("/fields").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + + @Test + @WithUserDetails("reg-processor") + public void testDocument() throws Exception { + DocumentDto documentDto = new DocumentDto(); + documentDto.setDocumentName("document"); + documentDto.setId("id"); + documentDto.setProcess("NEW"); + documentDto.setSource("REGISTRATION"); + + Mockito.when( + packetReader.getDocument(anyString(), anyString(), anyString(), anyString())).thenReturn(new Document()); + + request.setRequest(documentDto); + + this.mockMvc.perform(post("/document").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + + @Test + @WithUserDetails("reg-processor") + public void testBiometrics() throws Exception { + BiometricRequestDto biometricRequestDto = new BiometricRequestDto(); + biometricRequestDto.setPerson("applicant"); + biometricRequestDto.setId("id"); + biometricRequestDto.setProcess("NEW"); + biometricRequestDto.setSource("REGISTRATION"); + + Mockito.when( + packetReader.getBiometric(anyString(), anyString(), any(), anyString(), anyString(), anyBoolean())).thenReturn(new BiometricRecord()); + + request.setRequest(biometricRequestDto); + + this.mockMvc.perform(post("/biometrics").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + + @Test + @WithUserDetails("reg-processor") + public void testMetaInfo() throws Exception { + InfoDto infoDto = new InfoDto(); + infoDto.setBypassCache(false); + infoDto.setId("id"); + infoDto.setProcess("NEW"); + infoDto.setSource("REGISTRATION"); + + Mockito.when( + packetReader.getMetaInfo(anyString(), anyString(), anyString(), anyBoolean())).thenReturn(new HashMap<>()); + + request.setRequest(infoDto); + + this.mockMvc.perform(post("/metainfo").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + + @Test + @WithUserDetails("reg-processor") + public void testAudits() throws Exception { + InfoDto infoDto = new InfoDto(); + infoDto.setBypassCache(false); + infoDto.setId("id"); + infoDto.setProcess("NEW"); + infoDto.setSource("REGISTRATION"); + + Mockito.when( + packetReader.getAudits(anyString(), anyString(), anyString(), anyBoolean())).thenReturn(new ArrayList<>()); + + request.setRequest(infoDto); + + this.mockMvc.perform(post("/audits").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + + @Test + @WithUserDetails("reg-processor") + public void testValidatePacket() throws Exception { + InfoDto infoDto = new InfoDto(); + infoDto.setBypassCache(false); + infoDto.setId("id"); + infoDto.setProcess("NEW"); + infoDto.setSource("REGISTRATION"); + + Mockito.when( + packetReader.validatePacket(anyString(), anyString(), anyString())).thenReturn(true); + + request.setRequest(infoDto); + + this.mockMvc.perform(post("/validate").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + + @Test + @WithUserDetails("reg-processor") + public void testBaseCheckedException() throws Exception { + InfoDto infoDto = new InfoDto(); + infoDto.setBypassCache(false); + infoDto.setId("id"); + infoDto.setProcess("NEW"); + infoDto.setSource("REGISTRATION"); + + Mockito.when( + packetReader.getAudits(anyString(), anyString(), anyString(), anyBoolean())).thenThrow(new BaseCheckedException("errorCode", "errorMessage")); + + request.setRequest(infoDto); + + this.mockMvc.perform(post("/audits").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().is4xxClientError()); + } + + @Test + @WithUserDetails("reg-processor") + public void testGetTags() throws Exception { + TagRequestDto tagDto = new TagRequestDto(); + tagDto.setId("id"); + + Mockito.when( + packetReaderService.getTags(any())).thenReturn(new TagResponseDto()); + + request.setRequest(tagDto); + + this.mockMvc.perform(post("/tags").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + + @Test + @WithUserDetails("reg-processor") + public void testInfo() throws Exception { + InfoRequestDto infoDto = new InfoRequestDto(); + infoDto.setId("id"); + + InfoResponseDto infoResponseDto = new InfoResponseDto(); + infoResponseDto.setPacketId(infoDto.getId()); + infoResponseDto.setApplicationId(infoDto.getId()); + + Mockito.when( + packetReaderService.info(anyString())).thenReturn(infoResponseDto); + + request.setRequest(infoDto); + + this.mockMvc.perform(post("/info").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } +} diff --git a/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketWriterControllerTest.java b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketWriterControllerTest.java new file mode 100644 index 0000000000..b23b2c6e97 --- /dev/null +++ b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/controller/PacketWriterControllerTest.java @@ -0,0 +1,144 @@ +package io.mosip.commons.packetmanager.test.controller; + +import static org.mockito.ArgumentMatchers.any; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.MediaType; +import org.springframework.security.test.context.support.WithUserDetails; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.web.client.RestTemplate; + +import io.mosip.commons.packet.dto.TagDeleteResponseDto; +import io.mosip.commons.packet.dto.TagDto; +import io.mosip.commons.packet.dto.TagRequestDto; +import io.mosip.commons.packet.dto.TagResponseDto; +import io.mosip.commons.packet.dto.packet.PacketDto; +import io.mosip.commons.packet.facade.PacketWriter; +import io.mosip.commons.packetmanager.service.PacketWriterService; +import io.mosip.commons.packetmanager.test.TestBootApplication; +import io.mosip.kernel.core.exception.BaseUncheckedException; +import io.mosip.kernel.core.http.RequestWrapper; +import io.mosip.kernel.core.util.JsonUtils; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = TestBootApplication.class) +@AutoConfigureMockMvc +public class PacketWriterControllerTest { + + @MockBean + private RestTemplate restTemplate; + + @Autowired + private MockMvc mockMvc; + + @MockBean + private PacketWriter packetWriter; + + @MockBean + private PacketWriterService packetWriterService; + + private RequestWrapper request = new RequestWrapper<>(); + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + @Test + @WithUserDetails("reg-processor") + public void testCreatePacket() throws Exception { + PacketDto packetDto = new PacketDto(); + packetDto.setId("id"); + packetDto.setProcess("NEW"); + packetDto.setSource("REGISTRATION"); + + Mockito.when( + packetWriter.createPacket(any())).thenReturn(new ArrayList<>()); + + request.setRequest(packetDto); + + this.mockMvc.perform(put("/create").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + + @Test + @WithUserDetails("reg-processor") + public void testBaseUncheckedException() throws Exception { + PacketDto packetDto = new PacketDto(); + packetDto.setId("id"); + packetDto.setProcess("NEW"); + packetDto.setSource("REGISTRATION"); + + Mockito.when( + packetWriter.createPacket(any())).thenThrow(new BaseUncheckedException("errorCode", "errorMessage")); + + request.setRequest(packetDto); + + this.mockMvc.perform(put("/create").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().is4xxClientError()); + } + + @Test + @WithUserDetails("reg-processor") + public void testAddTag() throws Exception { + TagDto tagDto = new TagDto(); + tagDto.setId("id"); + + Mockito.when( + packetWriterService.addTags(any())).thenReturn(new TagResponseDto()); + + request.setRequest(tagDto); + + this.mockMvc.perform(post("/tags").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + @Test + @WithUserDetails("reg-processor") + public void testUpdateTags() throws Exception { + TagDto tagDto = new TagDto(); + tagDto.setId("id"); + + Mockito.when( + packetWriterService.updateTags(any())).thenReturn(new TagResponseDto()); + + request.setRequest(tagDto); + + this.mockMvc.perform(put("/tags").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } + + @Test + @WithUserDetails("reg-processor") + public void testDeleteTags() throws Exception { + TagRequestDto tagRequestDto = new TagRequestDto(); + tagRequestDto.setId("id"); + List tagNames=new ArrayList<>(); + tagNames.add("osivalidation"); + tagRequestDto.setTagNames(tagNames); + TagDeleteResponseDto tagResponse=new TagDeleteResponseDto(); + tagResponse.setStatus("Deleted Successfully"); + Mockito.when( + packetWriterService.deleteTags(any())).thenReturn(tagResponse); + + request.setRequest(tagRequestDto); + + this.mockMvc.perform(delete("/tags").contentType(MediaType.APPLICATION_JSON).content(JsonUtils.javaObjectToJsonString(request))) + .andExpect(status().isOk()); + } +} diff --git a/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/exception/SourceNotPresentExceptionTest.java b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/exception/SourceNotPresentExceptionTest.java new file mode 100644 index 0000000000..ea35ff8c78 --- /dev/null +++ b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/exception/SourceNotPresentExceptionTest.java @@ -0,0 +1,27 @@ +package io.mosip.commons.packetmanager.test.exception; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packetmanager.exception.SourceNotPresentException; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class SourceNotPresentExceptionTest { + + @Test + public void testSourceNotPresentException() { + SourceNotPresentException exception = new SourceNotPresentException("test-message"); + assertEquals("test-message", exception.getMessage()); + } + + @Test + public void testSourceNotPresentExceptionWithCause() { + SourceNotPresentException exception = new SourceNotPresentException("test-message", new Throwable()); + assertEquals("test-message", exception.getMessage()); + } +} diff --git a/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/service/PacketReaderServiceTest.java b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/service/PacketReaderServiceTest.java index e8967af9f5..4af9577b8f 100644 --- a/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/service/PacketReaderServiceTest.java +++ b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/service/PacketReaderServiceTest.java @@ -165,4 +165,31 @@ public void testGetTagsException() { tagRequestDto.setTagNames(tagNames); packetReaderService.getTags(tagRequestDto); } + + @Test + public void testGetBiometric() throws Exception { + BiometricRecord biometricRecord = packetReaderService.getBiometric("id", "source", "process", "type", null, false); + assertEquals(1, biometricRecord.getSegments().size()); + } + + @Test + public void testGetDocument() throws Exception { + Mockito.when(packetReader.getDocument(anyString(), anyString(), anyString(), anyString(), anyBoolean())).thenReturn("test".getBytes()); + byte[] document = packetReaderService.getDocument("id", "source", "process", "type", false); + assertEquals("test", new String(document)); + } + + @Test + public void testGetAll() throws Exception { + Mockito.when(packetReader.getAll(anyString(), anyString(), anyString(), anyBoolean())).thenReturn("test".getBytes()); + byte[] all = packetReaderService.getAll("id", "source", "process", false); + assertEquals("test", new String(all)); + } + + @Test + public void testGetAllMeta() throws Exception { + Mockito.when(packetReader.getAllMeta(anyString(), anyString(), anyString(), anyBoolean())).thenReturn("test".getBytes()); + byte[] allMeta = packetReaderService.getAllMeta("id", "source", "process", false); + assertEquals("test", new String(allMeta)); + } } diff --git a/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/service/PacketWriterServiceTest.java b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/service/PacketWriterServiceTest.java index b48d24f62e..72e16ee7a4 100644 --- a/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/service/PacketWriterServiceTest.java +++ b/commons-packet/commons-packet-service/src/test/java/io/mosip/commons/packetmanager/test/service/PacketWriterServiceTest.java @@ -1,128 +1,138 @@ -package io.mosip.commons.packetmanager.test.service; - -import static org.junit.Assert.assertEquals; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.springframework.test.context.junit4.SpringRunner; - -import io.mosip.commons.packet.dto.TagDto; -import io.mosip.commons.packet.dto.TagRequestDto; -import io.mosip.commons.packet.dto.TagResponseDto; -import io.mosip.commons.packet.exception.TagCreationException; -import io.mosip.commons.packet.exception.TagDeletionException; -import io.mosip.commons.packet.facade.PacketReader; -import io.mosip.commons.packet.facade.PacketWriter; -import io.mosip.commons.packetmanager.service.PacketWriterService; -import io.mosip.kernel.core.exception.BaseUncheckedException; - -@RunWith(SpringRunner.class) -public class PacketWriterServiceTest { - @Mock - private PacketReader packetReader; - - @Mock - private PacketWriter packetWriter; - - @InjectMocks - private PacketWriterService packetWriterService; - - @Before - public void setup() { - Map tags = new HashMap<>(); - tags.put("test", "testValue"); - Mockito.when(packetReader.getTags(anyString())).thenReturn(tags); - - } - - @Test - public void testAddTagsSuccess() { - TagDto tagDto=new TagDto(); - tagDto.setId("id"); - Map tags = new HashMap<>(); - tags.put("testtag", "testValue"); - tagDto.setTags(tags); - Mockito.when(packetWriter.addTags(any(),anyString())).thenReturn(tags); - TagResponseDto tagResponseDto= packetWriterService.addTags(tagDto); - assertEquals(tagResponseDto.getTags(), tags); - } - @Test(expected = TagCreationException.class) - public void testTagAlreadyExists() { - TagDto tagDto = new TagDto(); - tagDto.setId("id"); - Map tags = new HashMap<>(); - tags.put("test", "testValue"); - tagDto.setTags(tags); - Mockito.when(packetWriter.addTags(any(),anyString())).thenReturn(tags); - packetWriterService.addTags(tagDto); - } - - @Test(expected = TagCreationException.class) - public void testAddTagsException() { - TagDto tagDto = new TagDto(); - tagDto.setId("id"); - Map tags = new HashMap<>(); - tags.put("testtag", "testValue"); - tagDto.setTags(tags); - Mockito.when(packetWriter.addTags(any(),anyString())).thenThrow(new BaseUncheckedException("code", "message")); - packetWriterService.addTags(tagDto); - } - - @Test - public void testUpdateTagsSuccess() { - TagDto tagDto = new TagDto(); - tagDto.setId("id"); - Map tags = new HashMap<>(); - tags.put("test", "testValueChanges"); - tagDto.setTags(tags); - Mockito.when(packetWriter.addTags(any(),anyString())).thenReturn(tags); - TagResponseDto tagResponseDto = packetWriterService.updateTags(tagDto); - assertEquals(tagResponseDto.getTags(), tags); - } - - @Test(expected = TagCreationException.class) - public void testUpdateTagsException() { - TagDto tagDto = new TagDto(); - tagDto.setId("id"); - Map tags = new HashMap<>(); - tags.put("testtag", "testValue"); - tagDto.setTags(tags); - Mockito.when(packetWriter.addTags(any(),anyString())).thenThrow(new BaseUncheckedException("code", "message")); - packetWriterService.updateTags(tagDto); - } - - @Test - public void testDeleteTagsSuccess() { - TagRequestDto tagRequestDto = new TagRequestDto(); - tagRequestDto.setId("id"); - List tagNames = new ArrayList(); - tagNames.add("test"); - tagRequestDto.setTagNames(tagNames); - packetWriterService.deleteTags(tagRequestDto); - - } - - @Test(expected = TagDeletionException.class) - public void testDeleteTagsException() { - TagRequestDto tagRequestDto = new TagRequestDto(); - tagRequestDto.setId("id"); - List tagNames = new ArrayList(); - tagNames.add("test"); - tagRequestDto.setTagNames(tagNames); - Mockito.doThrow(new BaseUncheckedException("code", "message")).when(packetWriter).deleteTags(any(),anyString()); - - packetWriterService.deleteTags(tagRequestDto); - - } -} +package io.mosip.commons.packetmanager.test.service; + +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.test.context.junit4.SpringRunner; + +import io.mosip.commons.packet.dto.TagDto; +import io.mosip.commons.packet.dto.TagRequestDto; +import io.mosip.commons.packet.dto.TagResponseDto; +import io.mosip.commons.packet.exception.TagCreationException; +import io.mosip.commons.packet.exception.TagDeletionException; +import io.mosip.commons.packet.facade.PacketReader; +import io.mosip.commons.packet.facade.PacketWriter; +import io.mosip.commons.packetmanager.service.PacketWriterService; +import io.mosip.kernel.core.exception.BaseUncheckedException; + +@RunWith(SpringRunner.class) +public class PacketWriterServiceTest { + @Mock + private PacketReader packetReader; + + @Mock + private PacketWriter packetWriter; + + @InjectMocks + private PacketWriterService packetWriterService; + + @Before + public void setup() { + Map tags = new HashMap<>(); + tags.put("test", "testValue"); + Mockito.when(packetReader.getTags(anyString())).thenReturn(tags); + + } + + @Test + public void testAddTagsSuccess() { + TagDto tagDto=new TagDto(); + tagDto.setId("id"); + Map tags = new HashMap<>(); + tags.put("testtag", "testValue"); + tagDto.setTags(tags); + Mockito.when(packetWriter.addTags(any(),anyString())).thenReturn(tags); + TagResponseDto tagResponseDto= packetWriterService.addTags(tagDto); + assertEquals(tagResponseDto.getTags(), tags); + } + @Test(expected = TagCreationException.class) + public void testTagAlreadyExists() { + TagDto tagDto = new TagDto(); + tagDto.setId("id"); + Map tags = new HashMap<>(); + tags.put("test", "testValue"); + tagDto.setTags(tags); + Mockito.when(packetWriter.addTags(any(),anyString())).thenReturn(tags); + packetWriterService.addTags(tagDto); + } + + @Test(expected = TagCreationException.class) + public void testAddTagsException() { + TagDto tagDto = new TagDto(); + tagDto.setId("id"); + Map tags = new HashMap<>(); + tags.put("testtag", "testValue"); + tagDto.setTags(tags); + Mockito.when(packetWriter.addTags(any(),anyString())).thenThrow(new BaseUncheckedException("code", "message")); + packetWriterService.addTags(tagDto); + } + + @Test + public void testUpdateTagsSuccess() { + TagDto tagDto = new TagDto(); + tagDto.setId("id"); + Map tags = new HashMap<>(); + tags.put("test", "testValueChanges"); + tagDto.setTags(tags); + Mockito.when(packetWriter.addTags(any(),anyString())).thenReturn(tags); + TagResponseDto tagResponseDto = packetWriterService.updateTags(tagDto); + assertEquals(tagResponseDto.getTags(), tags); + } + + @Test(expected = TagCreationException.class) + public void testUpdateTagsException() { + TagDto tagDto = new TagDto(); + tagDto.setId("id"); + Map tags = new HashMap<>(); + tags.put("testtag", "testValue"); + tagDto.setTags(tags); + Mockito.when(packetWriter.addTags(any(),anyString())).thenThrow(new BaseUncheckedException("code", "message")); + packetWriterService.updateTags(tagDto); + } + + @Test + public void testDeleteTagsSuccess() { + TagRequestDto tagRequestDto = new TagRequestDto(); + tagRequestDto.setId("id"); + List tagNames = new ArrayList(); + tagNames.add("test"); + tagRequestDto.setTagNames(tagNames); + packetWriterService.deleteTags(tagRequestDto); + + } + + @Test(expected = TagDeletionException.class) + public void testDeleteTagsException() { + TagRequestDto tagRequestDto = new TagRequestDto(); + tagRequestDto.setId("id"); + List tagNames = new ArrayList(); + tagNames.add("test"); + tagRequestDto.setTagNames(tagNames); + Mockito.doThrow(new BaseUncheckedException("code", "message")).when(packetWriter).deleteTags(any(),anyString()); + + packetWriterService.deleteTags(tagRequestDto); + + } + + @Test(expected = TagDeletionException.class) + public void testDeleteTagNotFound() { + TagRequestDto tagRequestDto = new TagRequestDto(); + tagRequestDto.setId("id"); + List tagNames = new ArrayList(); + tagNames.add("testtag"); + tagRequestDto.setTagNames(tagNames); + packetWriterService.deleteTags(tagRequestDto); + } +} From a4ce536d7f6f492baea4280a9f5bfd01c3ddc5ed Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 06:09:30 +0000 Subject: [PATCH 27/29] I am working on adding JUnit tests for commons-packet and commons-packet-service. From f146c75a32bf996576096b66050096e8981d51c0 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 06:09:41 +0000 Subject: [PATCH 28/29] I am working on adding JUnit tests for commons-packet and commons-packet-service. From d8a4cb0eee0eeaa8c81653ccad4ec02fdcf316ab Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 06:09:52 +0000 Subject: [PATCH 29/29] I am working on adding JUnit tests for commons-packet and commons-packet-service.