Removed pythonLocation entirely from code and changed to pythonExecutable

Author: ThomasJejkal

build.gradle

@@ -94,7 +94,7 @@ test {
     println("Running tests with python: ${pythonExecutable}")
     println("Running tests in directory: ${userDir}")
     environment 'spring.config.location', applicationProperties
-    environment 'pythonLocation', pythonExecutable
+    environment 'pythonExecutable', pythonExecutable
     useJUnitPlatform()
     testLogging.showStandardStreams = true
 }

src/main/java/edu/kit/datamanager/mappingservice/configuration/ApplicationProperties.java

@@ -43,8 +43,8 @@ public class ApplicationProperties {
      * The absolute path to the python interpreter.
      */
     @ExecutableFileURL
-    @Value("${mapping-service.pythonLocation}")
-    private URL pythonLocation;
+    @Value("${mapping-service.pythonExecutable}")
+    private URL pythonExecutable;
 
     /**
      * The absolute path where the plugins are stored.

src/main/java/edu/kit/datamanager/mappingservice/util/PythonRunnerUtil.java

@@ -89,9 +89,9 @@ public static MappingPluginState runPythonScript(String script, String... args)
      * @throws MappingPluginException if an error occurs.
      */
     public static MappingPluginState runPythonScript(String script, OutputStream output, OutputStream error, String... args) throws MappingPluginException {
-        if (configuration == null || configuration.getPythonLocation() == null) return MappingPluginState.UNKNOWN_ERROR;
+        if (configuration == null || configuration.getPythonExecutable()== null) return MappingPluginState.UNKNOWN_ERROR;
         ArrayList<String> command = new ArrayList<>();
-        command.add(configuration.getPythonLocation().getPath());
+        command.add(configuration.getPythonExecutable().getPath());
         command.add(script);
         Collections.addAll(command, args);
         ShellRunnerUtil.run(output, error, command.toArray(new String[0]));

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=${pythonExecutable:'file:///usr/bin/python3'}
+mapping-service.pythonExecutable=${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