Renamed env variable used to provide python installation from pythonLocation to pythonExecutable to avoid conflicts if pythonLocation points already to a path

Author: ThomasJejkal

README.md

@@ -27,13 +27,13 @@ Dependencies that are needed to build and are not being downloaded via gradle:
 
 ### Python Location
 
-Currently, mapping-service requires Python to be installed in order to build and to run. At runtime, the Python location is configured in 
-`application.properties`(see below). For building the mapping-service Python location is set to `/usr/bin/python3` by default. In case you want to build 
+Currently, mapping-service requires Python to be installed in order to build and to run. At runtime, the Python executable is configured in 
+`application.properties`(see below). For building the mapping-service Python executable is set to `/usr/bin/python3` by default. In case you want to build 
 the mapping-service on a machine on which the Python installation is located elsewhere, e.g., under Windows, you can provide the Python location 
 used at compile time externally, i.e.:
 
 ```
-.\gradlew -Pclean-release "-DpythonLocation=file:///C:/Python310/python.exe" build
+.\gradlew -Pclean-release "-DpythonExecutable=file:///C:/Python310/python.exe" build
 ```
 
 ## How to start
@@ -42,7 +42,7 @@ Before you can start the mapping-service, you  first have to create an `applicat
 and modify it according to your needs. Espacially the following properties (at the end of the file) are important:
 - `spring.datasource.url=jdbc:h2:file:/tmp/mapping-service/database`
 The path points to the location of the database in which your configured mappings are stored.
-- `mapping-service.pythonLocation=${pythonLocation:'file:///usr/bin/python3'}` \
+- `mapping-service.pythonLocation=${pythonExecutable:'file:///usr/bin/python3'}` \
 If no pythonLocation is provided externally (see above) the default `/usr/bin/python3` is used.
 - `mapping-service.pluginLocation=file:///tmp/mapping-service/plugins` \
 The local folder where available plugins are located.

build.gradle

@@ -36,7 +36,7 @@ repositories {
 ext {
     set('snippetsDir', file('build/generated-snippets'))
     applicationProperties = System.getProperty('applicationProperties', './src/test/resources/test-config/application-test.properties')
-    pythonLocation = System.getProperty('pythonLocation', 'file:///c:/python310/python.exe')
+    pythonLocation = System.getProperty('pythonExecutable', 'file:///c:/python310/python.exe')
 }
 
 dependencies {

src/test/java/edu/kit/datamanager/mappingservice/rest/impl/MappingExecutionControllerTest.java

@@ -50,16 +50,15 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
-
 @ExtendWith({RestDocumentationExtension.class, SpringExtension.class})
 @EnableRuleMigrationSupport
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, classes = MappingServiceApplication.class)
 @AutoConfigureMockMvc
 @TestExecutionListeners(listeners = {ServletTestExecutionListener.class,
-        DependencyInjectionTestExecutionListener.class,
-        DirtiesContextTestExecutionListener.class,
-        TransactionalTestExecutionListener.class,
-        WithSecurityContextTestExecutionListener.class})
+    DependencyInjectionTestExecutionListener.class,
+    DirtiesContextTestExecutionListener.class,
+    TransactionalTestExecutionListener.class,
+    WithSecurityContextTestExecutionListener.class})
 @ActiveProfiles("test")
 @TestPropertySource(properties = {"server.port=41500"})
 public class MappingExecutionControllerTest {
@@ -96,8 +95,8 @@ private void createMapping() throws Exception {
         MockMultipartFile mappingFile = new MockMultipartFile("document", "my_dc4gemma.mapping", "application/json", mappingContent.getBytes());
 
         this.mockMvc.perform(MockMvcRequestBuilders.multipart("/api/v1/mappingAdministration/").
-                        file(recordFile).
-                        file(mappingFile)).
+                file(recordFile).
+                file(mappingFile)).
                 andDo(print()).
                 andExpect(status().isCreated()).
                 andExpect(redirectedUrlPattern("http://*:*/api/v1/mappingAdministration/*")).
@@ -140,8 +139,7 @@ void mapValidDocument() throws Exception {
         this.mockMvc.perform(MockMvcRequestBuilders.multipart(MAPPING_URL).file(mappingFile)).
                 andDo(print()).
                 andExpect(status().isOk()).
-                andExpect(content().string("Hello World!")).
-                andReturn();
+                andExpect(header().string("content-disposition", "attachment;result.txt")).andReturn();
     }
 
     @Test
@@ -164,7 +162,6 @@ void mapWithoutDocument() throws Exception {
 //                andExpect(content().string("There is no result for the input. The input must be invalid.")).
 //                andReturn();
 //    }
-
     @Test
     void mapWithMissingParameters() throws Exception {
         String mappingContent = FileUtils.readFileToString(new File("src/test/resources/examples/gemma/simple.json"), StandardCharsets.UTF_8);
@@ -199,7 +196,6 @@ void mapWithInvalidID() throws Exception {
 //                andExpect(content().string("No mapping record found for mapping my_dc/gkahjg.")).
 //                andReturn();
 //    }
-
 //    @Test
 //    void mapWithTypeMissing() throws Exception {
 //        String mappingContent = FileUtils.readFileToString(new File("src/test/resources/examples/gemma/simple.json"), StandardCharsets.UTF_8);
@@ -210,4 +206,4 @@ void mapWithInvalidID() throws Exception {
 //                andExpect(status().isNotFound()).
 //                andReturn();
 //    }
-}
+}

src/test/resources/test-config/application-test.properties

@@ -48,7 +48,7 @@ spring.jpa.hibernate.ddl-auto=update
 # Mapping-Service specific settings
 ##################################################
 # Absolute path to the local python interpreter
-mapping-service.pythonLocation=${pythonLocation:'file:///usr/bin/python3'}
+mapping-service.pythonLocation=${pythonExecutable:'file:///usr/bin/python3'}
 # Absolute path to the folder where all plugins are located
 mapping-service.pluginLocation=file:///${user.dir}/plugins
 # Absolute path to the local gemma mappings folder