read call home schema url from property file

Author: nitin-ebi

src/main/java/uk/ac/ebi/eva/submission/service/CallHomeService.java

@@ -36,7 +36,7 @@ public CallHomeService(CallHomeEventRepository callHomeEventRepository, SchemaDo
 
     public boolean validateJson(JsonNode jsonPayload) {
         String latestTag = schemaDownloader.getLatestTag(SchemaDownloader.TAG_URL);
-        String schemaURLWithLatestTag = SchemaDownloader.SCHEMA_URL.replace("{tag}", latestTag);
+        String schemaURLWithLatestTag = schemaDownloader.getCallhomeSchemaURL().replace("{tag}", latestTag);
         String schemaContent = schemaDownloader.loadSchemaFromGitHub(schemaURLWithLatestTag);
         Schema schema = schemaRegistry.getSchema(schemaContent, InputFormat.JSON);
         List<com.networknt.schema.Error> errorList = schema.validate(jsonPayload.toString(), InputFormat.JSON,

src/main/java/uk/ac/ebi/eva/submission/util/SchemaDownloader.java

@@ -1,6 +1,7 @@
 package uk.ac.ebi.eva.submission.util;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.retry.annotation.Backoff;
@@ -12,7 +13,9 @@
 @Component
 public class SchemaDownloader {
     public static String TAG_URL = "https://api.github.com/repos/EBIvariation/eva-sub-cli/tags";
-    public static String SCHEMA_URL = "https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/{tag}/eva_sub_cli/etc/call_home_payload_schema.json";
+
+    @Value("${callhome.schema.url}")
+    private String callhomeSchemaURL;
 
     private final RestTemplate restTemplate;
 
@@ -41,4 +44,7 @@ public void evictLatestTagCache() {}
     @Scheduled(fixedRate = 48 * 60 * 60 * 1000)
     public void evictSchemaCache() {}
 
+    public String getCallhomeSchemaURL() {
+        return callhomeSchemaURL;
+    }
 }

src/main/resources/application.properties

@@ -33,4 +33,5 @@ server.servlet.context-path=/eva/webservices/submission-ws
 
 management.metrics.binders.jvm.enabled=false
 
+callhome.schema.url=|callhome.schema-url|
 spring.cache.type=simple

src/test/java/uk/ac/ebi/eva/submission/integration/CallHomeWSIntegrationTest.java

@@ -2,21 +2,19 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -26,20 +24,13 @@
 import uk.ac.ebi.eva.submission.service.GlobusTokenRefreshService;
 import uk.ac.ebi.eva.submission.util.SchemaDownloader;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.doThrow;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -48,9 +39,12 @@
 @AutoConfigureMockMvc
 @Testcontainers
 public class CallHomeWSIntegrationTest {
+    private static String callhomeSchemaURL = "https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/main/eva_sub_cli/etc/call_home_payload_schema.json";
+
     @Autowired
     private CallHomeEventRepository callHomeEventRepository;
 
+    @SpyBean
     @Autowired
     private SchemaDownloader schemaDownloader;
 
@@ -63,34 +57,9 @@ public class CallHomeWSIntegrationTest {
     @Autowired
     private MockMvc mvc;
 
-    @MockBean
-    private static RestTemplate restTemplate;
-
-    private static String mockVersion = "v1.0.0";
-    private static String mockSchemaUrl = SchemaDownloader.SCHEMA_URL.replace("{tag}", mockVersion);
-    private static String schema = "";
-
-    @BeforeAll
-    public static void downloadSchema() throws IOException {
-        // get schema from main
-        String schemaURL = "https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/main/eva_sub_cli/etc/call_home_payload_schema.json";
-        try (InputStream in = new URL(schemaURL).openStream();
-             BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
-            schema = reader.lines().collect(Collectors.joining("\n"));
-        }
-    }
-
     @BeforeEach
-    public void setup() throws IOException {
+    public void setup() {
         schemaDownloader.evictSchemaCache();
-
-        // mock tag
-        ObjectMapper mapper = new ObjectMapper();
-        ArrayNode arrayNode = mapper.createArrayNode();
-        ObjectNode tagNode = mapper.createObjectNode();
-        tagNode.put("name", mockVersion);
-        arrayNode.add(tagNode);
-        when(restTemplate.getForObject(eq(SchemaDownloader.TAG_URL), eq(JsonNode.class))).thenReturn(arrayNode);
     }
 
     @Container
@@ -108,15 +77,14 @@ static void dataSourceProperties(DynamicPropertyRegistry registry) {
         registry.add("eva.email.server", () -> "test-email-server");
         registry.add("eva.email.port", () -> 1025);
         registry.add("eva.helpdesk.email", () -> "test-helpdesk-email");
+        registry.add("callhome.schema.url", () -> callhomeSchemaURL);
     }
 
 
     @Test
     @Transactional
     public void testRegisterCallHomeEvent() throws Exception {
-        when(restTemplate.getForObject(eq(mockSchemaUrl), eq(String.class))).thenReturn(schema);
         ObjectMapper mapper = new ObjectMapper();
-
         ObjectNode callHomeJsonRootNode = getCallHomeJson(mapper);
 
         mvc.perform(post("/v1/call-home/events")
@@ -151,9 +119,7 @@ public void testRegisterCallHomeEvent() throws Exception {
     @Test
     @Transactional
     public void testRegisterCallHomeEvent_BadRequestAsFieldIsMissing() throws Exception {
-        when(restTemplate.getForObject(eq(mockSchemaUrl), eq(String.class))).thenReturn(schema);
         ObjectMapper mapper = new ObjectMapper();
-
         ObjectNode callHomeJsonRootNode = getCallHomeJson(mapper);
         callHomeJsonRootNode.putNull("eventType");
 
@@ -174,9 +140,10 @@ public void testRegisterCallHomeEvent_BadRequestAsFieldIsMissing() throws Except
     @Test
     @Transactional
     public void testRegisterCallHomeEvent_InternalServerError() throws Exception {
-        when(restTemplate.getForObject(eq(mockSchemaUrl), eq(String.class))).thenReturn(null);
-        ObjectMapper mapper = new ObjectMapper();
+        doThrow(new RuntimeException("Exception while downloading schema"))
+                .when(schemaDownloader).loadSchemaFromGitHub(callhomeSchemaURL);
 
+        ObjectMapper mapper = new ObjectMapper();
         ObjectNode callHomeJsonRootNode = getCallHomeJson(mapper);
 
         mvc.perform(post("/v1/call-home/events")