From ac2be29c232442df72fb5c4fecc5a29705d0af33 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
Date: Mon, 21 Mar 2022 20:35:35 +0530
Subject: [PATCH 01/96] Merge develop to 1.2.0.1 1 (#285)
* Mosip 19917 fix resident uin update develop (#279)
* Fixed current datetime logic, as existing one wont gaurentee ISO format
* Corrected pom version
* Fix datetime logic
* Mosip 19916 fix loading phon/email attrib based on mapping json (#283)
* Fix to use configured attrib mapping for phone and email
* Fix merge issues
* Removed unwanted req attrib
* Corrected pom dependency
---
resident/resident-service/pom.xml | 12 +++
.../ResidentVidExceptionHandler.java | 3 +-
.../exception/VidAlreadyPresentException.java | 9 +-
.../service/ResidentUpdateService.java | 10 +--
.../handler/service/SyncAndUploadService.java | 5 --
.../service/UinCardRePrintService.java | 74 ++++++++++-------
.../resident/service/NotificationService.java | 11 ++-
.../service/impl/IdAuthServiceImpl.java | 5 +-
.../impl/ResidentCredentialServiceImpl.java | 4 +-
.../service/impl/ResidentVidServiceImpl.java | 22 +++--
.../mosip/resident/util/TokenGenerator.java | 3 +-
.../resident/util/UINCardDownloadService.java | 4 +-
.../io/mosip/resident/util/Utilities.java | 83 ++++++++++++++-----
.../test/service/NotificationServiceTest.java | 8 +-
14 files changed, 164 insertions(+), 89 deletions(-)
diff --git a/resident/resident-service/pom.xml b/resident/resident-service/pom.xml
index c32893cb3f5..1e40b01d467 100644
--- a/resident/resident-service/pom.xml
+++ b/resident/resident-service/pom.xml
@@ -18,6 +18,8 @@
1.2.0.1-SNAPSHOT
1.5.10
UTF-8
+ 2.12.0
+ 2.12.0
@@ -156,6 +158,16 @@
netty-all
4.1.72.Final
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+ ${fasterxml.jackson.module.jsr310.version}
+
+
+ com.fasterxml.jackson.module
+ jackson-module-afterburner
+ ${fasterxml.jackson.module.afterburner.version}
+
diff --git a/resident/resident-service/src/main/java/io/mosip/resident/exception/ResidentVidExceptionHandler.java b/resident/resident-service/src/main/java/io/mosip/resident/exception/ResidentVidExceptionHandler.java
index c3a52f5c1fa..d476a9f24ae 100644
--- a/resident/resident-service/src/main/java/io/mosip/resident/exception/ResidentVidExceptionHandler.java
+++ b/resident/resident-service/src/main/java/io/mosip/resident/exception/ResidentVidExceptionHandler.java
@@ -1,5 +1,6 @@
package io.mosip.resident.exception;
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -134,7 +135,7 @@ private ResponseEntity