Rename misleading processes list variable no to be necessarily tied t…

…o file.
Open-EO · Nov 22, 2024 · 332197a · 332197a
1 parent 88311b3
commit 332197a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/src/main/java/org/openeo/spring/api/ProcessesApiController.java b/src/main/java/org/openeo/spring/api/ProcessesApiController.java
@@ -52,10 +52,10 @@ public class ProcessesApiController implements ProcessesApi {
     private String odcCollEndpoint;
 
 	@Value("${org.openeo.wcps.processes.list}")
-	Resource processesFileWCPS;
+	Resource processesListWCPS;
 
 	@Value("${org.openeo.odc.processes.list}")
-	Resource processesFileODC;
+	Resource processesListODC;
 
 	@Autowired
 	ResourceLoader resourceLoader;
@@ -99,16 +99,16 @@ public ResponseEntity<Processes> listProcesses(@Min(1)@Parameter(description = "
         boolean hasWcpsEndpoint = !wcpsEndpoint.isEmpty();
 
         if (hasOdcEndpoint) {
-            res2eng.put(processesFileODC, EngineTypes.ODC_DASK);
+            res2eng.put(processesListODC, EngineTypes.ODC_DASK);
         }
         if (hasWcpsEndpoint) {
-            res2eng.put(processesFileWCPS, EngineTypes.WCPS);
+            res2eng.put(processesListWCPS, EngineTypes.WCPS);
         }
 
-        for (Resource processesFile : res2eng.keySet()) {
-            try (InputStream is = processesFile.getInputStream();){
+        for (Resource processesListResource : res2eng.keySet()) {
+            try (InputStream is = processesListResource.getInputStream();){
                 Processes processesListEng = mapper.readValue(is, Processes.class);
-                EngineTypes engine = res2eng.get(processesFile);
+                EngineTypes engine = res2eng.get(processesListResource);
 
                 for(Process processElement: processesListEng.getProcesses()) {
                     final String pID = processElement.getId();
@@ -123,9 +123,9 @@ public ResponseEntity<Processes> listProcesses(@Min(1)@Parameter(description = "
                     }
                 }
             } catch (JsonParseException | JsonMappingException e) {
-                log.warn("Invalid processes file {}.", processesFile, e); // be lenient?
+                log.warn("Invalid processes file {}.", processesListResource, e); // be lenient?
             } catch (IOException e) {
-                log.warn("Cannot access processes file {}.", processesFile, e); // be lenient?
+                log.warn("Cannot access processes file {}.", processesListResource, e); // be lenient?
             }
         }
 //

diff --git a/src/main/java/org/openeo/spring/api/ResultApiController.java b/src/main/java/org/openeo/spring/api/ResultApiController.java
@@ -102,17 +102,11 @@ public class ResultApiController implements ResultApi {
 	@Value("${org.openeo.tmp.dir}")
 	private String tmpDir;
 
-	@Value("${org.openeo.wcps.collections.list}")
-	Resource collectionsFileWCPS;
-
-	@Value("${org.openeo.odc.collections.list}")
-	Resource collectionsFileODC;
-
 	@Value("${org.openeo.wcps.processes.list}")
-	Resource processesFileWCPS;
+	Resource processesListWCPS;
 
 	@Value("${org.openeo.odc.processes.list}")
-	Resource processesFileODC;
+	Resource processesListODC;
 
 	@Autowired
 	public ResultApiController(NativeWebRequest request) {
@@ -365,14 +359,14 @@ boolean checkProcessesAvailability(JSONObject processGraphJSON, EngineTypes engi
 		Processes processesAvailableList = new Processes();
 		if(engine==EngineTypes.ODC_DASK) {
 			try {
-				processesAvailableList = mapper.readValue(processesFileODC.getInputStream(), Processes.class);
+				processesAvailableList = mapper.readValue(processesListODC.getInputStream(), Processes.class);
 			} catch (Exception e) {
 				addStackTraceAndErrorToLog(e);
 			}
 		}
 		else if(engine==EngineTypes.WCPS){
 			try {
-				processesAvailableList = mapper.readValue(processesFileWCPS.getInputStream(), Processes.class);
+				processesAvailableList = mapper.readValue(processesListWCPS.getInputStream(), Processes.class);
 			} catch (Exception e) {
 				addStackTraceAndErrorToLog(e);
 			}