Mosip-32302 Move develop resident service releated code changes to re…

…lease 121x (#935) * Changes done in pom xml for release Signed-off-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> * Changes done in pom xml for release Signed-off-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> * MOSIP-30222 clone-1201-avoid-receiving-of-proof-documents-from-idvid-response (#888) Signed-off-by: Neha Farheen <[email protected]> Co-authored-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> * MOSIP-29499 added partial index to credential-transaction-table (#889) * MOSIP-29499 added partial index to credential-transaction-table Signed-off-by: Neha Farheen <[email protected]> * MOSIP-29499 partial index query added in db upgrade script Signed-off-by: Neha Farheen <[email protected]> --------- Signed-off-by: Neha Farheen <[email protected]> Co-authored-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> * updated vc provider for bestTwoFinger (#893) Signed-off-by: dhanendra06 <[email protected]> Signed-off-by: kameshsr <[email protected]> * added validation on authtype (#896) Signed-off-by: Ritik Jain (IN74108) <[email protected]> Co-authored-by: Ritik Jain (IN74108) <[email protected]> Signed-off-by: kameshsr <[email protected]> * Sonarcloud analysis in ID-Repo (#898) Signed-off-by: Jaya Sai Krishna <[email protected]> Signed-off-by: kameshsr <[email protected]> * MOSIP-31766 Changed the dependent version dependency Signed-off-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * [MOSIP-22441] Added get update count api Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * [MOSIP-22441] fixed immutable map update for update count tracking Signed-off-by: kameshsr <[email protected]> * [MOSIP-22441] fixed immutable map update for update count tracking Signed-off-by: kameshsr <[email protected]> * [MOSIP-22441] added auth role for get rid and get update count api Signed-off-by: kameshsr <[email protected]> * [MOSIP-22441] updated get rid path variable Signed-off-by: kameshsr <[email protected]> * [MOSIP-22441] moved identity update policy to identity-mapping.json Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-21385 formatting and masking (#688) Co-authored-by: M1063027 <[email protected]> Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * Mosip 21385 formatting (#689) * MOSIP-21385 formatting and masking * MOSIP-21385 formatting and masking * MOSIP-21385 formatting and masking Co-authored-by: M1063027 <[email protected]> Signed-off-by: kameshsr <[email protected]> * Develop (#690) * MOSIP-21385 formatting and masking * MOSIP-21385 formatting and masking * MOSIP-21385 formatting and masking * MOSIP-21385-formatting and masking Co-authored-by: M1063027 <[email protected]> Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * Changes done for ticket 22441 (#705) Co-authored-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> * resolved the MOSIP ticket 22141 (#711) Co-authored-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> * Update VidServiceImpl.java (#715) Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * modified the code for fixing the NPE issue (#729) * modified the code for fixing the NPE issue * Update AuditHelper.java Signed-off-by: kameshsr <[email protected]> * Removed Masked VID (#747) * resolved the MOSIP ticket 22141 * bug fixed * Removed Masked VID * Resolved merge conflict Co-authored-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> * updated the API endpoint and response attribute (#750) Co-authored-by: Ritik Jain <[email protected]> Signed-off-by: kameshsr <[email protected]> * [MOSIP-24670] Made correctons in api body #12th task (#751) Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-23945 : resttemplate issue resolved Signed-off-by: kameshsr <[email protected]> * Updated as per review comment Signed-off-by: kameshsr <[email protected]> * MOSIP-30419 Fixed update count Issue (#842) Signed-off-by: kameshsr <[email protected]> * MOSIP-30420 Fixed update identity issue (#843) * MOSIP-30419 Fixed update count Issue Signed-off-by: kameshsr <[email protected]> * MOSIP-30420 Fixed update identity issue Signed-off-by: kameshsr <[email protected]> --------- Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-30420 Added debug log to debug update count issue (#845) Signed-off-by: kameshsr <[email protected]> * MOSIP-30419 Removed update count for update draft (#846) * MOSIP-30419 Removed update count for update draft Signed-off-by: kameshsr <[email protected]> * MOSIP-30419 Refactored code Signed-off-by: kameshsr <[email protected]> --------- Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Added api get draft uin Signed-off-by: kameshsr <[email protected]> * MOSIP-32258 Added junit test case for /draft/uin new api (#930) * MOSIP-32258 Added junit test case for /draft/uin new api Signed-off-by: kameshsr <[email protected]> * MOSIP-32258 Added junit test case for /draft/uin new api Signed-off-by: kameshsr <[email protected]> --------- Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Added api get draft uin Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Updated version Signed-off-by: kameshsr <[email protected]> * Revert "MOSIP-32302 Added api get draft uin" This reverts commit f3ee72a. Signed-off-by: kameshsr <[email protected]> * MOSIP-31759 Added script file and renamed file Signed-off-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> * MOSIP-31759 Added script file and renamed file Signed-off-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> * Updated Pom versions for release changes (#921) Signed-off-by: GitHub <[email protected]> Co-authored-by: Prafulrakhade <[email protected]> * MOSIP-32302 Updated version Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Updated version Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Changed code as per review comments Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fix test case failure Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Added handles Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Reverted handles releated changes Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Reverted handles releated changes Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Removed unnecessary code Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Removed unnecessary code Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Removed unnecessary code Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Fixed merge conflict Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Reverted release code Signed-off-by: kameshsr <[email protected]> * MOSIP-32302 Removed ignore Signed-off-by: kameshsr <[email protected]> --------- Signed-off-by: Neha Farheen <[email protected]> Signed-off-by: kameshsr <[email protected]> Signed-off-by: dhanendra06 <[email protected]> Signed-off-by: Ritik Jain (IN74108) <[email protected]> Signed-off-by: Jaya Sai Krishna <[email protected]> Signed-off-by: GitHub <[email protected]> Signed-off-by: kameshsr <[email protected]> Co-authored-by: Neha Farheen <[email protected]> Co-authored-by: Neha2365 <[email protected]> Co-authored-by: dhanendra06 <[email protected]> Co-authored-by: RitikJain4108 <[email protected]> Co-authored-by: Ritik Jain (IN74108) <[email protected]> Co-authored-by: JayaSaiKrishna11 <[email protected]> Co-authored-by: Manoj SP <[email protected]> Co-authored-by: ramadeviidupulapati <[email protected]> Co-authored-by: M1063027 <[email protected]> Co-authored-by: Neha Farheen <[email protected]> Co-authored-by: Ritik Jain <[email protected]> Co-authored-by: Aiham Hasan <[email protected]> Co-authored-by: Loganathan Sekar <[email protected]> Co-authored-by: Chandra Keshav Mishra <[email protected]> Co-authored-by: Prafulrakhade <[email protected]> Co-authored-by: ase-101 <[email protected]>
mosip · Apr 17, 2024 · 305387a · 305387a
1 parent ee5362d
commit 305387a
Show file tree

Hide file tree

Showing 64 changed files with 3,476 additions and 1,414 deletions.
diff --git a/db_upgrade_scripts/mosip_idrepo/sql/1.2.0.1_to_1.2.1.0_rollback.sql b/db_upgrade_scripts/mosip_idrepo/sql/1.2.0.1_to_1.2.1.0_rollback.sql
@@ -0,0 +1 @@
+\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION'
diff --git a/db_upgrade_scripts/mosip_idrepo/sql/1.2.0.1_to_1.2.1.0_upgrade.sql b/db_upgrade_scripts/mosip_idrepo/sql/1.2.0.1_to_1.2.1.0_upgrade.sql
@@ -0,0 +1 @@
+\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION'
diff --git a/id-repository/credential-request-generator/pom.xml b/id-repository/credential-request-generator/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>io.mosip.idrepository</groupId>
 		<artifactId>id-repository-parent</artifactId>
-		<version>1.2.0.1</version>
+		<version>1.2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>credential-request-generator</artifactId>
-	<version>1.2.0.1</version>
+	<version>1.2.1.0-SNAPSHOT</version>
 	<name>credential-request-generator</name>
 
 	<properties>

diff --git a/...o/mosip/credential/request/generator/controller/CredentialRequestGeneratorController.java b/...o/mosip/credential/request/generator/controller/CredentialRequestGeneratorController.java
@@ -1,29 +1,18 @@
 package io.mosip.credential.request.generator.controller;
 
-import javax.annotation.Nullable;
-
-import io.mosip.idrepository.core.dto.*;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
 import io.mosip.credential.request.generator.dto.CredentialStatusEvent;
 import io.mosip.credential.request.generator.exception.CredentialRequestGeneratorException;
 import io.mosip.credential.request.generator.init.CredentialInstializer;
 import io.mosip.credential.request.generator.init.SubscribeEvent;
 import io.mosip.credential.request.generator.service.CredentialRequestService;
 import io.mosip.credential.request.generator.validator.RequestValidator;
+import io.mosip.idrepository.core.dto.CredentialIssueRequest;
+import io.mosip.idrepository.core.dto.CredentialIssueRequestDto;
+import io.mosip.idrepository.core.dto.CredentialIssueResponse;
+import io.mosip.idrepository.core.dto.CredentialIssueResponseDto;
+import io.mosip.idrepository.core.dto.CredentialIssueStatusResponse;
+import io.mosip.idrepository.core.dto.CredentialRequestIdsDto;
+import io.mosip.idrepository.core.dto.PageDto;
 import io.mosip.idrepository.core.exception.IdRepoAppException;
 import io.mosip.idrepository.core.logger.IdRepoLogger;
 import io.mosip.kernel.core.http.RequestWrapper;
@@ -38,6 +27,22 @@
 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 org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Nullable;
 
 
 /**
@@ -85,6 +90,7 @@ public class CredentialRequestGeneratorController {
 			@ApiResponse(responseCode = "403", description = "Forbidden" ,content = @Content(schema = @Schema(hidden = true))),
 			@ApiResponse(responseCode = "404", description = "Not Found" ,content = @Content(schema = @Schema(hidden = true)))})
 	public ResponseEntity<Object> credentialIssue(
+
 			@RequestBody  RequestWrapper<CredentialIssueRequest>  credentialIssueRequestDto) throws IdRepoAppException {
 		requestValidator.validateRequestGeneratorRequest(credentialIssueRequestDto);
 		ResponseWrapper<CredentialIssueResponse> credentialIssueResponseWrapper = credentialRequestService

diff --git a/...-request-generator/src/main/java/io/mosip/credential/request/generator/util/RestUtil.java b/...-request-generator/src/main/java/io/mosip/credential/request/generator/util/RestUtil.java
@@ -1,27 +1,24 @@
 package io.mosip.credential.request.generator.util;
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
-
-import javax.net.ssl.SSLContext;
 
+import com.google.gson.Gson;
+import io.mosip.credential.request.generator.constants.ApiName;
+import io.mosip.idrepository.core.dto.Metadata;
+import io.mosip.idrepository.core.dto.SecretKeyRequest;
+import io.mosip.idrepository.core.dto.TokenRequestDTO;
+import io.mosip.idrepository.core.util.EnvUtil;
+import io.mosip.kernel.core.util.DateUtils;
+import io.mosip.kernel.core.util.StringUtils;
+import io.mosip.kernel.core.util.TokenHandlerUtil;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.TrustStrategy;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -34,16 +31,12 @@
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import com.google.gson.Gson;
-
-import io.mosip.credential.request.generator.constants.ApiName;
-import io.mosip.idrepository.core.dto.Metadata;
-import io.mosip.idrepository.core.dto.SecretKeyRequest;
-import io.mosip.idrepository.core.dto.TokenRequestDTO;
-import io.mosip.idrepository.core.util.EnvUtil;
-import io.mosip.kernel.core.util.DateUtils;
-import io.mosip.kernel.core.util.StringUtils;
-import io.mosip.kernel.core.util.TokenHandlerUtil;
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -61,6 +54,14 @@ public class RestUtil {
 
 	private static final String CONTENT_TYPE = "Content-Type";
 
+	@Value("${idrepo.default.processor.httpclient.connections.max.per.host:20}")
+	private int maxConnectionPerRoute;
+
+	@Value("${idrepo.default.processor.httpclient.connections.max:100}")
+	private int totalMaxConnection;
+
+	private RestTemplate restTemplate;
+
 	/**
 	 * Post api.
 	 *
@@ -181,18 +182,17 @@ public <T> T getApi(ApiName apiName, List<String> pathsegments, String queryPara
 	 * @throws NoSuchAlgorithmException the no such algorithm exception
 	 * @throws KeyStoreException        the key store exception
 	 */
-    public RestTemplate getRestTemplate() throws KeyManagementException, NoSuchAlgorithmException, KeyStoreException {
-        TrustStrategy acceptingTrustStrategy = (X509Certificate[] chain, String authType) -> true;
-        SSLContext sslContext = org.apache.http.ssl.SSLContexts.custom()
-                .loadTrustMaterial(null, acceptingTrustStrategy).build();
-        SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext);
-        CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(csf).build();
-        HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
-        requestFactory.setHttpClient(httpClient);
-
-        return new RestTemplate(requestFactory);
-
-    }
+	public RestTemplate getRestTemplate() throws KeyManagementException, NoSuchAlgorithmException, KeyStoreException {
+		if (restTemplate == null) {
+			HttpClientBuilder httpClientBuilder = HttpClients.custom().setMaxConnPerRoute(maxConnectionPerRoute)
+					.setMaxConnTotal(totalMaxConnection).disableCookieManagement();
+			HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
+			requestFactory.setHttpClient(httpClientBuilder.build());
+
+			restTemplate = new RestTemplate(requestFactory);
+		}
+		return restTemplate;
+	}
 
 	/**
 	 * Sets the request header.

diff --git a/...rator/src/main/java/io/mosip/credential/request/generator/validator/RequestValidator.java b/...rator/src/main/java/io/mosip/credential/request/generator/validator/RequestValidator.java
@@ -1,13 +1,12 @@
 package io.mosip.credential.request.generator.validator;
 
-import static io.mosip.idrepository.core.constant.IdRepoErrorConstants.INVALID_INPUT_PARAMETER;
-
-import org.springframework.stereotype.Component;
-
 import io.mosip.idrepository.core.dto.CredentialIssueRequest;
 import io.mosip.idrepository.core.exception.IdRepoAppException;
 import io.mosip.kernel.core.http.RequestWrapper;
 import io.mosip.kernel.core.util.StringUtils;
+import org.springframework.stereotype.Component;
+
+import static io.mosip.idrepository.core.constant.IdRepoErrorConstants.INVALID_INPUT_PARAMETER;
 
 /**
  * @author Kamesh Shekhar Prasad
@@ -25,7 +24,7 @@ public void validateRequestGeneratorRequest(RequestWrapper<CredentialIssueReques
         validateDataToCheckNullOrEmpty(requestWrapper.getRequest().getCredentialType(),
                 CREDENTIAL_TYPE);
         validateDataToCheckNullOrEmpty(requestWrapper.getRequest().getIssuer(), ISSUER);
-       
+
     }
 
     private void validateAPIRequestToCheckNull(RequestWrapper<CredentialIssueRequest> requestWrapper) throws IdRepoAppException {
@@ -41,4 +40,4 @@ private void validateDataToCheckNullOrEmpty(String variableValue, String variabl
                     String.format(INVALID_INPUT_PARAMETER.getErrorMessage(), variableName));
         }
     }
-}
+}
diff --git a/...redential/request/generator/test/controller/CredentialRequestGeneratorControllerTest.java b/...redential/request/generator/test/controller/CredentialRequestGeneratorControllerTest.java
@@ -1,7 +1,21 @@
 package io.mosip.credential.request.generator.test.controller;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import io.mosip.credential.request.generator.controller.CredentialRequestGeneratorController;
+import io.mosip.credential.request.generator.dto.CredentialStatusEvent;
+import io.mosip.credential.request.generator.init.CredentialInstializer;
+import io.mosip.credential.request.generator.init.SubscribeEvent;
+import io.mosip.credential.request.generator.service.CredentialRequestService;
+import io.mosip.credential.request.generator.test.TestBootApplication;
+import io.mosip.credential.request.generator.test.config.TestConfig;
+import io.mosip.credential.request.generator.validator.RequestValidator;
+import io.mosip.idrepository.core.dto.CredentialIssueRequestDto;
+import io.mosip.idrepository.core.dto.CredentialIssueResponse;
+import io.mosip.idrepository.core.dto.CredentialIssueStatusResponse;
+import io.mosip.idrepository.core.dto.CredentialRequestIdsDto;
+import io.mosip.idrepository.core.dto.PageDto;
+import io.mosip.kernel.core.http.ResponseWrapper;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -21,23 +35,7 @@
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import io.mosip.credential.request.generator.controller.CredentialRequestGeneratorController;
-import io.mosip.credential.request.generator.dto.CredentialStatusEvent;
-import io.mosip.credential.request.generator.init.CredentialInstializer;
-import io.mosip.credential.request.generator.init.SubscribeEvent;
-import io.mosip.credential.request.generator.service.CredentialRequestService;
-import io.mosip.credential.request.generator.test.TestBootApplication;
-import io.mosip.credential.request.generator.test.config.TestConfig;
-import io.mosip.credential.request.generator.validator.RequestValidator;
-import io.mosip.idrepository.core.dto.CredentialIssueRequestDto;
-import io.mosip.idrepository.core.dto.CredentialIssueResponse;
-import io.mosip.idrepository.core.dto.CredentialIssueStatusResponse;
-import io.mosip.idrepository.core.dto.CredentialRequestIdsDto;
-import io.mosip.idrepository.core.dto.PageDto;
-import io.mosip.kernel.core.http.ResponseWrapper;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = TestConfig.class)
@@ -48,6 +46,9 @@ public class CredentialRequestGeneratorControllerTest {
 	@Mock
 	private CredentialRequestService credentialRequestService;
 
+	@Mock
+	private RequestValidator requestValidator;
+
 	@InjectMocks
 	private CredentialRequestGeneratorController credentialRequestGeneratorController;
 
@@ -74,9 +75,6 @@ public class CredentialRequestGeneratorControllerTest {
 	@Mock
 	JobLauncher jobLauncher;
 
-	@Mock
-	private RequestValidator requestValidator;
-
 	@Before
 	public void setup() throws Exception {
 		credentialIssueStatusResponseWrapper=new ResponseWrapper<CredentialIssueStatusResponse>();

diff --git a/id-repository/credential-service/pom.xml b/id-repository/credential-service/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>io.mosip.idrepository</groupId>
 		<artifactId>id-repository-parent</artifactId>
-		<version>1.2.0.1</version>
+		<version>1.2.1.0-SNAPSHOT</version>
 	</parent>
 	<groupId>io.mosip.idrepository</groupId>
 	<artifactId>credential-service</artifactId>
-	<version>1.2.0.1</version>
+	<version>1.2.1.0-SNAPSHOT</version>
 	<name>credential-service</name>
 	<url>http://maven.apache.org</url>
 	<properties>
@@ -233,6 +233,6 @@
 					</execution>
 				</executions>
 			</plugin>
-		</plugins>
+        </plugins>
 	</build>
 </project>
diff --git a/...dential-service/src/main/java/io/mosip/credentialstore/constants/CredentialConstants.java b/...dential-service/src/main/java/io/mosip/credentialstore/constants/CredentialConstants.java
@@ -31,7 +31,7 @@ public class CredentialConstants {
 
 	public static final String DATEOFBIRTH = "dateOfBirth";
 
-	public static final String FULLNAME = "fullname";
+	public static final String FULLNAME = "fullName";
 
 	public static final String ENCRYPTIONKEY = "encryptionKey";
 
@@ -47,4 +47,36 @@ public class CredentialConstants {
 
 	public static final String BF_RANK = "rank";
 
+
+	public static final String MASKING_ATTRIBUTES = "maskingAttributes";
+
+	public static final String FORMATTING_ATTRIBUTES = "formatingAttributes";
+
+	public static final String NAME = "name";
+
+	public static final String POSTALCODE = "postalCode";
+
+	public static final String LANGUAGE = "eng";
+
+	public static final String FORMAT = "format";
+
+	public static final String FULLADDRESS = "fullAddress";
+
+	/** The Constant DATETIME_PATTERN. */
+	public static final String DATETIME_PATTERN = "mosip.credential.service.datetime.pattern";
+
+	public static final String IDENTITY_ATTRIBUTES = "mosip.mask.function.identityAttributes";
+
+	public static final String DATE_FORMAT_FUNCTION = "mosip.mask.function.date";
+
+	public static final String ADDRESS_FORMAT_FUNCTION = "mosip.format.function.address";
+
+	public static final String NAME_FORMAT_FUNCTION = "mosip.format.function.name";
+
+	public static final String DATE_TIME_FORMAT_FUNCTION = "mosip.format.function.dateTimeFormat";
+
+	public static final String CREDENTIAL_PHOTO_ATTRIBUTE_NAMES = "mosip.credential.photo.attribute.names";
+	public static final String CREDENTIAL_NAME_ATTRIBUTE_NAMES = "mosip.credential.name.attribute.names";
+	public static final String CREDENTIAL_ADDRESS_ATTRIBUTE_NAMES = "mosip.credential.address.attribute.names";
+
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION'