changed lazy loading to eagerly loading of schema [ES-2153, ES-2155] (#…

…321) * changed lazy loading to eagerly loading of schema Signed-off-by: Sachin Rana <[email protected]> * removed annotation which was not required Signed-off-by: Sachin Rana <[email protected]> --------- Signed-off-by: Sachin Rana <[email protected]>
mosip · Jan 21, 2025 · c55e1b9 · c55e1b9
1 parent 02fa4ca
commit c55e1b9
Showing 1 changed file with 11 additions and 16 deletions.
diff --git a/...src/main/java/io/mosip/esignet/mock/identitysystem/validator/IdentitySchemaValidator.java b/...src/main/java/io/mosip/esignet/mock/identitysystem/validator/IdentitySchemaValidator.java
@@ -4,17 +4,17 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.schema.*;
 import io.mosip.esignet.mock.identitysystem.dto.IdentityData;
-import io.mosip.esignet.mock.identitysystem.dto.RequestWrapper;
 import lombok.extern.slf4j.Slf4j;
-import org.jose4j.lang.StringUtil;
 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;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
+import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Set;
@@ -32,7 +32,7 @@ public class IdentitySchemaValidator implements ConstraintValidator<IdentitySche
 
     private String action;
 
-    private volatile JsonSchema schema;
+    private JsonSchema schema;
 
     @Autowired
     ObjectMapper objectMapper;
@@ -46,6 +46,13 @@ public void initialize(IdentitySchema constraintAnnotation) {
         this.action = constraintAnnotation.action();
     }
 
+    @PostConstruct
+    public void initSchema() {
+        InputStream schemaResponse = getResource(identitySchemaUrl);
+        JsonSchemaFactory jsonSchemaFactory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V202012);
+        schema = jsonSchemaFactory.getSchema(schemaResponse);
+    }
+
     @Override
     public boolean isValid(Object object, ConstraintValidatorContext context) {
 
@@ -65,7 +72,7 @@ public boolean isValid(Object object, ConstraintValidatorContext context) {
     }
 
     private Set<ValidationMessage> validateIdentityData(JsonNode identityJsonNode) {
-        Set<ValidationMessage> errors = getSchema().validate(identityJsonNode);
+        Set<ValidationMessage> errors = schema.validate(identityJsonNode);
         // If not a create operation, filter out specific errors
         if (action.equals("UPDATE")) {
             // Ignore validation errors with code 1029 (null value) and for exempted fields when validating updateIdentity
@@ -85,18 +92,6 @@ private void addValidationErrorCode(Set<ValidationMessage> errors, ConstraintVal
                 .addConstraintViolation());
     }
 
-    private JsonSchema getSchema()  {
-        if(schema !=null ) return schema;
-        synchronized (this) {
-            if (schema == null) {
-                InputStream schemaResponse = getResource(identitySchemaUrl);
-                JsonSchemaFactory jsonSchemaFactory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V202012);
-                schema = jsonSchemaFactory.getSchema(schemaResponse);
-            }
-        }
-        return schema;
-    }
-
     private InputStream getResource(String url) {
         try{
             Resource resource = resourceLoader.getResource(url);