Merge pull request #10 from JanardhanBS-SyncByte/develop-java21_backup

[Java21] Code cleanup
aihamh · Jun 13, 2024 · edc41f8 · edc41f8
2 parents 7eb8a32 + affd8fb
commit edc41f8
Show file tree

Hide file tree

Showing 74 changed files with 1,227 additions and 1,057 deletions.
diff --git a/.../src/main/java/io/mosip/preregistration/application/config/ApplicationEventListerner.java b/.../src/main/java/io/mosip/preregistration/application/config/ApplicationEventListerner.java
@@ -11,9 +11,9 @@
 import io.mosip.preregistration.application.service.LoginService;
 import io.mosip.preregistration.core.config.LoggerConfiguration;
 
-import static io.mosip.preregistration.application.constant.PreRegLoginConstant.LOGGER_SESSIONID;
-import static io.mosip.preregistration.application.constant.PreRegLoginConstant.LOGGER_IDTYPE;
-import static io.mosip.preregistration.application.constant.PreRegLoginConstant.LOGGER_ID;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_SESSIONID;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_IDTYPE;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_ID;
 
 @Configuration
 public class ApplicationEventListerner {

diff --git a/...rc/main/java/io/mosip/preregistration/application/constant/PreRegApplicationConstant.java b/...rc/main/java/io/mosip/preregistration/application/constant/PreRegApplicationConstant.java
@@ -0,0 +1,11 @@
+package io.mosip.preregistration.application.constant;
+
+public class PreRegApplicationConstant {
+	private PreRegApplicationConstant() {
+		throw new IllegalStateException("PreRegApplicationConstant class");
+	}
+
+	public static final String LOGGER_SESSIONID = "PRE-REGISTRATION";
+	public static final String LOGGER_IDTYPE = "APPLICATION SERVICE";
+	public static final String LOGGER_ID = "";	
+}
diff --git a/...vice/src/main/java/io/mosip/preregistration/application/constant/PreRegLoginConstant.java b/...vice/src/main/java/io/mosip/preregistration/application/constant/PreRegLoginConstant.java
@@ -4,10 +4,6 @@ public class PreRegLoginConstant {
 	private PreRegLoginConstant() {
 		throw new IllegalStateException("PreRegLoginConstant class");
 	}
-
-	public static final String LOGGER_SESSIONID = "PRE-REGISTRATION";
-	public static final String LOGGER_IDTYPE = "APPLICATION SERVICE";
-	public static final String LOGGER_ID = "";
 
 	public static final String OTP_SMS_TEMPLATE = "pre.reg.login.otp.sms.template";
 	public static final String OTP_SUBJECT_TEMPLATE = "pre.reg.login.otp.mail.subject.template";
@@ -32,4 +28,4 @@ private PreRegLoginConstant() {
 	public static final String VALIDATE_ERROR_MESSAGE = "Validation can't be performed against this key. Generate OTP first.";
 	public static final String VALIDATE_ERROR_CODE = "KER-OTV-005";
 	public static final String MOSIP_PRIMARY_LANGUAGE = "mosip.primary-language";
-}
+}
diff --git a/.../src/main/java/io/mosip/preregistration/application/controller/AppointmentController.java b/.../src/main/java/io/mosip/preregistration/application/controller/AppointmentController.java
@@ -37,6 +37,9 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_SESSIONID;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_IDTYPE;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_ID;
 
 @RestController
 @Tag(name = "appointment-controller", description = "Appointment Controller")
@@ -57,7 +60,7 @@ public class AppointmentController {
 			@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
 	public ResponseEntity<MainResponseDTO<AvailabilityDto>> getAvailability(
 			@PathVariable("registrationCenterId") String registrationCenterId) {
-		log.info("fetch availablity for regID: {}", registrationCenterId);
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID, "fetch availablity for regID: " + registrationCenterId);
 		return ResponseEntity.status(HttpStatus.OK).body(appointmentService.getSlotAvailablity(registrationCenterId));
 	}
 
@@ -73,7 +76,7 @@ public ResponseEntity<MainResponseDTO<BookingStatusDTO>> bookAppoinment(
 			@PathVariable("preRegistrationId") String preRegistrationId,
 			@Validated @RequestBody(required = true) MainRequestDTO<BookingRequestDTO> bookingDTO,
 			@ApiParam(hidden = true) Errors errors, @RequestHeader(value = "User-Agent") String userAgent) {
-		log.info("Book an appointment for preRegId: {}", preRegistrationId);
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID, "Book an appointment for preRegId: " + preRegistrationId);
 		return ResponseEntity.status(HttpStatus.OK)
 				.body(appointmentService.makeAppointment(bookingDTO, preRegistrationId, userAgent));
 	}
@@ -88,7 +91,8 @@ public ResponseEntity<MainResponseDTO<BookingStatusDTO>> bookAppoinment(
 			@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
 	public ResponseEntity<MainResponseDTO<BookingRegistrationDTO>> getAppointments(
 			@PathVariable("preRegistrationId") String preRegistrationId) {
-		log.info("To fetch appointment details for preRegID: {}", preRegistrationId);
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
+				"To fetch appointment details for preRegID: " + preRegistrationId);
 		return ResponseEntity.status(HttpStatus.OK).body(appointmentService.getAppointmentDetails(preRegistrationId));
 	}
 
@@ -102,7 +106,8 @@ public ResponseEntity<MainResponseDTO<BookingRegistrationDTO>> getAppointments(
 			@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
 	public ResponseEntity<MainResponseDTO<CancelBookingResponseDTO>> cancelBook(
 			@PathVariable("preRegistrationId") String preRegistrationId) {
-		log.info("Cancel the appointment for preRegId :{} ", preRegistrationId);
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
+				"Cancel the appointment for preRegId : " + preRegistrationId);
 		return ResponseEntity.status(HttpStatus.OK).body(appointmentService.cancelAppointment(preRegistrationId));
 	}
 
@@ -116,7 +121,8 @@ public ResponseEntity<MainResponseDTO<CancelBookingResponseDTO>> cancelBook(
 			@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
 	public ResponseEntity<MainResponseDTO<CancelBookingResponseDTO>> internalCancelBook(
 			@PathVariable("preRegistrationId") String preRegistrationId) {
-		log.info("Cancel the appointment for preRegId called internally :{} ", preRegistrationId);
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
+				"Cancel the appointment for preRegId called internally :" + preRegistrationId);
 		return ResponseEntity.status(HttpStatus.OK).body(appointmentService.cancelAppointment(preRegistrationId));
 	}
 
@@ -129,7 +135,7 @@ public ResponseEntity<MainResponseDTO<CancelBookingResponseDTO>> internalCancelB
 			@ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))), })
 	public ResponseEntity<MainResponseDTO<DeleteBookingDTO>> discardIndividual(
 			@RequestParam(value = "preRegistrationId") String preId) {
-		log.info("Delete booking with preId: {}", preId);
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID, "Delete booking with preId: " + preId);
 		return ResponseEntity.status(HttpStatus.OK)
 				.body(appointmentService.deleteBookingAndUpdateApplicationStatus(preId));
 	}

diff --git a/.../src/main/java/io/mosip/preregistration/application/controller/DemographicController.java b/.../src/main/java/io/mosip/preregistration/application/controller/DemographicController.java
@@ -49,9 +49,9 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 
-import static io.mosip.preregistration.application.constant.PreRegLoginConstant.LOGGER_SESSIONID;
-import static io.mosip.preregistration.application.constant.PreRegLoginConstant.LOGGER_IDTYPE;
-import static io.mosip.preregistration.application.constant.PreRegLoginConstant.LOGGER_ID;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_SESSIONID;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_IDTYPE;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_ID;
 
 /**
  * This class provides different API's to perform operations on
@@ -313,8 +313,9 @@ public ResponseEntity<MainResponseDTO<Map<String, String>>> getUpdatedDateTimeBy
 			@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
 	public ResponseEntity<MainResponseDTO<?>> getPreRegDemographicAndDocumentData(
 			@PathVariable("preregistrationId") String preregistrationId) {
-		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID, "In demographic controller to getFullPreRegApplication " + preregistrationId);
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
+				"In demographic controller to getFullPreRegApplication " + preregistrationId);
 		return ResponseEntity.status(HttpStatus.OK)
 				.body(preRegistrationService.getPregistrationInfo(preregistrationId));
 	}
-}
+}
diff --git a/...ice/src/main/java/io/mosip/preregistration/application/controller/DocumentController.java b/...ice/src/main/java/io/mosip/preregistration/application/controller/DocumentController.java
@@ -36,6 +36,10 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_SESSIONID;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_IDTYPE;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_ID;
+
 /**
  * This class provides different API's to perform operations on Document upload.
  * 
@@ -81,11 +85,11 @@ public ResponseEntity<MainResponseDTO<DocumentResponseDTO>> fileUpload(
 			@PathVariable(value = "preRegistrationId") String preRegistrationId,
 			@RequestPart(value = "Document request", required = true) String reqDto,
 			@RequestPart(value = "file", required = true) MultipartFile file) {
-		log.debug("sessionId", "idType", "id", "In doc controller ");
-		log.debug("sessionId", "idType", "id", "Pre-id " + preRegistrationId);
-		log.info("sessionId", "idType", "id",
-				"In fileUpload method of document controller to upload the document for request " + reqDto.toString());
-		log.info("sessionId", "idType", "id", "iN Controller v2");
+		log.debug(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID, "In doc controller ");
+		log.debug(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID, "Pre-id " + preRegistrationId);
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
+				"In fileUpload method of document controller to upload the document for request " + reqDto);
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID, "iN Controller v2");
 
 		return ResponseEntity.status(HttpStatus.OK)
 				.body(documentUploadService.uploadDocument(file, reqDto, preRegistrationId));
@@ -116,7 +120,7 @@ public ResponseEntity<MainResponseDTO<DocumentResponseDTO>> copyDocument(
 			@Valid @RequestParam(required = true) String catCode,
 			@Valid @RequestParam(required = true) String sourcePreId) {
 
-		log.info("sessionId", "idType", "id",
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 				"In copyDocument method of document controller to copy the document for request " + catCode + ","
 						+ sourcePreId + "," + preRegistrationId);
 		return ResponseEntity.status(HttpStatus.OK)
@@ -140,7 +144,7 @@ public ResponseEntity<MainResponseDTO<DocumentResponseDTO>> copyDocument(
 			@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
 	public ResponseEntity<MainResponseDTO<DocumentsMetaData>> getAllDocumentforPreid(
 			@Valid @PathVariable(required = true) String preRegistrationId) {
-		log.info("sessionId", "idType", "id",
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 				"In getAllDocumentforPreid method of document controller to get all the document for pre_registration_id "
 						+ preRegistrationId);
 		return ResponseEntity.status(HttpStatus.OK)
@@ -166,7 +170,7 @@ public ResponseEntity<MainResponseDTO<DocumentsMetaData>> getAllDocumentforPreid
 	public ResponseEntity<MainResponseDTO<DocumentDTO>> getDocumentforDocId(
 			@Valid @PathVariable(required = true) String documentId,
 			@Valid @RequestParam(required = true, value = "preRegistrationId") String preRegistrationId) {
-		log.info("sessionId", "idType", "id",
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 				"In getAllDocumentforDocId method of document controller to get all the document for documentId "
 						+ documentId);
 		return ResponseEntity.status(HttpStatus.OK)
@@ -181,7 +185,6 @@ public ResponseEntity<MainResponseDTO<DocumentDTO>> getDocumentforDocId(
 	 * @param preRegistrationId pass the preRegistratoinId
 	 * @return response in a format specified in API document
 	 */
-
 	// @PreAuthorize("hasAnyRole('INDIVIDUAL')")
 	@PreAuthorize("hasAnyRole(@authorizedRoles.getDeletedocumentsdocumentid())")
 	@DeleteMapping(path = "/documents/{documentId}", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -193,7 +196,7 @@ public ResponseEntity<MainResponseDTO<DocumentDTO>> getDocumentforDocId(
 	public ResponseEntity<MainResponseDTO<DocumentDeleteResponseDTO>> deleteDocument(
 			@Valid @PathVariable(required = true) String documentId,
 			@Valid @RequestParam(required = true, value = "preRegistrationId") String preRegistrationId) {
-		log.info("sessionId", "idType", "id",
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 				"In deleteDocument method of document controller to delete the document for documentId " + documentId);
 		return ResponseEntity.status(HttpStatus.OK)
 				.body(documentUploadService.deleteDocument(documentId, preRegistrationId));
@@ -216,7 +219,7 @@ public ResponseEntity<MainResponseDTO<DocumentDeleteResponseDTO>> deleteDocument
 			@ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))), })
 	public ResponseEntity<MainResponseDTO<DocumentDeleteResponseDTO>> deleteAllByPreId(
 			@Valid @PathVariable(required = true) String preRegistrationId) {
-		log.info("sessionId", "idType", "id",
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 				"In deleteDocument method of document controller to delete all the document for preId "
 						+ preRegistrationId);
 		return ResponseEntity.status(HttpStatus.OK).body(documentUploadService.deleteAllByPreId(preRegistrationId));
@@ -237,7 +240,7 @@ public ResponseEntity<MainResponseDTO<String>> updateDocRefId(
 			@Valid @PathVariable(required = true) String documentId,
 			@Valid @RequestParam(required = true, value = "preRegistrationId") String preRegistrationId,
 			@Valid @RequestParam(required = true, value = "refNumber") String refNumebr) {
-		log.info("sessionId", "idType", "id",
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 				"In updateDocRefId method of document controller to update the docRefId for documentId " + documentId
 						+ "preregistrationId " + preRegistrationId + "DocRefId " + refNumebr);
 		return ResponseEntity.status(HttpStatus.OK)

diff --git a/...c/main/java/io/mosip/preregistration/application/controller/GenerateQRcodeController.java b/...c/main/java/io/mosip/preregistration/application/controller/GenerateQRcodeController.java
@@ -30,6 +30,10 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_SESSIONID;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_IDTYPE;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_ID;
+
 /**
  * This class provides API's to generate the QR code operations on
  * pre-registration.
@@ -79,7 +83,7 @@ public void initBinder(WebDataBinder binder) {
 			@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
 	public ResponseEntity<MainResponseDTO<QRCodeResponseDTO>> generateQRCode(
 			@Validated @RequestBody MainRequestDTO<String> data, @ApiParam(hidden = true) Errors errors) {
-		log.info("sessionId", "idType", "id",
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 				"In generateQRCode controller for generateQRCode generation with request " + data);
 		requestValidator.validateId(QRCODE, data.getId(), errors);
 		DataValidationUtil.validate(errors, QRCODE);

diff --git a/...ervice/src/main/java/io/mosip/preregistration/application/controller/LoginController.java b/...ervice/src/main/java/io/mosip/preregistration/application/controller/LoginController.java
@@ -1,5 +1,9 @@
 package io.mosip.preregistration.application.controller;
 
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_ID;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_IDTYPE;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_SESSIONID;
+
 import java.util.Map;
 import java.util.Objects;
 
@@ -117,7 +121,6 @@ public void initBinder(WebDataBinder binder) {
 	public ResponseEntity<MainResponseDTO<AuthNResponse>> sendOTP(
 			@Validated @RequestBody MainRequestDTO<OtpRequestDTO> userOtpRequest,
 			@ApiParam(hidden = true) Errors errors) {
-
 		loginValidator.validateId(SENDOTP, userOtpRequest.getId(), errors);
 		DataValidationUtil.validate(errors, SENDOTP);
 		if (!allowSendOtpApi)
@@ -146,7 +149,6 @@ public ResponseEntity<MainResponseDTO<AuthNResponse>> sendOTP(
 	public ResponseEntity<MainResponseDTO<AuthNResponse>> sendOTPWithLangCode(
 			@Validated @RequestBody MainRequestDTO<OTPWithLangCodeDTO> userOtpRequest,
 			@ApiParam(hidden = true) Errors errors) {
-
 		loginValidator.validateId(SENDOTP, userOtpRequest.getId(), errors);
 		DataValidationUtil.validate(errors, SENDOTP);
 		MainRequestDTO<OtpRequestDTO> MainRequestDTO = new MainRequestDTO<>();
@@ -178,7 +180,7 @@ public ResponseEntity<MainResponseDTO<AuthNResponse>> validateWithUserIdOtp(
 			@Validated @RequestBody MainRequestDTO<User> userIdOtpRequest, @ApiParam(hidden = true) Errors errors,
 			HttpServletResponse res, HttpServletRequest req) {
 
-		log.debug("User ID: {}", userIdOtpRequest.getRequest().getUserId());
+		log.debug(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID, "User ID: "+ userIdOtpRequest.getRequest().getUserId());
 		loginValidator.validateId(VALIDATEOTP, userIdOtpRequest.getId(), errors);
 		DataValidationUtil.validate(errors, VALIDATEOTP);
 		MainResponseDTO<AuthNResponse> responseBody = loginService.validateWithUserIdOtp(userIdOtpRequest);

diff --git a/...vice/src/main/java/io/mosip/preregistration/application/controller/LostUINController.java b/...vice/src/main/java/io/mosip/preregistration/application/controller/LostUINController.java
@@ -1,5 +1,9 @@
 package io.mosip.preregistration.application.controller;
 
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_SESSIONID;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_IDTYPE;
+import static io.mosip.preregistration.application.constant.PreRegApplicationConstant.LOGGER_ID;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -78,7 +82,7 @@ public void initBinder(WebDataBinder binder) {
 	public ResponseEntity<MainResponseDTO<ApplicationResponseDTO>> addLostUinApplication(
 			@Validated @RequestBody(required = true) MainRequestDTO<ApplicationRequestDTO> jsonObject,
 			@ApiParam(hidden = true) Errors errors) {
-		log.info("sessionId", "idType", "id",
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 				"In pre-registration LostUINController for createNewApplication with json object" + jsonObject);
 		requestValidator.validateId(LOST_UIN_CREATE_ID, jsonObject.getId(), errors);
 		DataValidationUtil.validate(errors, LOST_UIN_CREATE_ID);
@@ -102,7 +106,7 @@ public ResponseEntity<MainResponseDTO<ApplicationResponseDTO>> addLostUinApplica
 			@ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))), })
 	public ResponseEntity<MainResponseDTO<DeleteApplicationDTO>> deleteLostUinApplication(
 			@PathVariable("applicationId") String applicationId) {
-		log.info("sessionId", "idType", "id",
+		log.info(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 				"In pre-registration LostUINController for deleteApplication with preId " + applicationId);
 		return ResponseEntity.status(HttpStatus.OK).body(applicationService.deleteLostOrUpdateApplication(applicationId,
 				BookingTypeCodes.LOST_FORGOTTEN_UIN.toString()));