Skip to content

DateUtills Changes [MOSIP-42819] #1256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GOKULRAJ136 wants to merge 6 commits into
base: MOSIP-42334_release-1.3.x
Choose a base branch
from
Open

DateUtills Changes [MOSIP-42819] #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b0b0739
DateUtills Changes [MOSIP-42819]
GOKULRAJ136 Aug 26, 2025
f8ead62
test case fixes
GOKULRAJ136 Aug 26, 2025
34b05ae
Update AuditRequestBuilderTest.java
GOKULRAJ136 Aug 26, 2025
23b3302
Version changes
GOKULRAJ136 Aug 29, 2025
f2262a4
Update pom.xml
GOKULRAJ136 Aug 29, 2025
e44b90a
test case fixes
GOKULRAJ136 Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions admin/admin-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
<parent>
<groupId>io.mosip.admin</groupId>
<artifactId>admin-parent</artifactId>
<version>1.3.0-beta.2</version>
<version>1.3.1-SNAPSHOT</version>
</parent>
<artifactId>admin-service</artifactId>
<name>admin-service</name>
<version>1.3.0-beta.2</version>
<version>1.3.1-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<springdoc.version>1.8.0</springdoc.version>
<mosip.commons.packetmanager.version>1.3.0-beta.2</mosip.commons.packetmanager.version>
<kernel.core.version>1.3.0-beta.2</kernel.core.version>
<mosip.commons.packetmanager.version>1.3.1-SNAPSHOT</mosip.commons.packetmanager.version>
<kernel.core.version>1.2.2-SNAPSHOT</kernel.core.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.version>3.8.0</maven.compiler.version>
Expand All @@ -29,8 +29,8 @@
<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
<maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
<mosip.biometric.util.version>1.3.0-beta.1</mosip.biometric.util.version>
<mosip.openid.bridge.version>1.3.0-beta.1</mosip.openid.bridge.version>
<mosip.biometric.util.version>1.3.1-SNAPSHOT</mosip.biometric.util.version>
<mosip.openid.bridge.version>1.3.1-SNAPSHOT</mosip.openid.bridge.version>
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
<central.publishing.maven.plugin.version>0.7.0</central.publishing.maven.plugin.version>
</properties>
Expand Down Expand Up @@ -226,6 +226,12 @@
<artifactId>bcutil-jdk18on</artifactId>
<version>1.78.1</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.2.224</version>
<scope>test</scope>
</dependency>
<!--<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-auth-adapter</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions ...service/src/test/java/io/mosip/admin/controller/test/AuditManagerProxyControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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");
Expand Down
7 changes: 5 additions & 2 deletions ...ervice/src/test/java/io/mosip/admin/packetstatusupdater/AuditManagerProxyServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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");
Expand All @@ -91,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("");
Expand Down
14 changes: 7 additions & 7 deletions admin/hotlist-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.mosip.hotlist</groupId>
<artifactId>hotlist-service</artifactId>
<version>1.3.0-beta.2</version>
<version>1.3.1-SNAPSHOT</version>
<name>Hotlist Service</name>
<description>Service to block/unblock ids in MOSIP</description>
<url>https://github.com/mosip/admin-services</url>
Expand All @@ -28,11 +28,11 @@
<mockito.version>3.3.3</mockito.version>

<!-- kernel properties -->
<kernel-core.version>1.3.0-beta.2</kernel-core.version>
<kernel.bom.version>1.3.0-beta.2</kernel.bom.version>
<kernel-websubclient-api.version>1.3.0-beta.2</kernel-websubclient-api.version>
<kernel-logger-logback.version>1.3.0-beta.2</kernel-logger-logback.version>
<kernel.auth.adaptor.version>1.3.0-beta.1</kernel.auth.adaptor.version>
<kernel.core.version>1.2.2-SNAPSHOT</kernel.core.version>
<kernel.bom.version>1.2.2-SNAPSHOT</kernel.bom.version>
<kernel-websubclient-api.version>1.2.2-SNAPSHOT</kernel-websubclient-api.version>
<kernel-logger-logback.version>1.2.2-SNAPSHOT</kernel-logger-logback.version>
<kernel.auth.adaptor.version>1.3.1-SNAPSHOT</kernel.auth.adaptor.version>
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
</properties>

Expand Down Expand Up @@ -98,7 +98,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-core</artifactId>
<version>${kernel-core.version}</version>
<version>${kernel.core.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
Expand Down
8 changes: 6 additions & 2 deletions admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,6 +20,7 @@

import java.net.InetAddress;
import java.net.UnknownHostException;
import java.time.LocalDateTime;

import static org.junit.Assert.assertEquals;

Expand Down Expand Up @@ -47,15 +49,17 @@ public void before() {
public void testBuildRequest() {
RequestWrapper<AuditRequestDTO> actualRequest = auditBuilder.buildRequest(AuditModules.HOTLIST_SERVICE,
AuditEvents.BLOCK_REQUEST, "id", "RID", "desc");
actualRequest.getRequest().setActionTimeStamp(null);
LocalDateTime utcNow = DateUtils.getUTCCurrentDateTime();
actualRequest.getRequest().setActionTimeStamp(utcNow);

AuditRequestDTO expectedRequest = new AuditRequestDTO();
try {
InetAddress inetAddress = InetAddress.getLocalHost();

expectedRequest.setEventId(AuditEvents.BLOCK_REQUEST.getEventId());
expectedRequest.setEventName(AuditEvents.BLOCK_REQUEST.getEventName());
expectedRequest.setEventType(AuditEvents.BLOCK_REQUEST.getEventType());
expectedRequest.setActionTimeStamp(null);
expectedRequest.setActionTimeStamp(utcNow);
expectedRequest.setHostName(inetAddress.getHostName());
expectedRequest.setHostIp(inetAddress.getHostAddress());
expectedRequest.setApplicationId("HOTLIST");
Expand Down
12 changes: 6 additions & 6 deletions admin/kernel-masterdata-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<name>kernel-masterdata-service</name>
<description>Mosip commons project </description>
<url>https://github.com/mosip/commons</url>
<version>1.3.0-beta.2</version>
<version>1.3.1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Expand Down Expand Up @@ -108,12 +108,12 @@
<micrometer.registry.prometheus.version>1.4.2</micrometer.registry.prometheus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<central.publishing.maven.plugin.version>0.7.0</central.publishing.maven.plugin.version>
<kernel.applicant-type.version>1.3.0-beta.2</kernel.applicant-type.version>
<kernel.logger.logback.version>1.3.0-beta.2</kernel.logger.logback.version>
<kernel.applicant-type.version>1.2.2-SNAPSHOT</kernel.applicant-type.version>
<kernel.logger.logback.version>1.2.2-SNAPSHOT</kernel.logger.logback.version>
<tss.version>0.3.0</tss.version>
<kernel.websubclient.api.version>1.3.0-beta.2</kernel.websubclient.api.version>
<kernel.core.version>1.3.0-beta.2</kernel.core.version>
<mosip.openid.bridge.version>1.3.0-beta.1</mosip.openid.bridge.version>
<kernel.websubclient.api.version>1.2.2-SNAPSHOT</kernel.websubclient.api.version>
<kernel.core.version>1.2.2-SNAPSHOT</kernel.core.version>
<mosip.openid.bridge.version>1.3.1-SNAPSHOT</mosip.openid.bridge.version>
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
</properties>

Expand Down
14 changes: 7 additions & 7 deletions admin/kernel-syncdata-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<name>kernel-syncdata-service</name>
<description>Mosip commons project </description>
<url>https://github.com/mosip/commons</url>
<version>1.3.0-beta.2</version>
<version>1.3.1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Expand Down Expand Up @@ -81,12 +81,12 @@
<micrometer.registry.prometheus.version>1.4.2</micrometer.registry.prometheus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<central.publishing.maven.plugin.version>0.7.0</central.publishing.maven.plugin.version>
<kernel.core.version>1.3.0-beta.2</kernel.core.version>
<kernel.auth.adaptor.version>1.3.0-beta.1</kernel.auth.adaptor.version>
<kernel.logger.version>1.3.0-beta.2</kernel.logger.version>
<kernel.crypto.version>1.3.0-beta.2</kernel.crypto.version>
<kernel.keymanager.version>1.3.0-beta.2</kernel.keymanager.version>
<kernel-websubclient-api.version>1.3.0-beta.2</kernel-websubclient-api.version>
<kernel.core.version>1.2.2-SNAPSHOT</kernel.core.version>
<kernel.auth.adaptor.version>1.3.1-SNAPSHOT</kernel.auth.adaptor.version>
<kernel.logger.version>1.2.2-SNAPSHOT</kernel.logger.version>
<kernel.crypto.version>1.2.2-SNAPSHOT</kernel.crypto.version>
<kernel.keymanager.version>1.2.2-SNAPSHOT</kernel.keymanager.version>
<kernel-websubclient-api.version>1.2.2-SNAPSHOT</kernel-websubclient-api.version>
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
</properties>

Expand Down
8 changes: 4 additions & 4 deletions admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.mosip.admin</groupId>
<artifactId>admin-parent</artifactId>
<version>1.3.0-beta.2</version>
<version>1.3.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>admin</name>
Expand Down Expand Up @@ -163,8 +163,8 @@
<byte.buddy.version>1.9.12</byte.buddy.version>
<io.jsonwebtoken.jjwt.version>0.6.0</io.jsonwebtoken.jjwt.version>
<apache.directory.api.version>2.0.0.AM2</apache.directory.api.version>
<kernel.core.version>1.3.0-beta.2</kernel.core.version>
<mosip.openid.bridge.version>1.3.0-beta.1</mosip.openid.bridge.version>
<kernel.core.version>1.2.2-SNAPSHOT</kernel.core.version>
<mosip.openid.bridge.version>1.3.1-SNAPSHOT</mosip.openid.bridge.version>
<sonar.coverage.exclusions>**/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</sonar.coverage.exclusions>
<sonar.cpd.exclusions>**/dto/**,**/entity/**,**/config/**</sonar.cpd.exclusions>
</properties>
Expand Down Expand Up @@ -201,7 +201,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-logger-logback</artifactId>
<version>${kernel.core.version}</version>
<version>1.3.0-beta.2</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion api-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<name>apitest-masterdata</name>
<description>Parent project of MOSIP Admin Services apitests</description>
<url>https://github.com/mosip/admin-services</url>
<version>1.3.0-beta.2</version>
<version>1.3.1-SNAPSHOT</version>

<licenses>
<license>
Expand Down
Loading