Skip to content

Commit

Permalink
[Java21]
Browse files Browse the repository at this point in the history
Signed-off-by: JanardhanBS-SyncByte <[email protected]>
  • Loading branch information
JanardhanBS-SyncByte authored and aihamh committed Jun 12, 2024
1 parent 613e635 commit 3194856
Show file tree
Hide file tree
Showing 64 changed files with 296 additions and 394 deletions.
5 changes: 3 additions & 2 deletions pre-registration/pre-registration-application-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
<artifactId>pre-registration-parent</artifactId>
<version>1.2.1-java21-SNAPSHOT</version>
</parent>

<artifactId>pre-registration-application-service</artifactId>
<version>1.2.1-java21-SNAPSHOT</version>
<name>Pre-Registration Application Service Project</name>
<description>Maven project of MOSIP Pre-Registration Service</description>

<properties>
<!-- Others -->
<org.hamcrest.version>2.1</org.hamcrest.version>
Expand Down
2 changes: 1 addition & 1 deletion pre-registration/pre-registration-batchjob/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</parent>

<artifactId>pre-registration-batchjob</artifactId>

<name>pre-registration-batchjob</name>
<version>1.2.1-java21-SNAPSHOT</version>
<url>http://maven.apache.org</url>

<properties>
Expand Down
4 changes: 3 additions & 1 deletion pre-registration/pre-registration-captcha-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@
<artifactId>pre-registration-parent</artifactId>
<version>1.2.1-java21-SNAPSHOT</version>
</parent>

<groupId>io.mosip.preregistration.captcha</groupId>
<artifactId>pre-registration-captcha-service</artifactId>
<version>1.2.1-java21-SNAPSHOT</version>

<name>pre-registration-captcha-service</name>
<description>A pre-registration service to generate and validate captcha</description>

<properties>
<!-- Mosip kernel -->
<pre.registration.core.version>1.2.1-java21-SNAPSHOT</pre.registration.core.version>
Expand Down
1 change: 1 addition & 0 deletions pre-registration/pre-registration-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
</parent>

<artifactId>pre-registration-core</artifactId>
<version>1.2.1-java21-SNAPSHOT</version>
<name>pre-registration-core</name>
<description>Maven project of MOSIP Pre-Registration Service</description>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.mosip.preregistration.core.code;

public enum ApplicationStatusCode {

DRAFT("DRAFT"),

SUBMITTED("SUBMITTED"),
Expand All @@ -17,5 +16,4 @@ public enum ApplicationStatusCode {
public String getApplicationStatusCode() {
return applicationStatusCode;
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@
@NoArgsConstructor
@AllArgsConstructor
public class AuditLogEventCodes implements Serializable {

/**
*
*/
/** The Constant serialVersionUID. */
private static final long serialVersionUID = -4812141703022119560L;

private String eventId;

private String eventType;
private String eventName;

}
private String eventName;
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ public enum AuditLogVariables {
CONSUMED_BATCH_SERVICE,

EXPIRED_BATCH_SERVICE
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ public enum BookingTypeCodes {
public String getBookingTypeCode() {
return bookingTypeCode;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,4 @@ public enum EventId {

/** Id for UI event ex. consent . */
PRE_414;


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,4 @@ public enum EventName {

/** Triggering batch-service for expired status . */
EXPIREDSTATUS

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ public enum EventType {

/** The security. */
SECURITY,

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public final class RequestCodes {
public static final String TO_DATE = "toDate";
public static final String SMS = "sms";
public static final String EMAIL = "email";

private RequestCodes() {
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ public enum StatusCodes {
EXPIRED("Expired"),

/* Consumed */
CONSUMED("Consumed"),
CONSUMED("Consumed"),

/* Prefetched */
PREFETCHED("Prefetched"),
PREFETCHED("Prefetched"),

/**
* Canceled
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,24 @@

public enum StatusMessages {
USER_ID_INVALID,

USER_OTP_GENERATED,

USER_OTP_GENERATION_FAILED,

USER_ALREADY_EXIST,

OTP_VALIDATION_SUCESSFUL,

OTP_VALIDATION_FAILED,

USER_OTP_INVALID,

USER_UPDATED,

USER_UPDATION_FAILED,

USER_INSERTION_FAILED,

SERVER_CONNECTION_FAILED
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

import java.time.LocalDateTime;

import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

import com.fasterxml.jackson.annotation.JsonFormat;

import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
Expand All @@ -23,7 +22,6 @@
@NoArgsConstructor
@AllArgsConstructor
public class AuditRequestDto {

@NotNull
@Size(min = 1, max = 64)
private String eventId;
Expand Down Expand Up @@ -83,6 +81,4 @@ public class AuditRequestDto {

@Size(max = 2048)
private String description;


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
@NoArgsConstructor
@AllArgsConstructor
public class AuditResponseDto {

/**
* The boolean audit status
*/
private boolean status;

}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.mosip.preregistration.core.common.dto;


import java.io.Serializable;

import lombok.AllArgsConstructor;
Expand All @@ -10,7 +9,13 @@
@Data
@AllArgsConstructor
@NoArgsConstructor
public class AuthNResponse implements Serializable {
public class AuthNResponse implements Serializable {
/**
* constant serialVersion UID
*/
private static final long serialVersionUID = -1505080809049335366L;

private String message;

private String status;
}
}
Loading

0 comments on commit 3194856

Please sign in to comment.