Merge pull request #7 from kaifk468/master

[ES-504] Added new resource loader in sunbird-vci-plugin initilize method to load the template from url
mosip · Jan 10, 2024 · b19cdfd · b19cdfd
2 parents 0b78698 + b5f86cf
commit b19cdfd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/...n/java/io/mosip/esignet/sunbirdrc/integration/service/SunbirdRCAuthenticationService.java b/...n/java/io/mosip/esignet/sunbirdrc/integration/service/SunbirdRCAuthenticationService.java
@@ -6,7 +6,6 @@
 package io.mosip.esignet.sunbirdrc.integration.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.mosip.esignet.api.dto.*;
 import io.mosip.esignet.api.exception.KycAuthException;
@@ -177,7 +176,7 @@ private RegistrySearchRequestDto createRegistrySearchRequestDto(String challenge
         registrySearchRequestDto.setOffset(0);
         Map<String,Map<String,String>> filter=new HashMap<>();
 
-        Map<String, String> challengeMap = objectMapper.readValue(challenge, new TypeReference<Map<String, String>>() {});
+        Map<String, String> challengeMap = objectMapper.readValue(challenge, Map.class);
 
 
         for(Map<String,String> fieldDetailMap: fieldDetailList) {

diff --git a/...c/main/java/io/mosip/esignet/sunbirdrc/integration/service/SunbirdRCVCIssuancePlugin.java b/...c/main/java/io/mosip/esignet/sunbirdrc/integration/service/SunbirdRCVCIssuancePlugin.java
@@ -6,7 +6,11 @@
 package io.mosip.esignet.sunbirdrc.integration.service;
 
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringWriter;
+import java.net.URL;
+import java.net.URLConnection;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -17,6 +21,7 @@
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.resource.loader.URLResourceLoader;
 import org.json.JSONArray;
@@ -83,10 +88,21 @@ public class SunbirdRCVCIssuancePlugin implements VCIssuancePlugin {
 
     @PostConstruct
     public  void initialize() throws VCIExchangeException {
-
         vEngine = new VelocityEngine();
+        URLResourceLoader urlResourceLoader = new URLResourceLoader() {
+            @Override
+            public InputStream getResourceStream(String name) throws ResourceNotFoundException {
+                try {
+                    URL url = new URL(name);
+                    URLConnection connection = url.openConnection();
+                    return connection.getInputStream();
+                } catch (IOException e) {
+                    throw new ResourceNotFoundException("Unable to find resource '" + name + "'");
+                }
+            }
+        };
         vEngine.setProperty(RuntimeConstants.RESOURCE_LOADER, "url");
-        vEngine.setProperty("url.resource.loader.class", URLResourceLoader.class.getName());
+        vEngine.setProperty("url.resource.loader.instance", urlResourceLoader);
         vEngine.init();
         //Validate all the supported VC
         for (String credentialType : supportedCredentialTypes) {