Move latest develop code to develop-121

resident/resident-service/pom.xml

@@ -401,6 +401,32 @@
 		    <artifactId>commons-io</artifactId>
 		    <version>2.11.0</version>
 		</dependency>
+		<dependency>
+		    <groupId>com.nimbusds</groupId>
+		    <artifactId>nimbus-jose-jwt</artifactId>
+		    <version>9.31</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.itextpdf</groupId>
+		    <artifactId>itextpdf</artifactId>
+		    <version>5.5.13.3</version>
+		</dependency>
+		<dependency>
+		    <groupId>io.mosip.kernel</groupId>
+		    <artifactId>kernel-pdfgenerator-itext</artifactId>
+		    <version>1.2.0.1-B1</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.springframework.security</groupId>
+		    <artifactId>spring-security-test</artifactId>
+		    <version>5.3.3.RELEASE</version>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+		    <groupId>org.bitbucket.b_c</groupId>
+		    <artifactId>jose4j</artifactId>
+		    <version>0.9.3</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

resident/resident-service/src/main/java/io/mosip/resident/constant/PacketStatus.java

@@ -1,7 +1,6 @@
 package io.mosip.resident.constant;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 import org.springframework.core.env.Environment;

resident/resident-service/src/main/java/io/mosip/resident/constant/TransactionStage.java

@@ -1,7 +1,6 @@
 package io.mosip.resident.constant;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 import org.springframework.core.env.Environment;

resident/resident-service/src/main/java/io/mosip/resident/service/impl/UISchemaTypes.java → resident/resident-service/src/main/java/io/mosip/resident/constant/UISchemaTypes.java

@@ -1,11 +1,9 @@
-package io.mosip.resident.service.impl;
+package io.mosip.resident.constant;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import io.mosip.resident.constant.RequestType;
-
 public enum UISchemaTypes {
 	UPDATE_DEMOGRAPHICS("update-demographics", RequestType.UPDATE_MY_UIN),
 	PERSONALIZED_CARD("personalized-card", RequestType.DOWNLOAD_PERSONALIZED_CARD),

resident/resident-service/src/main/java/io/mosip/resident/controller/DownLoadMasterDataController.java

@@ -1,5 +1,22 @@
 package io.mosip.resident.controller;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+import java.util.Objects;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import io.mosip.kernel.core.logger.spi.Logger;
 import io.mosip.kernel.core.util.DateUtils;
 import io.mosip.resident.config.LoggerConfiguration;
@@ -13,22 +30,6 @@
 import io.mosip.resident.util.Utility;
 import io.mosip.resident.validator.RequestValidator;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Map;
-import java.util.Objects;
 
 /**
  * 

resident/resident-service/src/main/java/io/mosip/resident/controller/GrievanceController.java

@@ -1,5 +1,15 @@
 package io.mosip.resident.controller;
 
+import java.io.IOException;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
 import io.mosip.kernel.core.http.ResponseWrapper;
 import io.mosip.kernel.core.logger.spi.Logger;
 import io.mosip.resident.config.LoggerConfiguration;
@@ -15,15 +25,6 @@
 import io.mosip.resident.util.EventEnum;
 import io.mosip.resident.validator.RequestValidator;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-import java.util.Map;
 
 /**
  * @author Kamesh Shekhar Prasad

resident/resident-service/src/main/java/io/mosip/resident/controller/ProxyOtpController.java

@@ -2,8 +2,6 @@
 
 import java.util.Map;
 
-import io.mosip.resident.constant.ResidentErrorCode;
-import io.mosip.resident.exception.ApisResourceAccessException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
@@ -19,10 +17,12 @@
 import io.mosip.kernel.core.logger.spi.Logger;
 import io.mosip.resident.config.LoggerConfiguration;
 import io.mosip.resident.constant.ResidentConstants;
+import io.mosip.resident.constant.ResidentErrorCode;
 import io.mosip.resident.dto.MainRequestDTO;
 import io.mosip.resident.dto.MainResponseDTO;
 import io.mosip.resident.dto.OtpRequestDTOV2;
 import io.mosip.resident.dto.OtpRequestDTOV3;
+import io.mosip.resident.exception.ApisResourceAccessException;
 import io.mosip.resident.exception.InvalidInputException;
 import io.mosip.resident.exception.ResidentServiceException;
 import io.mosip.resident.service.ProxyOtpService;

resident/resident-service/src/main/java/io/mosip/resident/controller/ResidentCredentialController.java

@@ -28,8 +28,8 @@
 import io.mosip.kernel.core.http.ResponseFilter;
 import io.mosip.kernel.core.http.ResponseWrapper;
 import io.mosip.resident.constant.RequestIdType;
-import io.mosip.resident.constant.RequestType;
 import io.mosip.resident.constant.ResidentConstants;
+import io.mosip.resident.constant.UISchemaTypes;
 import io.mosip.resident.dto.CredentialCancelRequestResponseDto;
 import io.mosip.resident.dto.CredentialRequestStatusResponseDto;
 import io.mosip.resident.dto.CredentialTypeResponse;
@@ -45,7 +45,6 @@
 import io.mosip.resident.exception.ResidentServiceCheckedException;
 import io.mosip.resident.service.ResidentCredentialService;
 import io.mosip.resident.service.impl.ResidentConfigServiceImpl;
-import io.mosip.resident.service.impl.UISchemaTypes;
 import io.mosip.resident.util.AuditUtil;
 import io.mosip.resident.util.EventEnum;
 import io.mosip.resident.validator.RequestValidator;

resident/resident-service/src/main/java/io/mosip/resident/controller/VerificationController.java

@@ -16,7 +16,7 @@
 import io.mosip.resident.exception.InvalidInputException;
 import io.mosip.resident.exception.ResidentServiceCheckedException;
 import io.mosip.resident.exception.ResidentServiceException;
-import io.mosip.resident.service.impl.VerificationServiceImpl;
+import io.mosip.resident.service.VerificationService;
 import io.mosip.resident.util.AuditUtil;
 import io.mosip.resident.util.EventEnum;
 import io.mosip.resident.validator.RequestValidator;
@@ -27,37 +27,36 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-
 @RestController
 @Tag(name = "verification-controller", description = "controller for channel verification status")
 public class VerificationController {
 
-    @Autowired
-    private AuditUtil audit;
+	@Autowired
+	private AuditUtil audit;
 
-    @Autowired
-    private VerificationServiceImpl verificationServiceImpl;
+	@Autowired
+	private VerificationService verificationService;
 
-    @Autowired
-    private RequestValidator validator;
+	@Autowired
+	private RequestValidator validator;
 
-    private static final Logger logger = LoggerConfiguration.logConfig(VerificationController.class);
+	private static final Logger logger = LoggerConfiguration.logConfig(VerificationController.class);
 
-    @GetMapping(value = "/channel/verification-status/")
-    @Operation(summary = "get channel verification status", description = "get channel verification status")
-    @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OK"),
-            @ApiResponse(responseCode = "201", description = "Created", content = @Content(schema = @Schema(hidden = true))),
-            @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(schema = @Schema(hidden = true))),
-            @ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))),
-            @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
+	@GetMapping(value = "/channel/verification-status/")
+	@Operation(summary = "get channel verification status", description = "get channel verification status")
+	@ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OK"),
+			@ApiResponse(responseCode = "201", description = "Created", content = @Content(schema = @Schema(hidden = true))),
+			@ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(schema = @Schema(hidden = true))),
+			@ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))),
+			@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })
 	public VerificationResponseDTO getChannelVerificationStatus(@RequestParam("channel") String channel,
 			@RequestParam("individualId") String individualId)
 			throws ResidentServiceCheckedException, NoSuchAlgorithmException, ApisResourceAccessException {
 		logger.info("getChannelVerificationStatus method started");
 		VerificationResponseDTO verificationResponseDTO;
 		try {
 			validator.validateChannelVerificationStatus(channel, individualId);
-			verificationResponseDTO = verificationServiceImpl.checkChannelVerificationStatus(channel, individualId);
+			verificationResponseDTO = verificationService.checkChannelVerificationStatus(channel, individualId);
 		} catch (ResidentServiceCheckedException | ResidentServiceException | InvalidInputException e) {
 			audit.setAuditRequestDto(EventEnum.VERIFICATION_STATUS_FAILURE);
 			e.setMetadata(Map.of(ResidentConstants.REQ_RES_ID, ResidentConstants.VERIFICATION_STATUS_ID));

resident/resident-service/src/main/java/io/mosip/resident/dto/DynamicFieldConsolidateResponseDto.java

@@ -1,12 +1,12 @@
 package io.mosip.resident.dto;
 
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 /**
  * @author Kamesh Shekhar Prasad
  * Dynamic Field Consolidate Response Dto

resident/resident-service/src/main/java/io/mosip/resident/dto/UserInfoDto.java

@@ -1,6 +1,5 @@
 package io.mosip.resident.dto;
 
-import java.time.LocalDateTime;
 import java.util.Map;
 
 import lombok.Data;

resident/resident-service/src/main/java/io/mosip/resident/exception/InvalidInputException.java

@@ -1,6 +1,5 @@
 package io.mosip.resident.exception;
 
-import io.mosip.kernel.core.exception.BaseUncheckedException;
 import io.mosip.resident.constant.ResidentErrorCode;
 
 public class InvalidInputException extends BaseResidentUncheckedExceptionWithMetadata {

resident/resident-service/src/main/java/io/mosip/resident/filter/RepeatableStreamHttpServletRequest.java

@@ -105,7 +105,7 @@ public void replaceData(byte[] newData) {
 
 	/**
 	 * The Class RepeatableServletInputStream - used in
-	 * ResettableStreamHttpServletRequest
+	 * RepeatableServletInputStream
 	 */
 	private class RepeatableServletInputStream extends ServletInputStream {