resolved review comments

Signed-off-by: Sachin Rana <[email protected]>
mosip · Dec 11, 2024 · 030ba76 · 030ba76
1 parent 81f6a93
commit 030ba76
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/...t-core/src/main/java/io/mosip/esignet/core/validator/ClientAdditionalConfigValidator.java b/...t-core/src/main/java/io/mosip/esignet/core/validator/ClientAdditionalConfigValidator.java
@@ -8,7 +8,8 @@
 import com.networknt.schema.ValidationMessage;
 import io.mosip.esignet.core.exception.EsignetException;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 
@@ -23,13 +24,16 @@
 public class ClientAdditionalConfigValidator implements
         ConstraintValidator<ClientAdditionalConfig, Map<String, Object>> {
 
-    private String schemaUrl = "classpath:additional_config_request_schema.json";
+    @Value("${mosip.esignet.additional-config.schema.url}")
+    private String schemaUrl;
 
     private volatile JsonSchema cachedSchema;
 
-    private ObjectMapper objectMapper = new ObjectMapper();
+    @Autowired
+    private ObjectMapper objectMapper;
 
-    private ResourceLoader resourceLoader = new DefaultResourceLoader();
+    @Autowired
+    private ResourceLoader resourceLoader;
 
     @Override
     public void initialize(ClientAdditionalConfig constraintAnnotation) {

diff --git a/esignet-core/src/test/java/io/mosip/esignet/core/ValidatorTest.java b/esignet-core/src/test/java/io/mosip/esignet/core/ValidatorTest.java
@@ -794,13 +794,18 @@ public void test_ClaimSchemaValidator_withInvalidValue_thenFail() throws IOExcep
 
     @Test
     public void test_ClientAdditionalConfigValidator_withValidValue_thenPass() {
+        ReflectionTestUtils.setField(clientAdditionalConfigValidator, "resourceLoader", resourceLoader);
+        ReflectionTestUtils.setField(clientAdditionalConfigValidator, "objectMapper", mapper);
+        ReflectionTestUtils.setField(clientAdditionalConfigValidator, "schemaUrl", "classpath:additional_config_request_schema.json");
         Map<String, Object> validAdditionalConfig = ClientAdditionalConfigValidatorTestData.getValidAdditionalConfig();
         Assert.assertTrue(clientAdditionalConfigValidator.isValid(validAdditionalConfig, null));
     }
 
     @Test
     public void test_ClientAdditionalConfigValidator_withInvalidValue_thenFail() {
-
+        ReflectionTestUtils.setField(clientAdditionalConfigValidator, "resourceLoader", resourceLoader);
+        ReflectionTestUtils.setField(clientAdditionalConfigValidator, "objectMapper", mapper);
+        ReflectionTestUtils.setField(clientAdditionalConfigValidator, "schemaUrl", "classpath:additional_config_request_schema.json");
         for (Map<String, Object> additionalConfig : ClientAdditionalConfigValidatorTestData.getInvalidAdditionalConfigs()) {
             Assert.assertFalse(clientAdditionalConfigValidator.isValid(additionalConfig, null));
         }

diff --git a/esignet-service/src/main/resources/application-default.properties b/esignet-service/src/main/resources/application-default.properties
@@ -70,6 +70,7 @@ mosip.esignet.signup-id-token-expire-seconds=1800
 mosip.esignet.signup-id-token-audience=mosip-signup-oauth-client
 
 mosip.esignet.claims.schema.url=classpath:/verified_claims_request_schema.json
+mosip.esignet.additional-config.schema.url=classpath:additional_config_request_schema.json
 
 ## ------------------------------------------ e-Signet binding ---------------------------------------------------------
 mosip.esignet.binding.salt-length=16

diff --git a/esignet-service/src/main/resources/application-local.properties b/esignet-service/src/main/resources/application-local.properties
@@ -76,6 +76,8 @@ mosip.esignet.signup-id-token-audience=mosip-signup-oauth-client
 
 mosip.esignet.host=localhost
 mosip.esignet.claims.schema.url=classpath:/verified_claims_request_schema.json
+mosip.esignet.additional-config.schema.url=classpath:additional_config_request_schema.json
+
 
 ## ------------------------------------------ e-Signet binding ---------------------------------------------------------
 mosip.esignet.binding.salt-length=16

diff --git a/esignet-service/src/test/resources/application-test.properties b/esignet-service/src/test/resources/application-test.properties
@@ -53,6 +53,7 @@ mosip.esignet.signup-id-token-audience=mosip-signup-client
 
 
 mosip.esignet.claims.schema.url=classpath:/verified_claims_request_schema_test.json
+mosip.esignet.additional-config.schema.url=classpath:additional_config_request_schema.json
 
 ## ------------------------------------------ e-Signet binding ---------------------------------------------------------
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,6 +53,7 @@ mosip.esignet.signup-id-token-audience=mosip-signup-client


		mosip.esignet.claims.schema.url=classpath:/verified_claims_request_schema_test.json
		mosip.esignet.additional-config.schema.url=classpath:additional_config_request_schema.json

		## ------------------------------------------ e-Signet binding ---------------------------------------------------------

Expand Down