From b0b073934646d59180fcbc9641a53ec02014d469 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 26 Aug 2025 12:53:02 +0530 Subject: [PATCH 1/6] DateUtills Changes [MOSIP-42819] Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../controller/test/AuditManagerProxyControllerTest.java | 5 ++--- .../packetstatusupdater/AuditManagerProxyServiceTest.java | 5 ++++- .../io/mosip/hotlist/builder/AuditRequestBuilderTest.java | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/admin/admin-service/src/test/java/io/mosip/admin/controller/test/AuditManagerProxyControllerTest.java b/admin/admin-service/src/test/java/io/mosip/admin/controller/test/AuditManagerProxyControllerTest.java index f38f396797e..d6be786e06c 100644 --- a/admin/admin-service/src/test/java/io/mosip/admin/controller/test/AuditManagerProxyControllerTest.java +++ b/admin/admin-service/src/test/java/io/mosip/admin/controller/test/AuditManagerProxyControllerTest.java @@ -6,6 +6,7 @@ import io.mosip.admin.packetstatusupdater.dto.AuditManagerRequestDto; import io.mosip.admin.util.AdminDataUtil; import io.mosip.kernel.core.http.RequestWrapper; +import io.mosip.kernel.core.util.DateUtils; import io.mosip.kernel.core.websub.model.EventModel; import io.mosip.kernel.core.websub.spi.PublisherClient; import org.junit.Before; @@ -29,8 +30,6 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.web.client.RestTemplate; -import java.time.LocalDateTime; -import java.time.ZoneOffset; import java.util.List; import java.util.Map; @@ -69,7 +68,7 @@ public void setUp() { mapper.registerModule(new JavaTimeModule()); AuditManagerRequestDto auditManagerRequestDto = new AuditManagerRequestDto(); - auditManagerRequestDto.setActionTimeStamp(LocalDateTime.now(ZoneOffset.UTC)); + auditManagerRequestDto.setActionTimeStamp(DateUtils.getUTCCurrentDateTime()); auditManagerRequestDto.setDescription("Test description"); auditManagerRequestDto.setApplicationName("Admin Portal"); diff --git a/admin/admin-service/src/test/java/io/mosip/admin/packetstatusupdater/AuditManagerProxyServiceTest.java b/admin/admin-service/src/test/java/io/mosip/admin/packetstatusupdater/AuditManagerProxyServiceTest.java index 162db2012e3..f3db0adfb00 100644 --- a/admin/admin-service/src/test/java/io/mosip/admin/packetstatusupdater/AuditManagerProxyServiceTest.java +++ b/admin/admin-service/src/test/java/io/mosip/admin/packetstatusupdater/AuditManagerProxyServiceTest.java @@ -4,6 +4,7 @@ import io.mosip.admin.packetstatusupdater.dto.AuditManagerRequestDto; import io.mosip.admin.packetstatusupdater.exception.MasterDataServiceException; import io.mosip.admin.packetstatusupdater.service.impl.AuditManagerProxyServiceImpl; +import io.mosip.kernel.core.util.DateUtils; import jakarta.servlet.http.HttpServletRequest; import org.junit.Assert; import org.junit.Before; @@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.test.context.support.WithUserDetails; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.util.ReflectionTestUtils; @@ -68,8 +70,9 @@ public void setUp() { @WithUserDetails("zonal-admin") public void auditLogTest() { AuditManagerRequestDto auditManagerRequestDto = new AuditManagerRequestDto(); - auditManagerRequestDto.setActionTimeStamp(LocalDateTime.now(ZoneOffset.UTC)); + auditManagerRequestDto.setActionTimeStamp(DateUtils.getUTCCurrentDateTime()); auditManagerRequestDto.setDescription("Test description"); + auditManagerRequestDto.setCreatedBy(SecurityContextHolder.getContext().getAuthentication().getName()); auditManagerRequestDto.setApplicationName("Admin Portal"); auditManagerRequestDto.setApplicationId("10009"); diff --git a/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java b/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java index 7f6c15ffa74..2fb826d2652 100644 --- a/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java +++ b/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java @@ -4,6 +4,7 @@ import io.mosip.hotlist.constant.AuditModules; import io.mosip.hotlist.dto.AuditRequestDTO; import io.mosip.kernel.core.http.RequestWrapper; +import io.mosip.kernel.core.util.DateUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,7 +48,7 @@ public void before() { public void testBuildRequest() { RequestWrapper actualRequest = auditBuilder.buildRequest(AuditModules.HOTLIST_SERVICE, AuditEvents.BLOCK_REQUEST, "id", "RID", "desc"); - actualRequest.getRequest().setActionTimeStamp(null); + actualRequest.getRequest().setActionTimeStamp(DateUtils.getUTCCurrentDateTime()); AuditRequestDTO expectedRequest = new AuditRequestDTO(); try { InetAddress inetAddress = InetAddress.getLocalHost(); From f8ead622b998554dfe71e863791a211caf1329ea Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 26 Aug 2025 13:18:31 +0530 Subject: [PATCH 2/6] test case fixes Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java b/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java index 2fb826d2652..c3f3f2910da 100644 --- a/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java +++ b/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java @@ -56,7 +56,7 @@ public void testBuildRequest() { expectedRequest.setEventId(AuditEvents.BLOCK_REQUEST.getEventId()); expectedRequest.setEventName(AuditEvents.BLOCK_REQUEST.getEventName()); expectedRequest.setEventType(AuditEvents.BLOCK_REQUEST.getEventType()); - expectedRequest.setActionTimeStamp(null); + expectedRequest.setActionTimeStamp(DateUtils.getUTCCurrentDateTime()); expectedRequest.setHostName(inetAddress.getHostName()); expectedRequest.setHostIp(inetAddress.getHostAddress()); expectedRequest.setApplicationId("HOTLIST"); From 34b05ae1efc1553f13ccf0beb8e51f799150548d Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 26 Aug 2025 14:05:26 +0530 Subject: [PATCH 3/6] Update AuditRequestBuilderTest.java Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .../io/mosip/hotlist/builder/AuditRequestBuilderTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java b/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java index c3f3f2910da..af5f102885b 100644 --- a/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java +++ b/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java @@ -20,6 +20,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; +import java.time.LocalDateTime; import static org.junit.Assert.assertEquals; @@ -48,7 +49,9 @@ public void before() { public void testBuildRequest() { RequestWrapper actualRequest = auditBuilder.buildRequest(AuditModules.HOTLIST_SERVICE, AuditEvents.BLOCK_REQUEST, "id", "RID", "desc"); - actualRequest.getRequest().setActionTimeStamp(DateUtils.getUTCCurrentDateTime()); + LocalDateTime utcNow = DateUtils.getUTCCurrentDateTime(); + actualRequest.getRequest().setActionTimeStamp(utcNow); + AuditRequestDTO expectedRequest = new AuditRequestDTO(); try { InetAddress inetAddress = InetAddress.getLocalHost(); @@ -56,7 +59,7 @@ public void testBuildRequest() { expectedRequest.setEventId(AuditEvents.BLOCK_REQUEST.getEventId()); expectedRequest.setEventName(AuditEvents.BLOCK_REQUEST.getEventName()); expectedRequest.setEventType(AuditEvents.BLOCK_REQUEST.getEventType()); - expectedRequest.setActionTimeStamp(DateUtils.getUTCCurrentDateTime()); + expectedRequest.setActionTimeStamp(utcNow); expectedRequest.setHostName(inetAddress.getHostName()); expectedRequest.setHostIp(inetAddress.getHostAddress()); expectedRequest.setApplicationId("HOTLIST"); From 23b3302922c5cc6d032c5c49ec9001b550d21a89 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Fri, 29 Aug 2025 12:00:29 +0530 Subject: [PATCH 4/6] Version changes Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- admin/admin-service/pom.xml | 12 ++++++------ .../AuditManagerProxyServiceTest.java | 2 +- admin/hotlist-service/pom.xml | 12 ++++++------ admin/kernel-masterdata-service/pom.xml | 12 ++++++------ admin/kernel-syncdata-service/pom.xml | 14 +++++++------- admin/pom.xml | 8 ++++---- api-test/pom.xml | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/admin/admin-service/pom.xml b/admin/admin-service/pom.xml index 935d8c46301..6b0b6d5cd4a 100644 --- a/admin/admin-service/pom.xml +++ b/admin/admin-service/pom.xml @@ -7,18 +7,18 @@ io.mosip.admin admin-parent - 1.3.0-beta.2 + 1.3.1-SNAPSHOT admin-service admin-service - 1.3.0-beta.2 + 1.3.1-SNAPSHOT http://maven.apache.org jar UTF-8 1.8.0 - 1.3.0-beta.2 - 1.3.0-beta.2 + 1.3.1-SNAPSHOT + 1.2.2-SNAPSHOT 21 21 3.8.0 @@ -29,8 +29,8 @@ 3.7.0.1746 2.3 2.22.0 - 1.3.0-beta.1 - 1.3.0-beta.1 + 1.3.1-SNAPSHOT + 1.3.1-SNAPSHOT 3.1.1 0.7.0 diff --git a/admin/admin-service/src/test/java/io/mosip/admin/packetstatusupdater/AuditManagerProxyServiceTest.java b/admin/admin-service/src/test/java/io/mosip/admin/packetstatusupdater/AuditManagerProxyServiceTest.java index f3db0adfb00..05884d5807e 100644 --- a/admin/admin-service/src/test/java/io/mosip/admin/packetstatusupdater/AuditManagerProxyServiceTest.java +++ b/admin/admin-service/src/test/java/io/mosip/admin/packetstatusupdater/AuditManagerProxyServiceTest.java @@ -94,7 +94,7 @@ public void auditLogTest() { @Test public void auditLogEmptyValuesTest() { AuditManagerRequestDto auditManagerRequestDto = new AuditManagerRequestDto(); - auditManagerRequestDto.setActionTimeStamp(LocalDateTime.now(ZoneOffset.UTC)); + auditManagerRequestDto.setActionTimeStamp(DateUtils.getUTCCurrentDateTime()); auditManagerRequestDto.setDescription("Test description"); auditManagerRequestDto.setApplicationName(""); diff --git a/admin/hotlist-service/pom.xml b/admin/hotlist-service/pom.xml index f14622704fc..89a613c0418 100644 --- a/admin/hotlist-service/pom.xml +++ b/admin/hotlist-service/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.hotlist hotlist-service - 1.3.0-beta.2 + 1.3.1-SNAPSHOT Hotlist Service Service to block/unblock ids in MOSIP https://github.com/mosip/admin-services @@ -28,11 +28,11 @@ 3.3.3 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.1 + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.3.1-SNAPSHOT 3.1.1 diff --git a/admin/kernel-masterdata-service/pom.xml b/admin/kernel-masterdata-service/pom.xml index ca7546b3f06..4b4969693bc 100644 --- a/admin/kernel-masterdata-service/pom.xml +++ b/admin/kernel-masterdata-service/pom.xml @@ -9,7 +9,7 @@ kernel-masterdata-service Mosip commons project https://github.com/mosip/commons - 1.3.0-beta.2 + 1.3.1-SNAPSHOT UTF-8 @@ -108,12 +108,12 @@ 1.4.2 UTF-8 0.7.0 - 1.3.0-beta.2 - 1.3.0-beta.2 + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT 0.3.0 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.1 + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.3.1-SNAPSHOT 3.1.1 diff --git a/admin/kernel-syncdata-service/pom.xml b/admin/kernel-syncdata-service/pom.xml index a859d234466..6c60b5b0000 100644 --- a/admin/kernel-syncdata-service/pom.xml +++ b/admin/kernel-syncdata-service/pom.xml @@ -7,7 +7,7 @@ kernel-syncdata-service Mosip commons project https://github.com/mosip/commons - 1.3.0-beta.2 + 1.3.1-SNAPSHOT UTF-8 @@ -81,12 +81,12 @@ 1.4.2 UTF-8 0.7.0 - 1.3.0-beta.2 - 1.3.0-beta.1 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.2 + 1.2.2-SNAPSHOT + 1.3.1-SNAPSHOT + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT 3.1.1 diff --git a/admin/pom.xml b/admin/pom.xml index 5b9287f31a2..bd369cd672f 100644 --- a/admin/pom.xml +++ b/admin/pom.xml @@ -6,7 +6,7 @@ io.mosip.admin admin-parent - 1.3.0-beta.2 + 1.3.1-SNAPSHOT pom admin @@ -163,8 +163,8 @@ 1.9.12 0.6.0 2.0.0.AM2 - 1.3.0-beta.2 - 1.3.0-beta.1 + 1.2.2-SNAPSHOT + 1.3.1-SNAPSHOT **/repositories/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Util.java,**/helper/beans/**,**/OptionalFilter.java,**/*Enum.java,**/validator.registereddevice/**,**/DeviceProvider*.java,**/DeviceRegister*.java,**/FoundationalTrustProvider*.java,**/GenderType*.java,**/IndividualType*.java,**/MOSIPDeviceService*.java,**/RegisteredDevice*.java,**/RegistrationCenterDeviceHistoryServiceImpl.java,**/RegistrationCenterMachineUserServiceHistoryImpl.java **/dto/**,**/entity/**,**/config/** @@ -201,7 +201,7 @@ io.mosip.kernel kernel-logger-logback - ${kernel.core.version} + 1.3.0-beta.2 diff --git a/api-test/pom.xml b/api-test/pom.xml index 1c7971e9487..1bd898611a2 100644 --- a/api-test/pom.xml +++ b/api-test/pom.xml @@ -8,7 +8,7 @@ apitest-masterdata Parent project of MOSIP Admin Services apitests https://github.com/mosip/admin-services - 1.3.0-beta.2 + 1.3.1-SNAPSHOT From f2262a4530a3e5854ec41312a353ebc1adf2acd6 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Fri, 29 Aug 2025 12:04:46 +0530 Subject: [PATCH 5/6] Update pom.xml Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- admin/hotlist-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/hotlist-service/pom.xml b/admin/hotlist-service/pom.xml index 89a613c0418..9c4c85ca667 100644 --- a/admin/hotlist-service/pom.xml +++ b/admin/hotlist-service/pom.xml @@ -98,7 +98,7 @@ io.mosip.kernel kernel-core - ${kernel-core.version} + ${kernel.core.version} com.fasterxml.jackson.datatype From e44b90abf9b62d74d5cce996ace40ab76e6bac93 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Fri, 29 Aug 2025 12:17:15 +0530 Subject: [PATCH 6/6] test case fixes Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- admin/admin-service/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/admin/admin-service/pom.xml b/admin/admin-service/pom.xml index 6b0b6d5cd4a..337aac353eb 100644 --- a/admin/admin-service/pom.xml +++ b/admin/admin-service/pom.xml @@ -226,6 +226,12 @@ bcutil-jdk18on 1.78.1 + + com.h2database + h2 + 2.2.224 + test +