diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java index a74a2130..67eee679 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java @@ -34,6 +34,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.util.stream.Collectors; import com.fasterxml.jackson.databind.ObjectMapper; @@ -107,14 +108,14 @@ public abstract class AbstractTransformerController implements TransformControll @Autowired private ObjectMapper objectMapper; - @GetMapping(value = "/info") + @GetMapping(value = "/transform/config") public ResponseEntity info() { logger.info("GET Transform Config."); try { ClassPathResource classPathResource = new ClassPathResource(ENGINE_CONFIG); - File engineConfigFile = classPathResource.getFile(); + InputStream engineConfigFile = classPathResource.getInputStream(); TransformConfig transformConfig = objectMapper.setSerializationInclusion(NON_NULL) .readValue(engineConfigFile, TransformConfig.class); diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java index df5eb7c4..8f257d77 100644 --- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java +++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java @@ -312,7 +312,7 @@ public abstract class AbstractTransformerControllerTest ReflectionTestUtils .setField(AbstractTransformerController.class, "ENGINE_CONFIG", "engine_config.json"); - String response = mockMvc.perform(MockMvcRequestBuilders.get("/info")) + String response = mockMvc.perform(MockMvcRequestBuilders.get("/transform/config")) .andExpect(status().is(OK.value())).andExpect( header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE)) .andReturn().getResponse().getContentAsString(); @@ -330,7 +330,7 @@ public abstract class AbstractTransformerControllerTest ReflectionTestUtils.setField(AbstractTransformerController.class, "ENGINE_CONFIG", "engine_config_with_duplicates.json"); - String response = mockMvc.perform(MockMvcRequestBuilders.get("/info")) + String response = mockMvc.perform(MockMvcRequestBuilders.get("/transform/config")) .andExpect(status().is(OK.value())).andExpect( header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE)) .andReturn().getResponse().getContentAsString(); @@ -357,7 +357,7 @@ public abstract class AbstractTransformerControllerTest ReflectionTestUtils.setField(AbstractTransformerController.class, "ENGINE_CONFIG", "engine_config_incomplete.json"); - String response = mockMvc.perform(MockMvcRequestBuilders.get("/info")) + String response = mockMvc.perform(MockMvcRequestBuilders.get("/transform/config")) .andExpect(status().is(OK.value())).andExpect( header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE)) .andReturn().getResponse().getContentAsString(); @@ -379,7 +379,7 @@ public abstract class AbstractTransformerControllerTest ReflectionTestUtils.setField(AbstractTransformerController.class, "ENGINE_CONFIG", "engine_config_no_transform_options.json"); - String response = mockMvc.perform(MockMvcRequestBuilders.get("/info")) + String response = mockMvc.perform(MockMvcRequestBuilders.get("/transform/config")) .andExpect(status().is(OK.value())).andExpect( header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE)) .andReturn().getResponse().getContentAsString();